From 4096059211955eeccf2b0777fb848f6262734558 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Tue, 14 Dec 2021 22:01:16 +0000 Subject: [PATCH 01/91] #15598 - Remove `install-zephir.sh` unused bash script --- .ci/install-zephir.sh | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100755 .ci/install-zephir.sh diff --git a/.ci/install-zephir.sh b/.ci/install-zephir.sh deleted file mode 100755 index e1040a952c2..00000000000 --- a/.ci/install-zephir.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash -# -# This file is part of the Phalcon Framework. -# -# (c) Phalcon Team -# -# For the full copyright and license information, please view the -# LICENSE.txt file that was distributed with this source code. - -# TODO: Move Zephir installation to composer.json - -: "${ZEPHIR_VERSION:=master}" -: "${DEFAULT_COMPOSER_FLAGS:=}" - -mkdir -p "$HOME/bin" -if [[ ! $ZEPHIR_VERSION =~ ^(master|development)$ ]]; then - wget \ - --no-clobber \ - -O "$HOME/bin/zephir" \ - "https://github.com/phalcon/zephir/releases/download/$ZEPHIR_VERSION/zephir.phar" - chmod +x "$HOME/bin/zephir" - exit 0 -fi - -git clone -b "$ZEPHIR_VERSION" --depth 1 -q https://github.com/phalcon/zephir -pushd zephir 1>/dev/null || exit 1 - -# Executes the command in a subshell. -# It inherits everything from the calling script but does not -# transmit any change back. -(eval "composer install $DEFAULT_COMPOSER_FLAGS") - -ln -s "$(pwd)/zephir" "$HOME/bin/zephir" - -popd 1>/dev/null || exit 1 From 6edb1eb9c423c53c4f25ce4e193cbd7e26c3f475 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Tue, 14 Dec 2021 22:03:10 +0000 Subject: [PATCH 02/91] #15598 - Add docker image with PHP8.1 --- docker-compose-local.yml | 8 ++++ docker-compose.yml | 16 ++++--- docker/8.0/Dockerfile | 7 --- docker/8.1/.bashrc | 90 +++++++++++++++++++++++++++++++++++++ docker/8.1/Dockerfile | 97 ++++++++++++++++++++++++++++++++++++++++ docker/8.1/extra.ini | 3 ++ 6 files changed, 209 insertions(+), 12 deletions(-) create mode 100644 docker/8.1/.bashrc create mode 100644 docker/8.1/Dockerfile create mode 100644 docker/8.1/extra.ini diff --git a/docker-compose-local.yml b/docker-compose-local.yml index c3f808322b6..5622be28068 100644 --- a/docker-compose-local.yml +++ b/docker-compose-local.yml @@ -19,6 +19,14 @@ services: volumes: - .:/srv + cphalcon-8.1: + container_name: cphalcon-8.1 + hostname: cphalcon-81 + build: docker/8.1 + working_dir: /srv + volumes: + - .:/srv + mysql: container_name: cphalcon-mysql image: mysql:5.7 diff --git a/docker-compose.yml b/docker-compose.yml index a446d1a3e96..3c780fc7d56 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,11 +19,19 @@ services: volumes: - .:/srv + cphalcon-8.1: + container_name: cphalcon-8.1 + hostname: cphalcon-81 + build: docker/8.1 + working_dir: /srv + volumes: + - .:/srv + mysql: container_name: cphalcon-mysql image: mysql:5.7 ports: - - 3306:3306 + - "3306:3306" environment: - MYSQL_ROOT_PASSWORD=secret - MYSQL_USER=phalcon @@ -34,7 +42,7 @@ services: container_name: cphalcon-postgres image: postgres:12-alpine ports: - - 5432:5432 + - "5432:5432" environment: - POSTGRES_PASSWORD=secret - POSTGRES_USER=phalcon @@ -44,10 +52,8 @@ services: container_name: cphalcon-redis image: redis:5-alpine ports: - - 6379:6379 + - "6379:6379" memcached: container_name: cphalcon-memcached image: memcached:1.5-alpine -# ports: -# - 11211:11211 diff --git a/docker/8.0/Dockerfile b/docker/8.0/Dockerfile index 6d1a4d379af..0096d387862 100644 --- a/docker/8.0/Dockerfile +++ b/docker/8.0/Dockerfile @@ -54,13 +54,6 @@ RUN pecl install -o -f redis && \ xdebug \ zephir_parser -# Remove this RUN when imagick will be available via pecl -RUN cd /opt && \ - git clone https://github.com/Jeckerson/imagick.git && \ - cd imagick && \ - phpize && ./configure && \ - make && make install - # Locale RUN sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen && \ sed -i -e 's/# el_GR.UTF-8 UTF-8/el_GR.UTF-8 UTF-8/' /etc/locale.gen && \ diff --git a/docker/8.1/.bashrc b/docker/8.1/.bashrc new file mode 100644 index 00000000000..a8c943aeccb --- /dev/null +++ b/docker/8.1/.bashrc @@ -0,0 +1,90 @@ +#!/bin/bash + +ZEPHIR_VERSION="0.15.2" + +# Easier navigation: .., ..., ...., ....., ~ and - +alias ..="cd .." +alias ...="cd ../.." +alias ....="cd ../../.." +alias .....="cd ../../../.." +alias ~="cd ~" # `cd` is probably faster to type though +alias -- -="cd -" + +# Shortcuts +alias g="git" +alias h="history" + +# Detect which `ls` flavor is in use +if ls --color > /dev/null 2>&1; then # GNU `ls` + colorflag="--color" +else # OS X `ls` + colorflag="-G" +fi + +# List all files colorized in long format +# shellcheck disable=SC2139 +alias l="ls -lF ${colorflag}" + +# List all files colorized in long format, including dot files +# shellcheck disable=SC2139 +alias la="ls -laF ${colorflag}" + +# List only directories +# shellcheck disable=SC2139 +alias lsd="ls -lF ${colorflag} | grep --color=never '^d'" + +# See: https://superuser.com/a/656746/280737 +alias ll='LC_ALL="C.UTF-8" ls -alF' + +# Always use color output for `ls` +# shellcheck disable=SC2139 +alias ls="command ls ${colorflag}" +export LS_COLORS='no=00:fi=00:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.ogg=01;35:*.mp3=01;35:*.wav=01;35:' + +# Always enable colored `grep` output +alias grep='grep --color=auto ' + +# Enable aliases to be sudo’ed +alias sudo='sudo ' + +# Get week number +alias week='date +%V' + +# Stopwatch +alias timer='echo "Timer started. Stop with Ctrl-D." && date && time cat && date' + +# Canonical hex dump; some systems have this symlinked +command -v hd > /dev/null || alias hd="hexdump -C" + +# vhosts +alias hosts='sudo nano /etc/hosts' + +# copy working directory +alias cwd='pwd | tr -d "\r\n" | xclip -selection clipboard' + +# copy file interactive +alias cp='cp -i' + +# move file interactive +alias mv='mv -i' + +# untar +alias untar='tar xvf' + +# Zephir related +alias untar='tar xvf' + +if [ ! -f ./zephir ]; then + wget --no-clobber -O ./zephir https://github.com/phalcon/zephir/releases/download/$ZEPHIR_VERSION/zephir.phar + chmod +x ./zephir +fi + +alias zephir='./zephir ' +alias zf='./zephir fullclean' +alias zg='./zephir generate' +alias zs='./zephir stubs' +alias cpl='zf && zg && cd ext/ && ./install && ..' +alias codecept='php -d extension=ext/modules/phalcon.so ./vendor/bin/codecept ' +alias phpcs='php -d extension=ext/modules/phalcon.so ./vendor/bin/phpcs ' +alias phpcbf='php -d extension=ext/modules/phalcon.so ./vendor/bin/phpcbf ' +alias psalm='php ./vendor/bin/psalm ' diff --git a/docker/8.1/Dockerfile b/docker/8.1/Dockerfile new file mode 100644 index 00000000000..ef5e423099c --- /dev/null +++ b/docker/8.1/Dockerfile @@ -0,0 +1,97 @@ +FROM composer:latest as composer +FROM php:8.1-fpm + +# Compilation parameters +RUN CPU_CORES="$(getconf _NPROCESSORS_ONLN)"; +ENV MAKEFLAGS="-j${CPU_CORES}" + +ADD ./extra.ini /usr/local/etc/php/conf.d/ + +# User/Group globals +ENV MY_USER="phalcon" \ + MY_GROUP="phalcon" \ + MY_UID="1000" \ + MY_GID="1000" \ + PHP_VERSION="8.1" \ + LANG=en_US.UTF-8 \ + LANGUAGE=en_US.UTF-8 \ + LC_ALL=en_US.UTF-8 + +# User and Group +RUN set -eux && \ + groupadd -g ${MY_GID} -r ${MY_GROUP} && \ + useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER} + +# Update +RUN apt update -y && \ + apt install -y \ + apt-utils \ + gettext \ + git \ + libgmp-dev \ + libicu-dev \ + libmagickwand-dev \ + libmemcached-dev \ + libpng-dev \ + libpq-dev \ + libyaml-dev \ + libzip-dev \ + locales \ + nano \ + sudo \ + wget \ + zip + +# PECL Packages +RUN pecl install -o -f redis && \ + pecl install psr \ + igbinary \ + msgpack \ + apcu \ + yaml \ + imagick \ + memcached \ + xdebug \ + zephir_parser + +# Locale +RUN sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen && \ + sed -i -e 's/# el_GR.UTF-8 UTF-8/el_GR.UTF-8 UTF-8/' /etc/locale.gen && \ + sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ + sed -i -e 's/# es_ES.UTF-8 UTF-8/es_ES.UTF-8 UTF-8/' /etc/locale.gen && \ + sed -i -e 's/# ru_RU.UTF-8 UTF-8/ru_RU.UTF-8 UTF-8/' /etc/locale.gen && \ + dpkg-reconfigure --frontend=noninteractive locales && \ + update-locale LANG=en_US.UTF-8 + +# Install PHP extensions +RUN docker-php-ext-configure gd --with-freetype --with-jpeg=/usr/include/ --enable-gd + +RUN docker-php-ext-install \ + gd \ + gettext \ + gmp \ + intl \ + pdo_mysql \ + pdo_pgsql \ + zip + +# Install PHP extensions +RUN docker-php-ext-enable \ + psr \ + redis \ + igbinary \ + msgpack \ + apcu \ + imagick \ + yaml \ + memcached \ + xdebug \ + zephir_parser + +# Composer +COPY --from=composer /usr/bin/composer /usr/local/bin/composer +# Bash script with helper aliases +COPY ./.bashrc /root/.bashrc +COPY ./.bashrc /home/phalcon/.bashrc + +CMD ["php-fpm"] diff --git a/docker/8.1/extra.ini b/docker/8.1/extra.ini new file mode 100644 index 00000000000..24836dbb58b --- /dev/null +++ b/docker/8.1/extra.ini @@ -0,0 +1,3 @@ +memory_limit=512M +apc.enable_cli="On" +session.save_path="/tmp" From 6cb4112c6913b68e5815ee17b7544ac7d2072bdf Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 18 Dec 2021 22:07:49 +0000 Subject: [PATCH 03/91] #15598 - Use `FILTER_UNSAFE_RAW` constant instead of deprecated `FILTER_SANITIZE_STRING` --- phalcon/Filter/Sanitize/StringVal.zep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phalcon/Filter/Sanitize/StringVal.zep b/phalcon/Filter/Sanitize/StringVal.zep index 76320af13d6..5e2fae5c68b 100644 --- a/phalcon/Filter/Sanitize/StringVal.zep +++ b/phalcon/Filter/Sanitize/StringVal.zep @@ -24,6 +24,6 @@ class StringVal */ public function __invoke(var input) { - return filter_var(input, FILTER_SANITIZE_STRING); + return filter_var(input, FILTER_UNSAFE_RAW); } } From bd41856df3cb5fa614b938c5abc64ee5d67634a5 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 19 Dec 2021 14:31:29 +0000 Subject: [PATCH 04/91] #15598 - Bump ZEPHIR_PARSER_VERSION to `1.4.2` --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 776efcb81d6..ca2bd34b4f7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,7 +20,7 @@ on: env: # All versions should be declared here PHALCON_VERSION: 5.0.0alpha7 - ZEPHIR_PARSER_VERSION: 1.4.1 + ZEPHIR_PARSER_VERSION: 1.4.2 ZEPHIR_VERSION: 0.15.0 PSR_VERSION: 1.1.0 From 66d7334cc5c9c1f1ee30e325638a0dd6733f6cfa Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 19 Dec 2021 14:32:11 +0000 Subject: [PATCH 05/91] #15598 - Add methods `__serialize()` and `__unserialize()` to `Collection` class --- phalcon/Support/Collection.zep | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/phalcon/Support/Collection.zep b/phalcon/Support/Collection.zep index 969c1fb48aa..8eb5476abd2 100644 --- a/phalcon/Support/Collection.zep +++ b/phalcon/Support/Collection.zep @@ -351,6 +351,16 @@ class Collection implements this->init(data); } + public function __serialize() -> array + { + return this->toArray(); + } + + public function __unserialize(array data) -> void + { + this->init(data); + } + /** * Internal method to set data */ From 4e343c2cf0b912ca9b54b988af74eb1c9f0fea40 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 19 Dec 2021 14:32:30 +0000 Subject: [PATCH 06/91] #15598 - Simplify method `unserialize()` method --- phalcon/Support/Collection.zep | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/phalcon/Support/Collection.zep b/phalcon/Support/Collection.zep index 8eb5476abd2..77355e8ae72 100644 --- a/phalcon/Support/Collection.zep +++ b/phalcon/Support/Collection.zep @@ -341,12 +341,11 @@ class Collection implements * Constructs the object * See [unserialize](https://php.net/manual/en/serializable.unserialize.php) */ - public function unserialize(var serialized) -> void + public function unserialize(string serialized) -> void { var data; - let serialized = (string) serialized, - data = unserialize(serialized); + let data = unserialize(serialized); this->init(data); } From 299d30e66af3e66af7e5590749cca7138225afa5 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 19 Dec 2021 18:10:04 +0000 Subject: [PATCH 07/91] #15598 - Add methods `__serialize()` and `__unserialize()` Storage\Serializers classes --- phalcon/Storage/Serializer/AbstractSerializer.zep | 14 ++++++++++---- phalcon/Storage/Serializer/Base64.zep | 13 +------------ phalcon/Storage/Serializer/Igbinary.zep | 2 +- phalcon/Storage/Serializer/Json.zep | 7 +------ phalcon/Storage/Serializer/Msgpack.zep | 2 +- phalcon/Storage/Serializer/None.zep | 9 ++------- phalcon/Storage/Serializer/Php.zep | 6 +++--- phalcon/Storage/Serializer/SerializerInterface.zep | 5 ----- 8 files changed, 19 insertions(+), 39 deletions(-) diff --git a/phalcon/Storage/Serializer/AbstractSerializer.zep b/phalcon/Storage/Serializer/AbstractSerializer.zep index 36b9ed5b76e..2b69d99eace 100644 --- a/phalcon/Storage/Serializer/AbstractSerializer.zep +++ b/phalcon/Storage/Serializer/AbstractSerializer.zep @@ -11,10 +11,6 @@ namespace Phalcon\Storage\Serializer; /** - * Class AbstractSerializer - * - * @package Phalcon\Storage\Serializer - * * @property mixed $data */ abstract class AbstractSerializer implements SerializerInterface @@ -61,4 +57,14 @@ abstract class AbstractSerializer implements SerializerInterface { let this->data = data; } + + public function __serialize() -> array + { + return []; + } + + public function __unserialize(array data) -> void + { + // Nothing here + } } diff --git a/phalcon/Storage/Serializer/Base64.zep b/phalcon/Storage/Serializer/Base64.zep index 751cbf3f34e..df523657143 100644 --- a/phalcon/Storage/Serializer/Base64.zep +++ b/phalcon/Storage/Serializer/Base64.zep @@ -12,11 +12,6 @@ namespace Phalcon\Storage\Serializer; use InvalidArgumentException; -/** - * Class Base64 - * - * @package Phalcon\Storage\Serializer - */ class Base64 extends AbstractSerializer { /** @@ -42,14 +37,8 @@ class Base64 extends AbstractSerializer * * @retrun void */ - public function unserialize(var data) -> void + public function unserialize(string data) -> void { - if typeof data !== "string" { - throw new InvalidArgumentException( - "Data for the unserializer must of type string" - ); - } - let this->data = base64_decode(data); } } diff --git a/phalcon/Storage/Serializer/Igbinary.zep b/phalcon/Storage/Serializer/Igbinary.zep index 63df6f1ccfc..9c5c148dd7e 100644 --- a/phalcon/Storage/Serializer/Igbinary.zep +++ b/phalcon/Storage/Serializer/Igbinary.zep @@ -33,7 +33,7 @@ class Igbinary extends AbstractSerializer * * @return void */ - public function unserialize(var data) -> void + public function unserialize(string data) -> void { var version; diff --git a/phalcon/Storage/Serializer/Json.zep b/phalcon/Storage/Serializer/Json.zep index 223056a824f..9aba7be8bba 100644 --- a/phalcon/Storage/Serializer/Json.zep +++ b/phalcon/Storage/Serializer/Json.zep @@ -13,11 +13,6 @@ namespace Phalcon\Storage\Serializer; use InvalidArgumentException; use JsonSerializable; -/** - * Class Json - * - * @package Phalcon\Storage\Serializer - */ class Json extends AbstractSerializer { /** @@ -48,7 +43,7 @@ class Json extends AbstractSerializer * * @return void */ - public function unserialize(var data) -> void + public function unserialize(string data) -> void { let this->data = this->getDecode(data); } diff --git a/phalcon/Storage/Serializer/Msgpack.zep b/phalcon/Storage/Serializer/Msgpack.zep index a356e2d76ca..f6bf5722fd0 100644 --- a/phalcon/Storage/Serializer/Msgpack.zep +++ b/phalcon/Storage/Serializer/Msgpack.zep @@ -33,7 +33,7 @@ class Msgpack extends AbstractSerializer * * @return void */ - public function unserialize(var data) -> void + public function unserialize(string data) -> void { var version; diff --git a/phalcon/Storage/Serializer/None.zep b/phalcon/Storage/Serializer/None.zep index df4d051eb8e..2eb35c5e771 100644 --- a/phalcon/Storage/Serializer/None.zep +++ b/phalcon/Storage/Serializer/None.zep @@ -10,11 +10,6 @@ namespace Phalcon\Storage\Serializer; -/** - * Class None - * - * @package Phalcon\Storage\Serializer - */ class None extends AbstractSerializer { /** @@ -22,7 +17,7 @@ class None extends AbstractSerializer * * @return string */ - public function serialize() -> string + public function serialize() -> string|null { return this->data; } @@ -34,7 +29,7 @@ class None extends AbstractSerializer * * @retrun void */ - public function unserialize(var data) -> void + public function unserialize(string data) -> void { let this->data = data; } diff --git a/phalcon/Storage/Serializer/Php.zep b/phalcon/Storage/Serializer/Php.zep index ae0064d5f39..ca83a72e653 100644 --- a/phalcon/Storage/Serializer/Php.zep +++ b/phalcon/Storage/Serializer/Php.zep @@ -34,7 +34,7 @@ class Php extends AbstractSerializer * * @param string $data */ - public function unserialize(var data) -> void + public function unserialize(string data) -> void { this->processSerializable(data); this->processNotSerializable(data); @@ -43,7 +43,7 @@ class Php extends AbstractSerializer /** * @param mixed $data */ - private function processSerializable(var data) -> void + private function processSerializable(string data) -> void { var version; @@ -87,7 +87,7 @@ class Php extends AbstractSerializer /** * @param mixed $data */ - private function processNotSerializable(var data) -> void + private function processNotSerializable(string data) -> void { if (true !== this->isSerializable(data)) { let this->data = data; diff --git a/phalcon/Storage/Serializer/SerializerInterface.zep b/phalcon/Storage/Serializer/SerializerInterface.zep index 2ddc8b6aa85..3ca94cb146a 100644 --- a/phalcon/Storage/Serializer/SerializerInterface.zep +++ b/phalcon/Storage/Serializer/SerializerInterface.zep @@ -12,11 +12,6 @@ namespace Phalcon\Storage\Serializer; use Serializable; -/** - * Interface SerializerInterface - * - * @package Phalcon\Storage\Serializer - */ interface SerializerInterface extends Serializable { /** From e98dc7962307ae72d3bcbcdae1c40ee39aaaac7a Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 19 Dec 2021 18:27:28 +0000 Subject: [PATCH 08/91] #15598 - Add `mixed` type instead of `var` --- phalcon/Mvc/Micro.zep | 30 +++++++++---------- phalcon/Mvc/Model/Resultset/Complex.zep | 25 ++++++++-------- phalcon/Mvc/Model/Resultset/Simple.zep | 15 +++++++--- phalcon/Mvc/Model/Row.zep | 16 ++++------ phalcon/Translate/Adapter/AbstractAdapter.zep | 2 +- 5 files changed, 44 insertions(+), 44 deletions(-) diff --git a/phalcon/Mvc/Micro.zep b/phalcon/Mvc/Micro.zep index 5eaa40285f5..5974990ca3d 100644 --- a/phalcon/Mvc/Micro.zep +++ b/phalcon/Mvc/Micro.zep @@ -995,10 +995,12 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface /** * Check if a service is registered in the internal services container using * the array syntax + * + * @param mixed offset */ - public function offsetExists(var alias) -> bool + public function offsetExists(mixed offset) -> bool { - return this->hasService(alias); + return this->hasService(offset); } /** @@ -1010,10 +1012,12 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface * $app["request"] * ); *``` + * + * @param mixed offset */ - public function offsetGet(var alias) -> var + public function offsetGet(mixed offset) -> mixed { - return this->getService(alias); + return this->getService(offset); } /** @@ -1024,28 +1028,22 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface * $app["request"] = new \Phalcon\Http\Request(); *``` */ - public function offsetSet(var alias, var definition) -> void + public function offsetSet(mixed offset, mixed value) -> void { - this->setService(alias, definition); + this->setService(offset, value); } /** * Removes a service from the internal services container using the array * syntax */ - public function offsetUnset(var alias) -> void + public function offsetUnset(mixed offset) -> void { - var container; - - let container = this->container; - - if typeof container != "object" { - let container = new FactoryDefault(); - - let this->container = container; + if this->container === null { + let this->container = new FactoryDefault(); } - container->remove(alias); + this->container->remove(offset); } /** diff --git a/phalcon/Mvc/Model/Resultset/Complex.zep b/phalcon/Mvc/Model/Resultset/Complex.zep index 072a4811c5a..7fe4b034849 100644 --- a/phalcon/Mvc/Model/Resultset/Complex.zep +++ b/phalcon/Mvc/Model/Resultset/Complex.zep @@ -24,8 +24,6 @@ use Psr\SimpleCache\CacheInterface; use stdClass; /** - * Phalcon\Mvc\Model\Resultset\Complex - * * Complex resultsets may include complete objects and scalar values. * This class builds every complex row as it is required */ @@ -45,8 +43,6 @@ class Complex extends Resultset implements ResultsetInterface protected disableHydration = false; /** - * Phalcon\Mvc\Model\Resultset\Complex constructor - * * @param array columnTypes * @param ResultInterface|null result * @param CacheInterface|null cache @@ -68,7 +64,7 @@ class Complex extends Resultset implements ResultsetInterface /** * Returns current row in the resultset */ - final public function current() -> | bool + final public function current() -> mixed { var row, hydrateMode, eager, dirtyState, alias, activeRow, type, column, columnValue, value, attribute, source, attributes, columnMap, @@ -166,7 +162,6 @@ class Complex extends Resultset implements ResultsetInterface * Generate the column value according to the hydration type */ switch hydrateMode { - case Resultset::HYDRATE_RECORDS: // Check if the resultset must keep snapshots if !fetch keepSnapshots, column["keepSnapshots"] { @@ -174,7 +169,6 @@ class Complex extends Resultset implements ResultsetInterface } if globals_get("orm.late_state_binding") { - if column["instance"] instanceof Model { let modelName = get_class(column["instance"]); } else { @@ -188,9 +182,7 @@ class Complex extends Resultset implements ResultsetInterface dirtyState, keepSnapshots ); - } else { - /** * Get the base instance. Assign the values to the * attributes using a column map @@ -221,9 +213,7 @@ class Complex extends Resultset implements ResultsetInterface * The complete object is assigned to an attribute with the name of the alias or the model name */ let attribute = column["balias"]; - } else { - /** * Scalar columns are simply assigned to the result object */ @@ -244,12 +234,10 @@ class Complex extends Resultset implements ResultsetInterface } if !fetch eager, column["eager"] { - /** * Assign the instance according to the hydration type */ switch hydrateMode { - case Resultset::HYDRATE_ARRAYS: let activeRow[attribute] = value; break; @@ -380,4 +368,15 @@ class Complex extends Resultset implements ResultsetInterface this->columnTypes = resultset["columnTypes"], this->hydrateMode = resultset["hydrateMode"]; } + + public function __serialize() -> array + { + // Nothing here + return []; + } + + public function __unserialize(array data) -> void + { + // Nothing here + } } diff --git a/phalcon/Mvc/Model/Resultset/Simple.zep b/phalcon/Mvc/Model/Resultset/Simple.zep index a6cd38aca1e..25c6dd4e94e 100644 --- a/phalcon/Mvc/Model/Resultset/Simple.zep +++ b/phalcon/Mvc/Model/Resultset/Simple.zep @@ -21,8 +21,6 @@ use Phalcon\Storage\Serializer\SerializerInterface; use Psr\SimpleCache\CacheInterface; /** - * Phalcon\Mvc\Model\Resultset\Simple - * * Simple resultsets only contains a complete objects * This class builds every complete object as it is required */ @@ -44,8 +42,6 @@ class Simple extends Resultset protected keepSnapshots = false; /** - * Phalcon\Mvc\Model\Resultset\Simple constructor - * * @param array columnMap * @param ModelInterface|Row model * @param \Phalcon\Db\ResultInterface|false result @@ -324,4 +320,15 @@ class Simple extends Resultset let this->keepSnapshots = keepSnapshots; } } + + public function __serialize() -> array + { + // Nothing here + return []; + } + + public function __unserialize(array data) -> void + { + // Nothing here + } } diff --git a/phalcon/Mvc/Model/Row.zep b/phalcon/Mvc/Model/Row.zep index 6a1ee1c4097..134abdcb61c 100644 --- a/phalcon/Mvc/Model/Row.zep +++ b/phalcon/Mvc/Model/Row.zep @@ -16,8 +16,6 @@ use Phalcon\Mvc\EntityInterface; use Phalcon\Mvc\ModelInterface; /** - * Phalcon\Mvc\Model\Row - * * This component allows Phalcon\Mvc\Model to return rows without an associated entity. * This objects implements the ArrayAccess interface to allow access the object as object->x or array[x]. */ @@ -38,15 +36,13 @@ class Row implements EntityInterface, ResultInterface, ArrayAccess, JsonSerializ * * @return string|ModelInterface */ - public function offsetGet(var index) -> var + public function offsetGet(mixed index) -> mixed { - var value; - - if unlikely !fetch value, this->{index} { + if !this->offsetExists(index) { throw new Exception("The index does not exist in the row"); } - return value; + return this->{index}; } /** @@ -54,7 +50,7 @@ class Row implements EntityInterface, ResultInterface, ArrayAccess, JsonSerializ * * @param string|int $index */ - public function offsetExists(var index) -> bool + public function offsetExists(mixed index) -> bool { return isset this->{index}; } @@ -65,7 +61,7 @@ class Row implements EntityInterface, ResultInterface, ArrayAccess, JsonSerializ * @param string|int index * @param ModelInterface value */ - public function offsetSet(var index, var value) -> void + public function offsetSet(mixed index, mixed value) -> void { throw new Exception("Row is an immutable ArrayAccess object"); } @@ -75,7 +71,7 @@ class Row implements EntityInterface, ResultInterface, ArrayAccess, JsonSerializ * * @param string|int offset */ - public function offsetUnset(var offset) -> void + public function offsetUnset(mixed offset) -> void { throw new Exception("Row is an immutable ArrayAccess object"); } diff --git a/phalcon/Translate/Adapter/AbstractAdapter.zep b/phalcon/Translate/Adapter/AbstractAdapter.zep index b0f7e43974c..041dbfe2eaa 100644 --- a/phalcon/Translate/Adapter/AbstractAdapter.zep +++ b/phalcon/Translate/Adapter/AbstractAdapter.zep @@ -85,7 +85,7 @@ abstract class AbstractAdapter implements AdapterInterface * * @return mixed */ - public function offsetGet(var translateKey) -> var + public function offsetGet(mixed translateKey) -> mixed { return this->query(translateKey); } From e4321d5710f81445aa81864121fae41259524dee Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 19 Dec 2021 18:28:09 +0000 Subject: [PATCH 09/91] #15598 - Add Zephir as composer dependency --- composer.json | 5 +- composer.lock | 6636 ++++++++++++++++++++++++++----------------------- 2 files changed, 3532 insertions(+), 3109 deletions(-) diff --git a/composer.json b/composer.json index 4c19b3b2017..70fb414dae2 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,8 @@ } ], "require": { - "php": ">=7.4" + "php": ">=7.4", + "phalcon/zephir": "dev-development" }, "require-dev": { "ext-apcu": "*", @@ -66,7 +67,7 @@ "squizlabs/php_codesniffer": "^3.4", "twig/twig": "~1.36", "vimeo/psalm": "^4.7", - "vlucas/phpdotenv": "^2.5" + "vlucas/phpdotenv": "^5.4" }, "config": { "optimize-autoloader": true, diff --git a/composer.lock b/composer.lock index 5316d045c38..fd704302692 100644 --- a/composer.lock +++ b/composer.lock @@ -4,49 +4,72 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "05a235f43dfbc778b905a27444c2277b", - "packages": [], - "packages-dev": [ + "content-hash": "e53adcc927c941e2f26cd7427755ed3c", + "packages": [ { - "name": "amphp/amp", - "version": "v2.6.1", + "name": "monolog/monolog", + "version": "2.3.5", "source": { "type": "git", - "url": "https://github.com/amphp/amp.git", - "reference": "c5fc66a78ee38d7ac9195a37bacaf940eb3f65ae" + "url": "https://github.com/Seldaek/monolog.git", + "reference": "fd4380d6fc37626e2f799f29d91195040137eba9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/amp/zipball/c5fc66a78ee38d7ac9195a37bacaf940eb3f65ae", - "reference": "c5fc66a78ee38d7ac9195a37bacaf940eb3f65ae", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd4380d6fc37626e2f799f29d91195040137eba9", + "reference": "fd4380d6fc37626e2f799f29d91195040137eba9", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2", + "psr/log": "^1.0.1 || ^2.0 || ^3.0" + }, + "provide": { + "psr/log-implementation": "1.0.0 || 2.0.0 || 3.0.0" }, "require-dev": { - "amphp/php-cs-fixer-config": "dev-master", - "amphp/phpunit-util": "^1", - "ext-json": "*", - "jetbrains/phpstorm-stubs": "^2019.3", - "phpunit/phpunit": "^7 | ^8 | ^9", - "psalm/phar": "^3.11@dev", - "react/promise": "^2" + "aws/aws-sdk-php": "^2.4.9 || ^3.0", + "doctrine/couchdb": "~1.0@dev", + "elasticsearch/elasticsearch": "^7", + "graylog2/gelf-php": "^1.4.2", + "mongodb/mongodb": "^1.8", + "php-amqplib/php-amqplib": "~2.4 || ^3", + "php-console/php-console": "^3.1.3", + "phpspec/prophecy": "^1.6.1", + "phpstan/phpstan": "^0.12.91", + "phpunit/phpunit": "^8.5", + "predis/predis": "^1.1", + "rollbar/rollbar": "^1.3", + "ruflin/elastica": ">=0.90@dev", + "swiftmailer/swiftmailer": "^5.3|^6.0" + }, + "suggest": { + "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", + "doctrine/couchdb": "Allow sending log messages to a CouchDB server", + "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client", + "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", + "ext-curl": "Required to send log messages using the IFTTTHandler, the LogglyHandler, the SendGridHandler, the SlackWebhookHandler or the TelegramBotHandler", + "ext-mbstring": "Allow to work properly with unicode symbols", + "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)", + "ext-openssl": "Required to send log messages using SSL", + "ext-sockets": "Allow sending log messages to a Syslog server (via UDP driver)", + "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", + "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)", + "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", + "php-console/php-console": "Allow sending log messages to Google Chrome", + "rollbar/rollbar": "Allow sending log messages to Rollbar", + "ruflin/elastica": "Allow sending log messages to an Elastic Search server" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-main": "2.x-dev" } }, "autoload": { "psr-4": { - "Amp\\": "lib" - }, - "files": [ - "lib/functions.php", - "lib/Internal/functions.php" - ] + "Monolog\\": "src/Monolog" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -54,86 +77,80 @@ ], "authors": [ { - "name": "Daniel Lowrey", - "email": "rdlowrey@php.net" - }, - { - "name": "Aaron Piotrowski", - "email": "aaron@trowski.com" - }, - { - "name": "Bob Weinand", - "email": "bobwei9@hotmail.com" - }, - { - "name": "Niklas Keller", - "email": "me@kelunik.com" + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "https://seld.be" } ], - "description": "A non-blocking concurrency framework for PHP applications.", - "homepage": "http://amphp.org/amp", + "description": "Sends your logs to files, sockets, inboxes, databases and various web services", + "homepage": "https://github.com/Seldaek/monolog", "keywords": [ - "async", - "asynchronous", - "awaitable", - "concurrency", - "event", - "event-loop", - "future", - "non-blocking", - "promise" + "log", + "logging", + "psr-3" ], "support": { - "irc": "irc://irc.freenode.org/amphp", - "issues": "https://github.com/amphp/amp/issues", - "source": "https://github.com/amphp/amp/tree/v2.6.1" + "issues": "https://github.com/Seldaek/monolog/issues", + "source": "https://github.com/Seldaek/monolog/tree/2.3.5" }, "funding": [ { - "url": "https://github.com/amphp", + "url": "https://github.com/Seldaek", "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/monolog/monolog", + "type": "tidelift" } ], - "time": "2021-09-23T18:43:08+00:00" + "time": "2021-10-01T21:08:31+00:00" }, { - "name": "amphp/byte-stream", - "version": "v1.8.1", + "name": "phalcon/zephir", + "version": "dev-development", "source": { "type": "git", - "url": "https://github.com/amphp/byte-stream.git", - "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd" + "url": "https://github.com/zephir-lang/zephir.git", + "reference": "2d0d692d876399a82b9dac6cff874fe34d30a405" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/byte-stream/zipball/acbd8002b3536485c997c4e019206b3f10ca15bd", - "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd", + "url": "https://api.github.com/repos/zephir-lang/zephir/zipball/2d0d692d876399a82b9dac6cff874fe34d30a405", + "reference": "2d0d692d876399a82b9dac6cff874fe34d30a405", "shasum": "" }, "require": { - "amphp/amp": "^2", - "php": ">=7.1" + "ext-ctype": "*", + "ext-hash": "*", + "ext-json": "*", + "ext-mbstring": "*", + "ext-pcre": "*", + "ext-xml": "*", + "ext-zlib": "*", + "monolog/monolog": "^2.3", + "php": ">=7.4.1", + "symfony/console": "^5.2", + "symfony/event-dispatcher": "^5.3" }, "require-dev": { - "amphp/php-cs-fixer-config": "dev-master", - "amphp/phpunit-util": "^1.4", - "friendsofphp/php-cs-fixer": "^2.3", - "jetbrains/phpstorm-stubs": "^2019.3", - "phpunit/phpunit": "^6 || ^7 || ^8", - "psalm/phar": "^3.11.4" + "ext-gmp": "*", + "ext-pdo": "*", + "ext-pdo_sqlite": "*", + "ext-zip": "*", + "phpunit/phpunit": "^9.5", + "psr/log": "1.1.*" }, + "default-branch": true, + "bin": [ + "zephir" + ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, "autoload": { "psr-4": { - "Amp\\ByteStream\\": "lib" + "Zephir\\": "Library" }, "files": [ - "lib/functions.php" + "Library/functions.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -142,71 +159,67 @@ ], "authors": [ { - "name": "Aaron Piotrowski", - "email": "aaron@trowski.com" + "name": "Phalcon Team", + "email": "team@zephir-lang.com", + "homepage": "https://zephir-lang.com" }, { - "name": "Niklas Keller", - "email": "me@kelunik.com" + "name": "Contributors", + "homepage": "https://github.com/zephir-lang/zephir/graphs/contributors" } ], - "description": "A stream abstraction to make working with non-blocking I/O simple.", - "homepage": "http://amphp.org/byte-stream", + "description": "Zephir is a compiled high level language aimed to the creation of C-extensions for PHP", + "homepage": "https://zephir-lang.com", "keywords": [ - "amp", - "amphp", - "async", - "io", - "non-blocking", - "stream" + "extension", + "internals", + "phalcon", + "zephir" ], "support": { - "irc": "irc://irc.freenode.org/amphp", - "issues": "https://github.com/amphp/byte-stream/issues", - "source": "https://github.com/amphp/byte-stream/tree/v1.8.1" + "docs": "https://docs.zephir-lang.com", + "irc": "irc://irc.freenode.net/zephir", + "issues": "https://github.com/zephir-lang/zephir/issues?state=open", + "source": "https://github.com/zephir-lang/zephir" }, "funding": [ { - "url": "https://github.com/amphp", + "url": "https://opencollective.com/phalcon", + "type": "custom" + }, + { + "url": "https://github.com/phalcon", "type": "github" } ], - "time": "2021-03-30T17:13:30+00:00" + "time": "2021-12-18T21:58:42+00:00" }, { - "name": "behat/gherkin", - "version": "v4.9.0", + "name": "psr/container", + "version": "2.0.2", "source": { "type": "git", - "url": "https://github.com/Behat/Gherkin.git", - "reference": "0bc8d1e30e96183e4f36db9dc79caead300beff4" + "url": "https://github.com/php-fig/container.git", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/Gherkin/zipball/0bc8d1e30e96183e4f36db9dc79caead300beff4", - "reference": "0bc8d1e30e96183e4f36db9dc79caead300beff4", + "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", "shasum": "" }, "require": { - "php": "~7.2|~8.0" - }, - "require-dev": { - "cucumber/cucumber": "dev-gherkin-22.0.0", - "phpunit/phpunit": "~8|~9", - "symfony/yaml": "~3|~4|~5" - }, - "suggest": { - "symfony/yaml": "If you want to parse features, represented in YAML files" + "php": ">=7.4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { - "psr-0": { - "Behat\\Gherkin": "src/" + "psr-4": { + "Psr\\Container\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -215,88 +228,51 @@ ], "authors": [ { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" } ], - "description": "Gherkin DSL parser for PHP", - "homepage": "http://behat.org/", + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", "keywords": [ - "BDD", - "Behat", - "Cucumber", - "DSL", - "gherkin", - "parser" + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" ], "support": { - "issues": "https://github.com/Behat/Gherkin/issues", - "source": "https://github.com/Behat/Gherkin/tree/v4.9.0" + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/2.0.2" }, - "time": "2021-10-12T13:05:09+00:00" + "time": "2021-11-05T16:47:00+00:00" }, { - "name": "codeception/codeception", - "version": "4.1.22", + "name": "psr/event-dispatcher", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/Codeception/Codeception.git", - "reference": "9777ec3690ceedc4bce2ed13af7af4ca4ee3088f" + "url": "https://github.com/php-fig/event-dispatcher.git", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/Codeception/zipball/9777ec3690ceedc4bce2ed13af7af4ca4ee3088f", - "reference": "9777ec3690ceedc4bce2ed13af7af4ca4ee3088f", + "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", "shasum": "" }, "require": { - "behat/gherkin": "^4.4.0", - "codeception/lib-asserts": "^1.0", - "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.1.1 | ^9.0", - "codeception/stub": "^2.0 | ^3.0", - "ext-curl": "*", - "ext-json": "*", - "ext-mbstring": "*", - "guzzlehttp/psr7": "^1.4 | ^2.0", - "php": ">=5.6.0 <9.0", - "symfony/console": ">=2.7 <6.0", - "symfony/css-selector": ">=2.7 <6.0", - "symfony/event-dispatcher": ">=2.7 <6.0", - "symfony/finder": ">=2.7 <6.0", - "symfony/yaml": ">=2.7 <6.0" - }, - "require-dev": { - "codeception/module-asserts": "1.*@dev", - "codeception/module-cli": "1.*@dev", - "codeception/module-db": "1.*@dev", - "codeception/module-filesystem": "1.*@dev", - "codeception/module-phpbrowser": "1.*@dev", - "codeception/specify": "~0.3", - "codeception/util-universalframework": "*@dev", - "monolog/monolog": "~1.8", - "squizlabs/php_codesniffer": "~2.0", - "symfony/process": ">=2.7 <6.0", - "vlucas/phpdotenv": "^2.0 | ^3.0 | ^4.0 | ^5.0" - }, - "suggest": { - "codeception/specify": "BDD-style code blocks", - "codeception/verify": "BDD-style assertions", - "hoa/console": "For interactive console functionality", - "stecman/symfony-console-completion": "For BASH autocompletion", - "symfony/phpunit-bridge": "For phpunit-bridge support" + "php": ">=7.2.0" }, - "bin": [ - "codecept" - ], "type": "library", "extra": { - "branch-alias": [] + "branch-alias": { + "dev-master": "1.0.x-dev" + } }, "autoload": { "psr-4": { - "Codeception\\": "src/Codeception", - "Codeception\\Extension\\": "ext" + "Psr\\EventDispatcher\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -305,56 +281,49 @@ ], "authors": [ { - "name": "Michael Bodnarchuk", - "email": "davert@mail.ua", - "homepage": "http://codegyre.com" + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" } ], - "description": "BDD-style testing framework", - "homepage": "http://codeception.com/", + "description": "Standard interfaces for event handling.", "keywords": [ - "BDD", - "TDD", - "acceptance testing", - "functional testing", - "unit testing" + "events", + "psr", + "psr-14" ], "support": { - "issues": "https://github.com/Codeception/Codeception/issues", - "source": "https://github.com/Codeception/Codeception/tree/4.1.22" + "issues": "https://github.com/php-fig/event-dispatcher/issues", + "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" }, - "funding": [ - { - "url": "https://opencollective.com/codeception", - "type": "open_collective" - } - ], - "time": "2021-08-06T17:15:34+00:00" + "time": "2019-01-08T18:20:26+00:00" }, { - "name": "codeception/lib-asserts", - "version": "1.13.2", + "name": "psr/log", + "version": "2.0.0", "source": { "type": "git", - "url": "https://github.com/Codeception/lib-asserts.git", - "reference": "184231d5eab66bc69afd6b9429344d80c67a33b6" + "url": "https://github.com/php-fig/log.git", + "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/lib-asserts/zipball/184231d5eab66bc69afd6b9429344d80c67a33b6", - "reference": "184231d5eab66bc69afd6b9429344d80c67a33b6", + "url": "https://api.github.com/repos/php-fig/log/zipball/ef29f6d262798707a9edd554e2b82517ef3a9376", + "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376", "shasum": "" }, "require": { - "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.0.3 | ^9.0", - "ext-dom": "*", - "php": ">=5.6.0 <9.0" + "php": ">=8.0.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "Psr\\Log\\": "src" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -362,62 +331,78 @@ ], "authors": [ { - "name": "Michael Bodnarchuk", - "email": "davert@mail.ua", - "homepage": "http://codegyre.com" - }, - { - "name": "Gintautas Miselis" - }, - { - "name": "Gustavo Nieves", - "homepage": "https://medium.com/@ganieves" + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" } ], - "description": "Assertion methods used by Codeception core and Asserts module", - "homepage": "https://codeception.com/", + "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", "keywords": [ - "codeception" + "log", + "psr", + "psr-3" ], "support": { - "issues": "https://github.com/Codeception/lib-asserts/issues", - "source": "https://github.com/Codeception/lib-asserts/tree/1.13.2" + "source": "https://github.com/php-fig/log/tree/2.0.0" }, - "time": "2020-10-21T16:26:20+00:00" + "time": "2021-07-14T16:41:46+00:00" }, { - "name": "codeception/lib-innerbrowser", - "version": "1.5.1", + "name": "symfony/console", + "version": "v5.4.1", "source": { "type": "git", - "url": "https://github.com/Codeception/lib-innerbrowser.git", - "reference": "31b4b56ad53c3464fcb2c0a14d55a51a201bd3c2" + "url": "https://github.com/symfony/console.git", + "reference": "9130e1a0fc93cb0faadca4ee917171bd2ca9e5f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/lib-innerbrowser/zipball/31b4b56ad53c3464fcb2c0a14d55a51a201bd3c2", - "reference": "31b4b56ad53c3464fcb2c0a14d55a51a201bd3c2", + "url": "https://api.github.com/repos/symfony/console/zipball/9130e1a0fc93cb0faadca4ee917171bd2ca9e5f4", + "reference": "9130e1a0fc93cb0faadca4ee917171bd2ca9e5f4", "shasum": "" }, "require": { - "codeception/codeception": "4.*@dev", - "ext-dom": "*", - "ext-json": "*", - "ext-mbstring": "*", - "php": ">=5.6.0 <9.0", - "symfony/browser-kit": ">=2.7 <6.0", - "symfony/dom-crawler": ">=2.7 <6.0" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php73": "^1.9", + "symfony/polyfill-php80": "^1.16", + "symfony/service-contracts": "^1.1|^2|^3", + "symfony/string": "^5.1|^6.0" }, "conflict": { - "codeception/codeception": "<4.0" + "psr/log": ">=3", + "symfony/dependency-injection": "<4.4", + "symfony/dotenv": "<5.1", + "symfony/event-dispatcher": "<4.4", + "symfony/lock": "<4.4", + "symfony/process": "<4.4" + }, + "provide": { + "psr/log-implementation": "1.0|2.0" }, "require-dev": { - "codeception/util-universalframework": "dev-master" + "psr/log": "^1|^2", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/event-dispatcher": "^4.4|^5.0|^6.0", + "symfony/lock": "^4.4|^5.0|^6.0", + "symfony/process": "^4.4|^5.0|^6.0", + "symfony/var-dumper": "^4.4|^5.0|^6.0" + }, + "suggest": { + "psr/log": "For using the console logger", + "symfony/event-dispatcher": "", + "symfony/lock": "", + "symfony/process": "" }, "type": "library", "autoload": { - "classmap": [ - "src/" + "psr-4": { + "Symfony\\Component\\Console\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -426,47 +411,71 @@ ], "authors": [ { - "name": "Michael Bodnarchuk", - "email": "davert@mail.ua", - "homepage": "http://codegyre.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { - "name": "Gintautas Miselis" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Parent library for all Codeception framework modules and PhpBrowser", - "homepage": "https://codeception.com/", + "description": "Eases the creation of beautiful and testable command line interfaces", + "homepage": "https://symfony.com", "keywords": [ - "codeception" + "cli", + "command line", + "console", + "terminal" ], "support": { - "issues": "https://github.com/Codeception/lib-innerbrowser/issues", - "source": "https://github.com/Codeception/lib-innerbrowser/tree/1.5.1" + "source": "https://github.com/symfony/console/tree/v5.4.1" }, - "time": "2021-08-30T15:21:42+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-12-09T11:22:43+00:00" }, { - "name": "codeception/module-apc", - "version": "1.0.2", + "name": "symfony/deprecation-contracts", + "version": "v3.0.0", "source": { "type": "git", - "url": "https://github.com/Codeception/module-apc.git", - "reference": "07fbd6dd12b9d3f4b738bcac8266eecefb470365" + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "c726b64c1ccfe2896cb7df2e1331c357ad1c8ced" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/module-apc/zipball/07fbd6dd12b9d3f4b738bcac8266eecefb470365", - "reference": "07fbd6dd12b9d3f4b738bcac8266eecefb470365", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/c726b64c1ccfe2896cb7df2e1331c357ad1c8ced", + "reference": "c726b64c1ccfe2896cb7df2e1331c357ad1c8ced", "shasum": "" }, "require": { - "codeception/codeception": "^4.0", - "php": ">=5.6.0 <9.0" + "php": ">=8.0.2" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.0-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, "autoload": { - "classmap": [ - "src/" + "files": [ + "function.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -475,50 +484,83 @@ ], "authors": [ { - "name": "Serghei Iakovlev" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { - "name": "Gintautas Miselis" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "APC module for Codeception", - "homepage": "http://codeception.com/", - "keywords": [ - "apc", - "codeception" - ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", "support": { - "issues": "https://github.com/Codeception/module-apc/issues", - "source": "https://github.com/Codeception/module-apc/tree/1.0.2" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.0" }, - "time": "2020-10-26T06:16:02+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-11-01T23:48:49+00:00" }, { - "name": "codeception/module-asserts", - "version": "1.3.1", + "name": "symfony/event-dispatcher", + "version": "v5.4.0", "source": { "type": "git", - "url": "https://github.com/Codeception/module-asserts.git", - "reference": "59374f2fef0cabb9e8ddb53277e85cdca74328de" + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "27d39ae126352b9fa3be5e196ccf4617897be3eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/module-asserts/zipball/59374f2fef0cabb9e8ddb53277e85cdca74328de", - "reference": "59374f2fef0cabb9e8ddb53277e85cdca74328de", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/27d39ae126352b9fa3be5e196ccf4617897be3eb", + "reference": "27d39ae126352b9fa3be5e196ccf4617897be3eb", "shasum": "" }, "require": { - "codeception/codeception": "*@dev", - "codeception/lib-asserts": "^1.13.1", - "php": ">=5.6.0 <9.0" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/event-dispatcher-contracts": "^2|^3", + "symfony/polyfill-php80": "^1.16" }, "conflict": { - "codeception/codeception": "<4.0" + "symfony/dependency-injection": "<4.4" + }, + "provide": { + "psr/event-dispatcher-implementation": "1.0", + "symfony/event-dispatcher-implementation": "2.0" + }, + "require-dev": { + "psr/log": "^1|^2|^3", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/error-handler": "^4.4|^5.0|^6.0", + "symfony/expression-language": "^4.4|^5.0|^6.0", + "symfony/http-foundation": "^4.4|^5.0|^6.0", + "symfony/service-contracts": "^1.1|^2|^3", + "symfony/stopwatch": "^4.4|^5.0|^6.0" + }, + "suggest": { + "symfony/dependency-injection": "", + "symfony/http-kernel": "" }, "type": "library", "autoload": { - "classmap": [ - "src/" + "psr-4": { + "Symfony\\Component\\EventDispatcher\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -527,101 +569,150 @@ ], "authors": [ { - "name": "Michael Bodnarchuk" - }, - { - "name": "Gintautas Miselis" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { - "name": "Gustavo Nieves", - "homepage": "https://medium.com/@ganieves" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Codeception module containing various assertions", - "homepage": "https://codeception.com/", - "keywords": [ - "assertions", - "asserts", - "codeception" - ], + "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", + "homepage": "https://symfony.com", "support": { - "issues": "https://github.com/Codeception/module-asserts/issues", - "source": "https://github.com/Codeception/module-asserts/tree/1.3.1" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.0" }, - "time": "2020-10-21T16:48:15+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-11-23T10:19:22+00:00" }, { - "name": "codeception/module-cli", - "version": "1.1.1", + "name": "symfony/event-dispatcher-contracts", + "version": "v3.0.0", "source": { "type": "git", - "url": "https://github.com/Codeception/module-cli.git", - "reference": "1f841ad4a1d43e5d9e60a43c4cc9e5af8008024f" + "url": "https://github.com/symfony/event-dispatcher-contracts.git", + "reference": "aa5422287b75594b90ee9cd807caf8f0df491385" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/module-cli/zipball/1f841ad4a1d43e5d9e60a43c4cc9e5af8008024f", - "reference": "1f841ad4a1d43e5d9e60a43c4cc9e5af8008024f", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/aa5422287b75594b90ee9cd807caf8f0df491385", + "reference": "aa5422287b75594b90ee9cd807caf8f0df491385", "shasum": "" }, "require": { - "codeception/codeception": "*@dev", - "php": ">=5.6.0 <9.0" + "php": ">=8.0.2", + "psr/event-dispatcher": "^1" }, - "conflict": { - "codeception/codeception": "<4.0" + "suggest": { + "symfony/event-dispatcher-implementation": "" }, "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ + "extra": { + "branch-alias": { + "dev-main": "3.0-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\EventDispatcher\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ "MIT" ], "authors": [ { - "name": "Michael Bodnarchuk" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Codeception module for testing basic shell commands and shell output", - "homepage": "http://codeception.com/", + "description": "Generic abstractions related to dispatching event", + "homepage": "https://symfony.com", "keywords": [ - "codeception" + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" ], "support": { - "issues": "https://github.com/Codeception/module-cli/issues", - "source": "https://github.com/Codeception/module-cli/tree/1.1.1" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.0.0" }, - "time": "2020-12-26T16:56:19+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-07-15T12:33:35+00:00" }, { - "name": "codeception/module-db", - "version": "1.1.0", + "name": "symfony/polyfill-ctype", + "version": "v1.23.0", "source": { "type": "git", - "url": "https://github.com/Codeception/module-db.git", - "reference": "8c8076cd05d4db95798acd7dba2a56578210982c" + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/module-db/zipball/8c8076cd05d4db95798acd7dba2a56578210982c", - "reference": "8c8076cd05d4db95798acd7dba2a56578210982c", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce", + "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce", "shasum": "" }, "require": { - "codeception/codeception": "*@dev", - "php": ">=5.6.0 <9.0" + "php": ">=7.1" }, - "conflict": { - "codeception/codeception": "<4.0" + "suggest": { + "ext-ctype": "For best performance" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.23-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, "autoload": { - "classmap": [ - "src/" + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + }, + "files": [ + "bootstrap.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -630,51 +721,77 @@ ], "authors": [ { - "name": "Michael Bodnarchuk" + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" }, { - "name": "Gintautas Miselis" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "DB module for Codeception", - "homepage": "http://codeception.com/", + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", "keywords": [ - "codeception", - "database-testing", - "db-testing" + "compatibility", + "ctype", + "polyfill", + "portable" ], "support": { - "issues": "https://github.com/Codeception/module-db/issues", - "source": "https://github.com/Codeception/module-db/tree/1.1.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0" }, - "time": "2020-12-20T13:37:07+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-02-19T12:13:01+00:00" }, { - "name": "codeception/module-filesystem", - "version": "1.0.3", + "name": "symfony/polyfill-intl-grapheme", + "version": "v1.23.1", "source": { "type": "git", - "url": "https://github.com/Codeception/module-filesystem.git", - "reference": "781be167fb1557bfc9b61e0a4eac60a32c534ec1" + "url": "https://github.com/symfony/polyfill-intl-grapheme.git", + "reference": "16880ba9c5ebe3642d1995ab866db29270b36535" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/module-filesystem/zipball/781be167fb1557bfc9b61e0a4eac60a32c534ec1", - "reference": "781be167fb1557bfc9b61e0a4eac60a32c534ec1", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/16880ba9c5ebe3642d1995ab866db29270b36535", + "reference": "16880ba9c5ebe3642d1995ab866db29270b36535", "shasum": "" }, "require": { - "codeception/codeception": "^4.0", - "php": ">=5.6.0 <9.0", - "symfony/finder": ">=2.7 <6.0" + "php": ">=7.1" }, - "conflict": { - "codeception/codeception": "<4.0" + "suggest": { + "ext-intl": "For best performance" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.23-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, "autoload": { - "classmap": [ - "src/" + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + }, + "files": [ + "bootstrap.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -683,57 +800,82 @@ ], "authors": [ { - "name": "Michael Bodnarchuk" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { - "name": "Gintautas Miselis" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Codeception module for testing local filesystem", - "homepage": "http://codeception.com/", + "description": "Symfony polyfill for intl's grapheme_* functions", + "homepage": "https://symfony.com", "keywords": [ - "codeception", - "filesystem" + "compatibility", + "grapheme", + "intl", + "polyfill", + "portable", + "shim" ], "support": { - "issues": "https://github.com/Codeception/module-filesystem/issues", - "source": "https://github.com/Codeception/module-filesystem/tree/1.0.3" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.1" }, - "time": "2020-10-24T14:46:40+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-05-27T12:26:48+00:00" }, { - "name": "codeception/module-phalcon4", - "version": "v1.0.7", + "name": "symfony/polyfill-intl-normalizer", + "version": "v1.23.0", "source": { "type": "git", - "url": "https://github.com/Codeception/module-phalcon4.git", - "reference": "8f2bc9da89990743d21e192c2065d5e85bbbd320" + "url": "https://github.com/symfony/polyfill-intl-normalizer.git", + "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/module-phalcon4/zipball/8f2bc9da89990743d21e192c2065d5e85bbbd320", - "reference": "8f2bc9da89990743d21e192c2065d5e85bbbd320", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8", + "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8", "shasum": "" }, "require": { - "codeception/codeception": "^4.0", - "codeception/lib-innerbrowser": "^1.0", - "codeception/module-asserts": "^1.0", - "codeception/module-db": "^1.0", - "codeception/module-phpbrowser": "^1.0", - "ext-json": "*", - "php": ">=7.2.0" + "php": ">=7.1" }, - "require-dev": { - "codeception/util-robohelpers": "dev-master", - "squizlabs/php_codesniffer": "^3.4", - "vimeo/psalm": "^3.6", - "vlucas/phpdotenv": "^4.1" + "suggest": { + "ext-intl": "For best performance" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.23-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, + "files": [ + "bootstrap.php" + ], "classmap": [ - "src/" + "Resources/stubs" ] }, "notification-url": "https://packagist.org/downloads/", @@ -742,62 +884,79 @@ ], "authors": [ { - "name": "Phalcon Team", - "email": "team@phalcon.io", - "homepage": "https://phalcon.io/en/team" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { - "name": "Codeception Team", - "email": "team@codeception.com", - "homepage": "https://codeception.com/" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Codeception module for Phalcon 4 framework", - "homepage": "https://codeception.com/", + "description": "Symfony polyfill for intl's Normalizer class and related functions", + "homepage": "https://symfony.com", "keywords": [ - "codeception", - "phalcon", - "phalcon4" + "compatibility", + "intl", + "normalizer", + "polyfill", + "portable", + "shim" ], "support": { - "issues": "https://github.com/Codeception/module-phalcon4/issues", - "source": "https://github.com/Codeception/module-phalcon4/tree/v1.0.7" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0" }, - "time": "2021-05-18T18:19:50+00:00" - }, - { - "name": "codeception/module-phpbrowser", - "version": "1.0.2", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-02-19T12:13:01+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.23.1", "source": { "type": "git", - "url": "https://github.com/Codeception/module-phpbrowser.git", - "reference": "770a6be4160a5c0c08d100dd51bff35f6056bbf1" + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/module-phpbrowser/zipball/770a6be4160a5c0c08d100dd51bff35f6056bbf1", - "reference": "770a6be4160a5c0c08d100dd51bff35f6056bbf1", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6", + "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6", "shasum": "" }, "require": { - "codeception/codeception": "^4.0", - "codeception/lib-innerbrowser": "^1.3", - "guzzlehttp/guzzle": "^6.3|^7.0", - "php": ">=5.6.0 <9.0" - }, - "conflict": { - "codeception/codeception": "<4.0" - }, - "require-dev": { - "codeception/module-rest": "^1.0" + "php": ">=7.1" }, "suggest": { - "codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests" + "ext-mbstring": "For best performance" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.23-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, "autoload": { - "classmap": [ - "src/" + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + }, + "files": [ + "bootstrap.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -806,48 +965,78 @@ ], "authors": [ { - "name": "Michael Bodnarchuk" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { - "name": "Gintautas Miselis" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Codeception module for testing web application over HTTP", - "homepage": "http://codeception.com/", + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", "keywords": [ - "codeception", - "functional-testing", - "http" + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" ], "support": { - "issues": "https://github.com/Codeception/module-phpbrowser/issues", - "source": "https://github.com/Codeception/module-phpbrowser/tree/1.0.2" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1" }, - "time": "2020-10-24T15:29:28+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-05-27T12:26:48+00:00" }, { - "name": "codeception/module-redis", - "version": "1.2.0", + "name": "symfony/polyfill-php73", + "version": "v1.23.0", "source": { "type": "git", - "url": "https://github.com/Codeception/module-redis.git", - "reference": "eb68a805ee7a84af6548697bf6e21f1125e99b92" + "url": "https://github.com/symfony/polyfill-php73.git", + "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/module-redis/zipball/eb68a805ee7a84af6548697bf6e21f1125e99b92", - "reference": "eb68a805ee7a84af6548697bf6e21f1125e99b92", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010", + "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010", "shasum": "" }, "require": { - "codeception/codeception": "^4.0", - "php": "^7.1 || ^8.0", - "predis/predis": "^1.0" + "php": ">=7.1" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.23-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php73\\": "" + }, + "files": [ + "bootstrap.php" + ], "classmap": [ - "src/" + "Resources/stubs" ] }, "notification-url": "https://packagist.org/downloads/", @@ -856,54 +1045,78 @@ ], "authors": [ { - "name": "Michael Bodnarchuk" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { - "name": "Dmitriy Maltsev" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Redis module for Codeception", - "homepage": "https://codeception.com/", + "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", + "homepage": "https://symfony.com", "keywords": [ - "codeception", - "redis" + "compatibility", + "polyfill", + "portable", + "shim" ], "support": { - "issues": "https://github.com/Codeception/module-redis/issues", - "source": "https://github.com/Codeception/module-redis/tree/1.2.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.23.0" }, - "time": "2021-10-08T15:33:50+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-02-19T12:13:01+00:00" }, { - "name": "codeception/phpunit-wrapper", - "version": "8.1.4", + "name": "symfony/polyfill-php80", + "version": "v1.23.1", "source": { "type": "git", - "url": "https://github.com/Codeception/phpunit-wrapper.git", - "reference": "f41335f0b4dd17cf7bbc63e87943b3ae72a8bbc3" + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/f41335f0b4dd17cf7bbc63e87943b3ae72a8bbc3", - "reference": "f41335f0b4dd17cf7bbc63e87943b3ae72a8bbc3", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be", + "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be", "shasum": "" }, "require": { - "php": ">=7.2", - "phpunit/php-code-coverage": "^7.0", - "phpunit/phpunit": "^8.0", - "sebastian/comparator": "^3.0", - "sebastian/diff": "^3.0" - }, - "require-dev": { - "codeception/specify": "*", - "vlucas/phpdotenv": "^3.0" + "php": ">=7.1" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.23-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, "autoload": { "psr-4": { - "Codeception\\PHPUnit\\": "src/" - } + "Symfony\\Polyfill\\Php80\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -911,87 +1124,82 @@ ], "authors": [ { - "name": "Davert", - "email": "davert.php@resend.cc" + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "PHPUnit classes used by Codeception", + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], "support": { - "issues": "https://github.com/Codeception/phpunit-wrapper/issues", - "source": "https://github.com/Codeception/phpunit-wrapper/tree/8.1.4" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1" }, - "time": "2020-12-28T14:00:08+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-07-28T13:41:28+00:00" }, { - "name": "codeception/stub", - "version": "3.7.0", + "name": "symfony/service-contracts", + "version": "v3.0.0", "source": { "type": "git", - "url": "https://github.com/Codeception/Stub.git", - "reference": "468dd5fe659f131fc997f5196aad87512f9b1304" + "url": "https://github.com/symfony/service-contracts.git", + "reference": "36715ebf9fb9db73db0cb24263c79077c6fe8603" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/Stub/zipball/468dd5fe659f131fc997f5196aad87512f9b1304", - "reference": "468dd5fe659f131fc997f5196aad87512f9b1304", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/36715ebf9fb9db73db0cb24263c79077c6fe8603", + "reference": "36715ebf9fb9db73db0cb24263c79077c6fe8603", "shasum": "" }, "require": { - "phpunit/phpunit": "^8.4 | ^9.0" + "php": ">=8.0.2", + "psr/container": "^2.0" }, - "type": "library", - "autoload": { - "psr-4": { - "Codeception\\": "src/" - } + "conflict": { + "ext-psr": "<1.1|>=2" }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Flexible Stub wrapper for PHPUnit's Mock Builder", - "support": { - "issues": "https://github.com/Codeception/Stub/issues", - "source": "https://github.com/Codeception/Stub/tree/3.7.0" - }, - "time": "2020-07-03T15:54:43+00:00" - }, - { - "name": "composer/package-versions-deprecated", - "version": "1.11.99.4", - "source": { - "type": "git", - "url": "https://github.com/composer/package-versions-deprecated.git", - "reference": "b174585d1fe49ceed21928a945138948cb394600" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b174585d1fe49ceed21928a945138948cb394600", - "reference": "b174585d1fe49ceed21928a945138948cb394600", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.1.0 || ^2.0", - "php": "^7 || ^8" - }, - "replace": { - "ocramius/package-versions": "1.11.99" - }, - "require-dev": { - "composer/composer": "^1.9.3 || ^2.0@dev", - "ext-zip": "^1.13", - "phpunit/phpunit": "^6.5 || ^7" + "suggest": { + "symfony/service-implementation": "" }, - "type": "composer-plugin", + "type": "library", "extra": { - "class": "PackageVersions\\Installer", "branch-alias": { - "dev-master": "1.x-dev" + "dev-main": "3.0-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" } }, "autoload": { "psr-4": { - "PackageVersions\\": "src/PackageVersions" + "Symfony\\Contracts\\Service\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -1000,66 +1208,84 @@ ], "authors": [ { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", + "description": "Generic abstractions related to writing services", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], "support": { - "issues": "https://github.com/composer/package-versions-deprecated/issues", - "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.4" + "source": "https://github.com/symfony/service-contracts/tree/v3.0.0" }, "funding": [ { - "url": "https://packagist.com", + "url": "https://symfony.com/sponsor", "type": "custom" }, { - "url": "https://github.com/composer", + "url": "https://github.com/fabpot", "type": "github" }, { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2021-09-13T08:41:34+00:00" + "time": "2021-11-04T17:53:12+00:00" }, { - "name": "composer/semver", - "version": "3.2.6", + "name": "symfony/string", + "version": "v6.0.1", "source": { "type": "git", - "url": "https://github.com/composer/semver.git", - "reference": "83e511e247de329283478496f7a1e114c9517506" + "url": "https://github.com/symfony/string.git", + "reference": "0cfed595758ec6e0a25591bdc8ca733c1896af32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/83e511e247de329283478496f7a1e114c9517506", - "reference": "83e511e247de329283478496f7a1e114c9517506", + "url": "https://api.github.com/repos/symfony/string/zipball/0cfed595758ec6e0a25591bdc8ca733c1896af32", + "reference": "0cfed595758ec6e0a25591bdc8ca733c1896af32", "shasum": "" }, "require": { - "php": "^5.3.2 || ^7.0 || ^8.0" + "php": ">=8.0.2", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-intl-grapheme": "~1.0", + "symfony/polyfill-intl-normalizer": "~1.0", + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "symfony/translation-contracts": "<2.0" }, "require-dev": { - "phpstan/phpstan": "^0.12.54", - "symfony/phpunit-bridge": "^4.2 || ^5" + "symfony/error-handler": "^5.4|^6.0", + "symfony/http-client": "^5.4|^6.0", + "symfony/translation-contracts": "^2.0|^3.0", + "symfony/var-exporter": "^5.4|^6.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.x-dev" - } - }, "autoload": { "psr-4": { - "Composer\\Semver\\": "src" - } + "Symfony\\Component\\String\\": "" + }, + "files": [ + "Resources/functions.php" + ], + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1067,76 +1293,85 @@ ], "authors": [ { - "name": "Nils Adermann", - "email": "naderman@naderman.de", - "homepage": "http://www.naderman.de" - }, - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { - "name": "Rob Bast", - "email": "rob.bast@gmail.com", - "homepage": "http://robbast.nl" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Semver library that offers utilities, version constraint parsing and validation.", + "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way", + "homepage": "https://symfony.com", "keywords": [ - "semantic", - "semver", - "validation", - "versioning" + "grapheme", + "i18n", + "string", + "unicode", + "utf-8", + "utf8" ], "support": { - "irc": "irc://irc.freenode.org/composer", - "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.2.6" + "source": "https://github.com/symfony/string/tree/v6.0.1" }, "funding": [ { - "url": "https://packagist.com", + "url": "https://symfony.com/sponsor", "type": "custom" }, { - "url": "https://github.com/composer", + "url": "https://github.com/fabpot", "type": "github" }, { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2021-10-25T11:34:17+00:00" - }, + "time": "2021-12-08T15:13:44+00:00" + } + ], + "packages-dev": [ { - "name": "composer/xdebug-handler", - "version": "2.0.2", + "name": "amphp/amp", + "version": "v2.6.1", "source": { "type": "git", - "url": "https://github.com/composer/xdebug-handler.git", - "reference": "84674dd3a7575ba617f5a76d7e9e29a7d3891339" + "url": "https://github.com/amphp/amp.git", + "reference": "c5fc66a78ee38d7ac9195a37bacaf940eb3f65ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/84674dd3a7575ba617f5a76d7e9e29a7d3891339", - "reference": "84674dd3a7575ba617f5a76d7e9e29a7d3891339", + "url": "https://api.github.com/repos/amphp/amp/zipball/c5fc66a78ee38d7ac9195a37bacaf940eb3f65ae", + "reference": "c5fc66a78ee38d7ac9195a37bacaf940eb3f65ae", "shasum": "" }, "require": { - "php": "^5.3.2 || ^7.0 || ^8.0", - "psr/log": "^1 || ^2 || ^3" + "php": ">=7.1" }, "require-dev": { - "phpstan/phpstan": "^0.12.55", - "symfony/phpunit-bridge": "^4.2 || ^5" + "amphp/php-cs-fixer-config": "dev-master", + "amphp/phpunit-util": "^1", + "ext-json": "*", + "jetbrains/phpstorm-stubs": "^2019.3", + "phpunit/phpunit": "^7 | ^8 | ^9", + "psalm/phar": "^3.11@dev", + "react/promise": "^2" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } + }, "autoload": { "psr-4": { - "Composer\\XdebugHandler\\": "src" - } + "Amp\\": "lib" + }, + "files": [ + "lib/functions.php", + "lib/Internal/functions.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1144,104 +1379,159 @@ ], "authors": [ { - "name": "John Stevenson", - "email": "john-stevenson@blueyonder.co.uk" + "name": "Daniel Lowrey", + "email": "rdlowrey@php.net" + }, + { + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" + }, + { + "name": "Bob Weinand", + "email": "bobwei9@hotmail.com" + }, + { + "name": "Niklas Keller", + "email": "me@kelunik.com" } ], - "description": "Restarts a process without Xdebug.", + "description": "A non-blocking concurrency framework for PHP applications.", + "homepage": "http://amphp.org/amp", "keywords": [ - "Xdebug", - "performance" + "async", + "asynchronous", + "awaitable", + "concurrency", + "event", + "event-loop", + "future", + "non-blocking", + "promise" ], "support": { - "irc": "irc://irc.freenode.org/composer", - "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/2.0.2" + "irc": "irc://irc.freenode.org/amphp", + "issues": "https://github.com/amphp/amp/issues", + "source": "https://github.com/amphp/amp/tree/v2.6.1" }, "funding": [ { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", + "url": "https://github.com/amphp", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" } ], - "time": "2021-07-31T17:03:58+00:00" + "time": "2021-09-23T18:43:08+00:00" }, { - "name": "dnoegel/php-xdg-base-dir", - "version": "v0.1.1", + "name": "amphp/byte-stream", + "version": "v1.8.1", "source": { "type": "git", - "url": "https://github.com/dnoegel/php-xdg-base-dir.git", - "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd" + "url": "https://github.com/amphp/byte-stream.git", + "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd", - "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd", + "url": "https://api.github.com/repos/amphp/byte-stream/zipball/acbd8002b3536485c997c4e019206b3f10ca15bd", + "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd", "shasum": "" }, "require": { - "php": ">=5.3.2" + "amphp/amp": "^2", + "php": ">=7.1" }, "require-dev": { - "phpunit/phpunit": "~7.0|~6.0|~5.0|~4.8.35" + "amphp/php-cs-fixer-config": "dev-master", + "amphp/phpunit-util": "^1.4", + "friendsofphp/php-cs-fixer": "^2.3", + "jetbrains/phpstorm-stubs": "^2019.3", + "phpunit/phpunit": "^6 || ^7 || ^8", + "psalm/phar": "^3.11.4" }, "type": "library", - "autoload": { - "psr-4": { - "XdgBaseDir\\": "src/" + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" } }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" + "autoload": { + "psr-4": { + "Amp\\ByteStream\\": "lib" + }, + "files": [ + "lib/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" + }, + { + "name": "Niklas Keller", + "email": "me@kelunik.com" + } + ], + "description": "A stream abstraction to make working with non-blocking I/O simple.", + "homepage": "http://amphp.org/byte-stream", + "keywords": [ + "amp", + "amphp", + "async", + "io", + "non-blocking", + "stream" ], - "description": "implementation of xdg base directory specification for php", "support": { - "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues", - "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1" + "irc": "irc://irc.freenode.org/amphp", + "issues": "https://github.com/amphp/byte-stream/issues", + "source": "https://github.com/amphp/byte-stream/tree/v1.8.1" }, - "time": "2019-12-04T15:06:13+00:00" + "funding": [ + { + "url": "https://github.com/amphp", + "type": "github" + } + ], + "time": "2021-03-30T17:13:30+00:00" }, { - "name": "doctrine/annotations", - "version": "1.13.2", + "name": "behat/gherkin", + "version": "v4.9.0", "source": { "type": "git", - "url": "https://github.com/doctrine/annotations.git", - "reference": "5b668aef16090008790395c02c893b1ba13f7e08" + "url": "https://github.com/Behat/Gherkin.git", + "reference": "0bc8d1e30e96183e4f36db9dc79caead300beff4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/5b668aef16090008790395c02c893b1ba13f7e08", - "reference": "5b668aef16090008790395c02c893b1ba13f7e08", + "url": "https://api.github.com/repos/Behat/Gherkin/zipball/0bc8d1e30e96183e4f36db9dc79caead300beff4", + "reference": "0bc8d1e30e96183e4f36db9dc79caead300beff4", "shasum": "" }, "require": { - "doctrine/lexer": "1.*", - "ext-tokenizer": "*", - "php": "^7.1 || ^8.0", - "psr/cache": "^1 || ^2 || ^3" + "php": "~7.2|~8.0" }, "require-dev": { - "doctrine/cache": "^1.11 || ^2.0", - "doctrine/coding-standard": "^6.0 || ^8.1", - "phpstan/phpstan": "^0.12.20", - "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5", - "symfony/cache": "^4.4 || ^5.2" + "cucumber/cucumber": "dev-gherkin-22.0.0", + "phpunit/phpunit": "~8|~9", + "symfony/yaml": "~3|~4|~5" + }, + "suggest": { + "symfony/yaml": "If you want to parse features, represented in YAML files" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev" + } + }, "autoload": { - "psr-4": { - "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" + "psr-0": { + "Behat\\Gherkin": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1250,70 +1540,92 @@ ], "authors": [ { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" } ], - "description": "Docblock Annotations Parser", - "homepage": "https://www.doctrine-project.org/projects/annotations.html", + "description": "Gherkin DSL parser for PHP", + "homepage": "http://behat.org/", "keywords": [ - "annotations", - "docblock", + "BDD", + "Behat", + "Cucumber", + "DSL", + "gherkin", "parser" ], "support": { - "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/1.13.2" + "issues": "https://github.com/Behat/Gherkin/issues", + "source": "https://github.com/Behat/Gherkin/tree/v4.9.0" }, - "time": "2021-08-05T19:00:23+00:00" + "time": "2021-10-12T13:05:09+00:00" }, { - "name": "doctrine/instantiator", - "version": "1.4.0", + "name": "codeception/codeception", + "version": "4.1.24", "source": { "type": "git", - "url": "https://github.com/doctrine/instantiator.git", - "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b" + "url": "https://github.com/Codeception/Codeception.git", + "reference": "1fc3a8f4d6cf7350e1b69afd136708cfffc89e9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b", - "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b", + "url": "https://api.github.com/repos/Codeception/Codeception/zipball/1fc3a8f4d6cf7350e1b69afd136708cfffc89e9e", + "reference": "1fc3a8f4d6cf7350e1b69afd136708cfffc89e9e", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "behat/gherkin": "^4.4.0", + "codeception/lib-asserts": "^1.0", + "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.1.1 | ^9.0", + "codeception/stub": "^2.0 | ^3.0", + "ext-curl": "*", + "ext-json": "*", + "ext-mbstring": "*", + "guzzlehttp/psr7": "^1.4 | ^2.0", + "php": ">=5.6.0 <9.0", + "symfony/console": ">=2.7 <6.0", + "symfony/css-selector": ">=2.7 <6.0", + "symfony/event-dispatcher": ">=2.7 <6.0", + "symfony/finder": ">=2.7 <6.0", + "symfony/yaml": ">=2.7 <6.0" }, "require-dev": { - "doctrine/coding-standard": "^8.0", - "ext-pdo": "*", - "ext-phar": "*", - "phpbench/phpbench": "^0.13 || 1.0.0-alpha2", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-phpunit": "^0.12", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + "codeception/module-asserts": "1.*@dev", + "codeception/module-cli": "1.*@dev", + "codeception/module-db": "1.*@dev", + "codeception/module-filesystem": "1.*@dev", + "codeception/module-phpbrowser": "1.*@dev", + "codeception/specify": "~0.3", + "codeception/util-universalframework": "*@dev", + "monolog/monolog": "~1.8", + "squizlabs/php_codesniffer": "~2.0", + "symfony/process": ">=2.7 <6.0", + "vlucas/phpdotenv": "^2.0 | ^3.0 | ^4.0 | ^5.0" + }, + "suggest": { + "codeception/specify": "BDD-style code blocks", + "codeception/verify": "BDD-style assertions", + "hoa/console": "For interactive console functionality", + "stecman/symfony-console-completion": "For BASH autocompletion", + "symfony/phpunit-bridge": "For phpunit-bridge support" }, + "bin": [ + "codecept" + ], "type": "library", + "extra": { + "branch-alias": [] + }, "autoload": { "psr-4": { - "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" - } + "Codeception\\": "src/Codeception", + "Codeception\\Extension\\": "ext" + }, + "files": [ + "functions.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1321,69 +1633,56 @@ ], "authors": [ { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "homepage": "https://ocramius.github.io/" + "name": "Michael Bodnarchuk", + "email": "davert@mail.ua", + "homepage": "http://codegyre.com" } ], - "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://www.doctrine-project.org/projects/instantiator.html", + "description": "BDD-style testing framework", + "homepage": "http://codeception.com/", "keywords": [ - "constructor", - "instantiate" + "BDD", + "TDD", + "acceptance testing", + "functional testing", + "unit testing" ], "support": { - "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.4.0" + "issues": "https://github.com/Codeception/Codeception/issues", + "source": "https://github.com/Codeception/Codeception/tree/4.1.24" }, "funding": [ { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", - "type": "tidelift" + "url": "https://opencollective.com/codeception", + "type": "open_collective" } ], - "time": "2020-11-10T18:47:58+00:00" + "time": "2021-12-16T12:57:06+00:00" }, { - "name": "doctrine/lexer", - "version": "1.2.1", + "name": "codeception/lib-asserts", + "version": "1.13.2", "source": { "type": "git", - "url": "https://github.com/doctrine/lexer.git", - "reference": "e864bbf5904cb8f5bb334f99209b48018522f042" + "url": "https://github.com/Codeception/lib-asserts.git", + "reference": "184231d5eab66bc69afd6b9429344d80c67a33b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042", - "reference": "e864bbf5904cb8f5bb334f99209b48018522f042", + "url": "https://api.github.com/repos/Codeception/lib-asserts/zipball/184231d5eab66bc69afd6b9429344d80c67a33b6", + "reference": "184231d5eab66bc69afd6b9429344d80c67a33b6", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" - }, - "require-dev": { - "doctrine/coding-standard": "^6.0", - "phpstan/phpstan": "^0.11.8", - "phpunit/phpunit": "^8.2" + "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.0.3 | ^9.0", + "ext-dom": "*", + "php": ">=5.6.0 <9.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, "autoload": { - "psr-4": { - "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1391,228 +1690,163 @@ ], "authors": [ { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" + "name": "Michael Bodnarchuk", + "email": "davert@mail.ua", + "homepage": "http://codegyre.com" }, { - "name": "Roman Borschel", - "email": "roman@code-factory.org" + "name": "Gintautas Miselis" }, { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" + "name": "Gustavo Nieves", + "homepage": "https://medium.com/@ganieves" } ], - "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.", - "homepage": "https://www.doctrine-project.org/projects/lexer.html", + "description": "Assertion methods used by Codeception core and Asserts module", + "homepage": "https://codeception.com/", "keywords": [ - "annotations", - "docblock", - "lexer", - "parser", - "php" + "codeception" ], "support": { - "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/1.2.1" + "issues": "https://github.com/Codeception/lib-asserts/issues", + "source": "https://github.com/Codeception/lib-asserts/tree/1.13.2" }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", - "type": "tidelift" - } - ], - "time": "2020-05-25T17:44:05+00:00" + "time": "2020-10-21T16:26:20+00:00" }, { - "name": "felixfbecker/advanced-json-rpc", - "version": "v3.2.1", + "name": "codeception/lib-innerbrowser", + "version": "1.5.1", "source": { "type": "git", - "url": "https://github.com/felixfbecker/php-advanced-json-rpc.git", - "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447" + "url": "https://github.com/Codeception/lib-innerbrowser.git", + "reference": "31b4b56ad53c3464fcb2c0a14d55a51a201bd3c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/b5f37dbff9a8ad360ca341f3240dc1c168b45447", - "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447", + "url": "https://api.github.com/repos/Codeception/lib-innerbrowser/zipball/31b4b56ad53c3464fcb2c0a14d55a51a201bd3c2", + "reference": "31b4b56ad53c3464fcb2c0a14d55a51a201bd3c2", "shasum": "" }, "require": { - "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", - "php": "^7.1 || ^8.0", - "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0" + "codeception/codeception": "4.*@dev", + "ext-dom": "*", + "ext-json": "*", + "ext-mbstring": "*", + "php": ">=5.6.0 <9.0", + "symfony/browser-kit": ">=2.7 <6.0", + "symfony/dom-crawler": ">=2.7 <6.0" + }, + "conflict": { + "codeception/codeception": "<4.0" }, "require-dev": { - "phpunit/phpunit": "^7.0 || ^8.0" + "codeception/util-universalframework": "dev-master" }, "type": "library", "autoload": { - "psr-4": { - "AdvancedJsonRpc\\": "lib/" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "ISC" + "MIT" ], "authors": [ { - "name": "Felix Becker", - "email": "felix.b@outlook.com" + "name": "Michael Bodnarchuk", + "email": "davert@mail.ua", + "homepage": "http://codegyre.com" + }, + { + "name": "Gintautas Miselis" } ], - "description": "A more advanced JSONRPC implementation", + "description": "Parent library for all Codeception framework modules and PhpBrowser", + "homepage": "https://codeception.com/", + "keywords": [ + "codeception" + ], "support": { - "issues": "https://github.com/felixfbecker/php-advanced-json-rpc/issues", - "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/v3.2.1" + "issues": "https://github.com/Codeception/lib-innerbrowser/issues", + "source": "https://github.com/Codeception/lib-innerbrowser/tree/1.5.1" }, - "time": "2021-06-11T22:34:44+00:00" + "time": "2021-08-30T15:21:42+00:00" }, { - "name": "felixfbecker/language-server-protocol", - "version": "1.5.1", + "name": "codeception/module-apc", + "version": "1.0.2", "source": { "type": "git", - "url": "https://github.com/felixfbecker/php-language-server-protocol.git", - "reference": "9d846d1f5cf101deee7a61c8ba7caa0a975cd730" + "url": "https://github.com/Codeception/module-apc.git", + "reference": "07fbd6dd12b9d3f4b738bcac8266eecefb470365" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/9d846d1f5cf101deee7a61c8ba7caa0a975cd730", - "reference": "9d846d1f5cf101deee7a61c8ba7caa0a975cd730", + "url": "https://api.github.com/repos/Codeception/module-apc/zipball/07fbd6dd12b9d3f4b738bcac8266eecefb470365", + "reference": "07fbd6dd12b9d3f4b738bcac8266eecefb470365", "shasum": "" }, "require": { - "php": ">=7.1" - }, - "require-dev": { - "phpstan/phpstan": "*", - "squizlabs/php_codesniffer": "^3.1", - "vimeo/psalm": "^4.0" + "codeception/codeception": "^4.0", + "php": ">=5.6.0 <9.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, "autoload": { - "psr-4": { - "LanguageServerProtocol\\": "src/" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "ISC" + "MIT" ], "authors": [ { - "name": "Felix Becker", - "email": "felix.b@outlook.com" + "name": "Serghei Iakovlev" + }, + { + "name": "Gintautas Miselis" } ], - "description": "PHP classes for the Language Server Protocol", + "description": "APC module for Codeception", + "homepage": "http://codeception.com/", "keywords": [ - "language", - "microsoft", - "php", - "server" + "apc", + "codeception" ], "support": { - "issues": "https://github.com/felixfbecker/php-language-server-protocol/issues", - "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/1.5.1" + "issues": "https://github.com/Codeception/module-apc/issues", + "source": "https://github.com/Codeception/module-apc/tree/1.0.2" }, - "time": "2021-02-22T14:02:09+00:00" + "time": "2020-10-26T06:16:02+00:00" }, { - "name": "friendsofphp/php-cs-fixer", - "version": "v2.19.3", + "name": "codeception/module-asserts", + "version": "1.3.1", "source": { "type": "git", - "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "75ac86f33fab4714ea5a39a396784d83ae3b5ed8" + "url": "https://github.com/Codeception/module-asserts.git", + "reference": "59374f2fef0cabb9e8ddb53277e85cdca74328de" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/75ac86f33fab4714ea5a39a396784d83ae3b5ed8", - "reference": "75ac86f33fab4714ea5a39a396784d83ae3b5ed8", + "url": "https://api.github.com/repos/Codeception/module-asserts/zipball/59374f2fef0cabb9e8ddb53277e85cdca74328de", + "reference": "59374f2fef0cabb9e8ddb53277e85cdca74328de", "shasum": "" }, "require": { - "composer/semver": "^1.4 || ^2.0 || ^3.0", - "composer/xdebug-handler": "^1.2 || ^2.0", - "doctrine/annotations": "^1.2", - "ext-json": "*", - "ext-tokenizer": "*", - "php": "^5.6 || ^7.0 || ^8.0", - "php-cs-fixer/diff": "^1.3", - "symfony/console": "^3.4.43 || ^4.1.6 || ^5.0", - "symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0", - "symfony/filesystem": "^3.0 || ^4.0 || ^5.0", - "symfony/finder": "^3.0 || ^4.0 || ^5.0", - "symfony/options-resolver": "^3.0 || ^4.0 || ^5.0", - "symfony/polyfill-php70": "^1.0", - "symfony/polyfill-php72": "^1.4", - "symfony/process": "^3.0 || ^4.0 || ^5.0", - "symfony/stopwatch": "^3.0 || ^4.0 || ^5.0" - }, - "require-dev": { - "justinrainbow/json-schema": "^5.0", - "keradus/cli-executor": "^1.4", - "mikey179/vfsstream": "^1.6", - "php-coveralls/php-coveralls": "^2.4.2", - "php-cs-fixer/accessible-object": "^1.0", - "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2", - "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1", - "phpspec/prophecy-phpunit": "^1.1 || ^2.0", - "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.13 || ^9.5", - "phpunitgoodpractices/polyfill": "^1.5", - "phpunitgoodpractices/traits": "^1.9.1", - "sanmai/phpunit-legacy-adapter": "^6.4 || ^8.2.1", - "symfony/phpunit-bridge": "^5.2.1", - "symfony/yaml": "^3.0 || ^4.0 || ^5.0" - }, - "suggest": { - "ext-dom": "For handling output formats in XML", - "ext-mbstring": "For handling non-UTF8 characters.", - "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.", - "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.", - "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible." + "codeception/codeception": "*@dev", + "codeception/lib-asserts": "^1.13.1", + "php": ">=5.6.0 <9.0" }, - "bin": [ - "php-cs-fixer" - ], - "type": "application", - "extra": { - "branch-alias": { - "dev-master": "2.19-dev" - } + "conflict": { + "codeception/codeception": "<4.0" }, + "type": "library", "autoload": { - "psr-4": { - "PhpCsFixer\\": "src/" - }, "classmap": [ - "tests/Test/AbstractFixerTestCase.php", - "tests/Test/AbstractIntegrationCaseFactory.php", - "tests/Test/AbstractIntegrationTestCase.php", - "tests/Test/Assert/AssertTokensTrait.php", - "tests/Test/IntegrationCase.php", - "tests/Test/IntegrationCaseFactory.php", - "tests/Test/IntegrationCaseFactoryInterface.php", - "tests/Test/InternalIntegrationCaseFactory.php", - "tests/Test/IsIdenticalConstraint.php", - "tests/Test/TokensWithObservedTransformers.php", - "tests/TestCase.php" + "src/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -1621,76 +1855,154 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Michael Bodnarchuk" }, { - "name": "Dariusz Rumiński", - "email": "dariusz.ruminski@gmail.com" + "name": "Gintautas Miselis" + }, + { + "name": "Gustavo Nieves", + "homepage": "https://medium.com/@ganieves" } ], - "description": "A tool to automatically fix PHP code style", + "description": "Codeception module containing various assertions", + "homepage": "https://codeception.com/", + "keywords": [ + "assertions", + "asserts", + "codeception" + ], "support": { - "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", - "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.19.3" + "issues": "https://github.com/Codeception/module-asserts/issues", + "source": "https://github.com/Codeception/module-asserts/tree/1.3.1" }, - "funding": [ - { - "url": "https://github.com/keradus", - "type": "github" - } - ], - "time": "2021-11-15T17:17:55+00:00" + "time": "2020-10-21T16:48:15+00:00" }, { - "name": "guzzlehttp/guzzle", - "version": "7.4.0", + "name": "codeception/module-cli", + "version": "1.1.1", "source": { "type": "git", - "url": "https://github.com/guzzle/guzzle.git", - "reference": "868b3571a039f0ebc11ac8f344f4080babe2cb94" - }, + "url": "https://github.com/Codeception/module-cli.git", + "reference": "1f841ad4a1d43e5d9e60a43c4cc9e5af8008024f" + }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/868b3571a039f0ebc11ac8f344f4080babe2cb94", - "reference": "868b3571a039f0ebc11ac8f344f4080babe2cb94", + "url": "https://api.github.com/repos/Codeception/module-cli/zipball/1f841ad4a1d43e5d9e60a43c4cc9e5af8008024f", + "reference": "1f841ad4a1d43e5d9e60a43c4cc9e5af8008024f", "shasum": "" }, "require": { - "ext-json": "*", - "guzzlehttp/promises": "^1.5", - "guzzlehttp/psr7": "^1.8.3 || ^2.1", - "php": "^7.2.5 || ^8.0", - "psr/http-client": "^1.0", - "symfony/deprecation-contracts": "^2.2" + "codeception/codeception": "*@dev", + "php": ">=5.6.0 <9.0" }, - "provide": { - "psr/http-client-implementation": "1.0" + "conflict": { + "codeception/codeception": "<4.0" }, - "require-dev": { - "bamarni/composer-bin-plugin": "^1.4.1", - "ext-curl": "*", - "php-http/client-integration-tests": "^3.0", - "phpunit/phpunit": "^8.5.5 || ^9.3.5", - "psr/log": "^1.1 || ^2.0 || ^3.0" + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] }, - "suggest": { - "ext-curl": "Required for CURL handler support", - "ext-intl": "Required for Internationalized Domain Name (IDN) support", - "psr/log": "Required for using the Log middleware" + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Bodnarchuk" + } + ], + "description": "Codeception module for testing basic shell commands and shell output", + "homepage": "http://codeception.com/", + "keywords": [ + "codeception" + ], + "support": { + "issues": "https://github.com/Codeception/module-cli/issues", + "source": "https://github.com/Codeception/module-cli/tree/1.1.1" + }, + "time": "2020-12-26T16:56:19+00:00" + }, + { + "name": "codeception/module-db", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/Codeception/module-db.git", + "reference": "8c8076cd05d4db95798acd7dba2a56578210982c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Codeception/module-db/zipball/8c8076cd05d4db95798acd7dba2a56578210982c", + "reference": "8c8076cd05d4db95798acd7dba2a56578210982c", + "shasum": "" + }, + "require": { + "codeception/codeception": "*@dev", + "php": ">=5.6.0 <9.0" + }, + "conflict": { + "codeception/codeception": "<4.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "7.4-dev" + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Bodnarchuk" + }, + { + "name": "Gintautas Miselis" } + ], + "description": "DB module for Codeception", + "homepage": "http://codeception.com/", + "keywords": [ + "codeception", + "database-testing", + "db-testing" + ], + "support": { + "issues": "https://github.com/Codeception/module-db/issues", + "source": "https://github.com/Codeception/module-db/tree/1.1.0" }, + "time": "2020-12-20T13:37:07+00:00" + }, + { + "name": "codeception/module-filesystem", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/Codeception/module-filesystem.git", + "reference": "781be167fb1557bfc9b61e0a4eac60a32c534ec1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Codeception/module-filesystem/zipball/781be167fb1557bfc9b61e0a4eac60a32c534ec1", + "reference": "781be167fb1557bfc9b61e0a4eac60a32c534ec1", + "shasum": "" + }, + "require": { + "codeception/codeception": "^4.0", + "php": ">=5.6.0 <9.0", + "symfony/finder": ">=2.7 <6.0" + }, + "conflict": { + "codeception/codeception": "<4.0" + }, + "type": "library", "autoload": { - "psr-4": { - "GuzzleHttp\\": "src/" - }, - "files": [ - "src/functions_include.php" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -1699,106 +2011,319 @@ ], "authors": [ { - "name": "Graham Campbell", - "email": "hello@gjcampbell.co.uk", - "homepage": "https://github.com/GrahamCampbell" + "name": "Michael Bodnarchuk" }, { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, + "name": "Gintautas Miselis" + } + ], + "description": "Codeception module for testing local filesystem", + "homepage": "http://codeception.com/", + "keywords": [ + "codeception", + "filesystem" + ], + "support": { + "issues": "https://github.com/Codeception/module-filesystem/issues", + "source": "https://github.com/Codeception/module-filesystem/tree/1.0.3" + }, + "time": "2020-10-24T14:46:40+00:00" + }, + { + "name": "codeception/module-phalcon5", + "version": "v1.0.1", + "source": { + "type": "git", + "url": "https://github.com/Codeception/module-phalcon5.git", + "reference": "330564e8a8e5d2b16095bf434028b2b31a477a9a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Codeception/module-phalcon5/zipball/330564e8a8e5d2b16095bf434028b2b31a477a9a", + "reference": "330564e8a8e5d2b16095bf434028b2b31a477a9a", + "shasum": "" + }, + "require": { + "codeception/codeception": "^4.0", + "codeception/lib-innerbrowser": "^1.0", + "codeception/module-asserts": "^1.0", + "codeception/module-db": "^1.0", + "codeception/module-phpbrowser": "^1.0", + "ext-json": "*", + "php": ">=7.4.0" + }, + "require-dev": { + "codeception/util-robohelpers": "dev-master", + "squizlabs/php_codesniffer": "^3.4", + "vimeo/psalm": "^3.6", + "vlucas/phpdotenv": "^4.1" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ { - "name": "Jeremy Lindblom", - "email": "jeremeamia@gmail.com", - "homepage": "https://github.com/jeremeamia" + "name": "Phalcon Team", + "email": "team@phalcon.io", + "homepage": "https://phalcon.io/en/team" }, { - "name": "George Mponos", - "email": "gmponos@gmail.com", - "homepage": "https://github.com/gmponos" - }, + "name": "Codeception Team", + "email": "team@codeception.com", + "homepage": "https://codeception.com/" + } + ], + "description": "Codeception module for Phalcon 5 framework", + "homepage": "https://codeception.com/", + "keywords": [ + "codeception", + "phalcon", + "phalcon5" + ], + "support": { + "issues": "https://github.com/Codeception/module-phalcon5/issues", + "source": "https://github.com/Codeception/module-phalcon5/tree/v1.0.1" + }, + "time": "2021-12-16T13:03:56+00:00" + }, + { + "name": "codeception/module-phpbrowser", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/Codeception/module-phpbrowser.git", + "reference": "770a6be4160a5c0c08d100dd51bff35f6056bbf1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Codeception/module-phpbrowser/zipball/770a6be4160a5c0c08d100dd51bff35f6056bbf1", + "reference": "770a6be4160a5c0c08d100dd51bff35f6056bbf1", + "shasum": "" + }, + "require": { + "codeception/codeception": "^4.0", + "codeception/lib-innerbrowser": "^1.3", + "guzzlehttp/guzzle": "^6.3|^7.0", + "php": ">=5.6.0 <9.0" + }, + "conflict": { + "codeception/codeception": "<4.0" + }, + "require-dev": { + "codeception/module-rest": "^1.0" + }, + "suggest": { + "codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com", - "homepage": "https://github.com/Nyholm" + "name": "Michael Bodnarchuk" }, { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com", - "homepage": "https://github.com/sagikazarmark" + "name": "Gintautas Miselis" + } + ], + "description": "Codeception module for testing web application over HTTP", + "homepage": "http://codeception.com/", + "keywords": [ + "codeception", + "functional-testing", + "http" + ], + "support": { + "issues": "https://github.com/Codeception/module-phpbrowser/issues", + "source": "https://github.com/Codeception/module-phpbrowser/tree/1.0.2" + }, + "time": "2020-10-24T15:29:28+00:00" + }, + { + "name": "codeception/module-redis", + "version": "1.3.0", + "source": { + "type": "git", + "url": "https://github.com/Codeception/module-redis.git", + "reference": "cc04c3de32114c68c4e3c552766606e762b23117" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Codeception/module-redis/zipball/cc04c3de32114c68c4e3c552766606e762b23117", + "reference": "cc04c3de32114c68c4e3c552766606e762b23117", + "shasum": "" + }, + "require": { + "codeception/codeception": "^4.0", + "php": "^7.4 || ^8.0", + "predis/predis": "^1.0" + }, + "require-dev": { + "codeception/stub": "^3.7" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Bodnarchuk" }, { - "name": "Tobias Schultze", - "email": "webmaster@tubo-world.de", - "homepage": "https://github.com/Tobion" + "name": "Dmitriy Maltsev" } ], - "description": "Guzzle is a PHP HTTP client library", + "description": "Redis module for Codeception", + "homepage": "https://codeception.com/", "keywords": [ - "client", - "curl", - "framework", - "http", - "http client", - "psr-18", - "psr-7", - "rest", - "web service" + "codeception", + "redis" + ], + "support": { + "issues": "https://github.com/Codeception/module-redis/issues", + "source": "https://github.com/Codeception/module-redis/tree/1.3.0" + }, + "time": "2021-11-30T03:16:07+00:00" + }, + { + "name": "codeception/phpunit-wrapper", + "version": "8.1.4", + "source": { + "type": "git", + "url": "https://github.com/Codeception/phpunit-wrapper.git", + "reference": "f41335f0b4dd17cf7bbc63e87943b3ae72a8bbc3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/f41335f0b4dd17cf7bbc63e87943b3ae72a8bbc3", + "reference": "f41335f0b4dd17cf7bbc63e87943b3ae72a8bbc3", + "shasum": "" + }, + "require": { + "php": ">=7.2", + "phpunit/php-code-coverage": "^7.0", + "phpunit/phpunit": "^8.0", + "sebastian/comparator": "^3.0", + "sebastian/diff": "^3.0" + }, + "require-dev": { + "codeception/specify": "*", + "vlucas/phpdotenv": "^3.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Codeception\\PHPUnit\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Davert", + "email": "davert.php@resend.cc" + } ], + "description": "PHPUnit classes used by Codeception", "support": { - "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.4.0" + "issues": "https://github.com/Codeception/phpunit-wrapper/issues", + "source": "https://github.com/Codeception/phpunit-wrapper/tree/8.1.4" }, - "funding": [ - { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://github.com/Nyholm", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle", - "type": "tidelift" + "time": "2020-12-28T14:00:08+00:00" + }, + { + "name": "codeception/stub", + "version": "3.7.0", + "source": { + "type": "git", + "url": "https://github.com/Codeception/Stub.git", + "reference": "468dd5fe659f131fc997f5196aad87512f9b1304" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Codeception/Stub/zipball/468dd5fe659f131fc997f5196aad87512f9b1304", + "reference": "468dd5fe659f131fc997f5196aad87512f9b1304", + "shasum": "" + }, + "require": { + "phpunit/phpunit": "^8.4 | ^9.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Codeception\\": "src/" } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" ], - "time": "2021-10-18T09:52:00+00:00" + "description": "Flexible Stub wrapper for PHPUnit's Mock Builder", + "support": { + "issues": "https://github.com/Codeception/Stub/issues", + "source": "https://github.com/Codeception/Stub/tree/3.7.0" + }, + "time": "2020-07-03T15:54:43+00:00" }, { - "name": "guzzlehttp/promises", - "version": "1.5.1", + "name": "composer/package-versions-deprecated", + "version": "1.11.99.4", "source": { "type": "git", - "url": "https://github.com/guzzle/promises.git", - "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da" + "url": "https://github.com/composer/package-versions-deprecated.git", + "reference": "b174585d1fe49ceed21928a945138948cb394600" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da", - "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da", + "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b174585d1fe49ceed21928a945138948cb394600", + "reference": "b174585d1fe49ceed21928a945138948cb394600", "shasum": "" }, "require": { - "php": ">=5.5" + "composer-plugin-api": "^1.1.0 || ^2.0", + "php": "^7 || ^8" + }, + "replace": { + "ocramius/package-versions": "1.11.99" }, "require-dev": { - "symfony/phpunit-bridge": "^4.4 || ^5.1" + "composer/composer": "^1.9.3 || ^2.0@dev", + "ext-zip": "^1.13", + "phpunit/phpunit": "^6.5 || ^7" }, - "type": "library", + "type": "composer-plugin", "extra": { + "class": "PackageVersions\\Installer", "branch-alias": { - "dev-master": "1.5-dev" + "dev-master": "1.x-dev" } }, "autoload": { "psr-4": { - "GuzzleHttp\\Promise\\": "src/" - }, - "files": [ - "src/functions_include.php" - ] + "PackageVersions\\": "src/PackageVersions" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1806,91 +2331,66 @@ ], "authors": [ { - "name": "Graham Campbell", - "email": "hello@gjcampbell.co.uk", - "homepage": "https://github.com/GrahamCampbell" - }, - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com", - "homepage": "https://github.com/Nyholm" + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" }, { - "name": "Tobias Schultze", - "email": "webmaster@tubo-world.de", - "homepage": "https://github.com/Tobion" + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be" } ], - "description": "Guzzle promises library", - "keywords": [ - "promise" - ], + "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", "support": { - "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.1" + "issues": "https://github.com/composer/package-versions-deprecated/issues", + "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.4" }, "funding": [ { - "url": "https://github.com/GrahamCampbell", - "type": "github" + "url": "https://packagist.com", + "type": "custom" }, { - "url": "https://github.com/Nyholm", + "url": "https://github.com/composer", "type": "github" }, { - "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises", + "url": "https://tidelift.com/funding/github/packagist/composer/composer", "type": "tidelift" } ], - "time": "2021-10-22T20:56:57+00:00" + "time": "2021-09-13T08:41:34+00:00" }, { - "name": "guzzlehttp/psr7", - "version": "2.1.0", + "name": "composer/pcre", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/guzzle/psr7.git", - "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72" + "url": "https://github.com/composer/pcre.git", + "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/089edd38f5b8abba6cb01567c2a8aaa47cec4c72", - "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72", + "url": "https://api.github.com/repos/composer/pcre/zipball/3d322d715c43a1ac36c7fe215fa59336265500f2", + "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2", "shasum": "" }, "require": { - "php": "^7.2.5 || ^8.0", - "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", - "ralouphie/getallheaders": "^3.0" - }, - "provide": { - "psr/http-factory-implementation": "1.0", - "psr/http-message-implementation": "1.0" + "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.4.1", - "http-interop/http-factory-tests": "^0.9", - "phpunit/phpunit": "^8.5.8 || ^9.3.10" - }, - "suggest": { - "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" + "phpstan/phpstan": "^1", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^4.2 || ^5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-main": "1.x-dev" } }, "autoload": { "psr-4": { - "GuzzleHttp\\Psr7\\": "src/" + "Composer\\Pcre\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -1899,97 +2399,68 @@ ], "authors": [ { - "name": "Graham Campbell", - "email": "hello@gjcampbell.co.uk", - "homepage": "https://github.com/GrahamCampbell" - }, - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "George Mponos", - "email": "gmponos@gmail.com", - "homepage": "https://github.com/gmponos" - }, - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com", - "homepage": "https://github.com/Nyholm" - }, - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com", - "homepage": "https://github.com/sagikazarmark" - }, - { - "name": "Tobias Schultze", - "email": "webmaster@tubo-world.de", - "homepage": "https://github.com/Tobion" - }, - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com", - "homepage": "https://sagikazarmark.hu" + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" } ], - "description": "PSR-7 message implementation that also provides common utility methods", + "description": "PCRE wrapping library that offers type-safe preg_* replacements.", "keywords": [ - "http", - "message", - "psr-7", - "request", - "response", - "stream", - "uri", - "url" + "PCRE", + "preg", + "regex", + "regular expression" ], "support": { - "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.1.0" + "issues": "https://github.com/composer/pcre/issues", + "source": "https://github.com/composer/pcre/tree/1.0.0" }, "funding": [ { - "url": "https://github.com/GrahamCampbell", - "type": "github" + "url": "https://packagist.com", + "type": "custom" }, { - "url": "https://github.com/Nyholm", + "url": "https://github.com/composer", "type": "github" }, { - "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7", + "url": "https://tidelift.com/funding/github/packagist/composer/composer", "type": "tidelift" } ], - "time": "2021-10-06T17:43:30+00:00" + "time": "2021-12-06T15:17:27+00:00" }, { - "name": "mustache/mustache", - "version": "v2.13.0", + "name": "composer/semver", + "version": "3.2.6", "source": { "type": "git", - "url": "https://github.com/bobthecow/mustache.php.git", - "reference": "e95c5a008c23d3151d59ea72484d4f72049ab7f4" + "url": "https://github.com/composer/semver.git", + "reference": "83e511e247de329283478496f7a1e114c9517506" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/e95c5a008c23d3151d59ea72484d4f72049ab7f4", - "reference": "e95c5a008c23d3151d59ea72484d4f72049ab7f4", + "url": "https://api.github.com/repos/composer/semver/zipball/83e511e247de329283478496f7a1e114c9517506", + "reference": "83e511e247de329283478496f7a1e114c9517506", "shasum": "" }, "require": { - "php": ">=5.2.4" + "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "~1.11", - "phpunit/phpunit": "~3.7|~4.0|~5.0" + "phpstan/phpstan": "^0.12.54", + "symfony/phpunit-bridge": "^4.2 || ^5" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, "autoload": { - "psr-0": { - "Mustache": "src/" + "psr-4": { + "Composer\\Semver\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -1998,500 +2469,608 @@ ], "authors": [ { - "name": "Justin Hileman", - "email": "justin@justinhileman.info", - "homepage": "http://justinhileman.com" + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + }, + { + "name": "Rob Bast", + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" } ], - "description": "A Mustache implementation in PHP.", - "homepage": "https://github.com/bobthecow/mustache.php", + "description": "Semver library that offers utilities, version constraint parsing and validation.", "keywords": [ - "mustache", - "templating" + "semantic", + "semver", + "validation", + "versioning" ], "support": { - "issues": "https://github.com/bobthecow/mustache.php/issues", - "source": "https://github.com/bobthecow/mustache.php/tree/master" + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/semver/issues", + "source": "https://github.com/composer/semver/tree/3.2.6" }, - "time": "2019-11-23T21:40:31+00:00" + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2021-10-25T11:34:17+00:00" }, { - "name": "myclabs/deep-copy", - "version": "1.10.2", + "name": "composer/xdebug-handler", + "version": "2.0.3", "source": { "type": "git", - "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220" + "url": "https://github.com/composer/xdebug-handler.git", + "reference": "6555461e76962fd0379c444c46fd558a0fcfb65e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220", - "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6555461e76962fd0379c444c46fd558a0fcfb65e", + "reference": "6555461e76962fd0379c444c46fd558a0fcfb65e", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" - }, - "replace": { - "myclabs/deep-copy": "self.version" + "composer/pcre": "^1", + "php": "^5.3.2 || ^7.0 || ^8.0", + "psr/log": "^1 || ^2 || ^3" }, "require-dev": { - "doctrine/collections": "^1.0", - "doctrine/common": "^2.6", - "phpunit/phpunit": "^7.1" + "phpstan/phpstan": "^1.0", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0" }, "type": "library", "autoload": { "psr-4": { - "DeepCopy\\": "src/DeepCopy/" - }, - "files": [ - "src/DeepCopy/deep_copy.php" - ] + "Composer\\XdebugHandler\\": "src" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "description": "Create deep copies (clones) of your objects", + "authors": [ + { + "name": "John Stevenson", + "email": "john-stevenson@blueyonder.co.uk" + } + ], + "description": "Restarts a process without Xdebug.", "keywords": [ - "clone", - "copy", - "duplicate", - "object", - "object graph" + "Xdebug", + "performance" ], "support": { - "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2" + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/xdebug-handler/issues", + "source": "https://github.com/composer/xdebug-handler/tree/2.0.3" }, "funding": [ { - "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", "type": "tidelift" } ], - "time": "2020-11-13T09:40:50+00:00" + "time": "2021-12-08T13:07:32+00:00" }, { - "name": "netresearch/jsonmapper", - "version": "v4.0.0", + "name": "dnoegel/php-xdg-base-dir", + "version": "v0.1.1", "source": { "type": "git", - "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d" + "url": "https://github.com/dnoegel/php-xdg-base-dir.git", + "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d", - "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d", + "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd", + "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd", "shasum": "" }, "require": { - "ext-json": "*", - "ext-pcre": "*", - "ext-reflection": "*", - "ext-spl": "*", - "php": ">=7.1" + "php": ">=5.3.2" }, "require-dev": { - "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0", - "squizlabs/php_codesniffer": "~3.5" + "phpunit/phpunit": "~7.0|~6.0|~5.0|~4.8.35" }, "type": "library", "autoload": { - "psr-0": { - "JsonMapper": "src/" + "psr-4": { + "XdgBaseDir\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "OSL-3.0" - ], - "authors": [ - { - "name": "Christian Weiske", - "email": "cweiske@cweiske.de", - "homepage": "http://github.com/cweiske/jsonmapper/", - "role": "Developer" - } + "MIT" ], - "description": "Map nested JSON structures onto PHP classes", + "description": "implementation of xdg base directory specification for php", "support": { - "email": "cweiske@cweiske.de", - "issues": "https://github.com/cweiske/jsonmapper/issues", - "source": "https://github.com/cweiske/jsonmapper/tree/v4.0.0" + "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues", + "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1" }, - "time": "2020-12-01T19:48:11+00:00" + "time": "2019-12-04T15:06:13+00:00" }, { - "name": "nikic/php-parser", - "version": "v4.13.1", + "name": "doctrine/annotations", + "version": "1.13.2", "source": { "type": "git", - "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "63a79e8daa781cac14e5195e63ed8ae231dd10fd" + "url": "https://github.com/doctrine/annotations.git", + "reference": "5b668aef16090008790395c02c893b1ba13f7e08" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/63a79e8daa781cac14e5195e63ed8ae231dd10fd", - "reference": "63a79e8daa781cac14e5195e63ed8ae231dd10fd", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/5b668aef16090008790395c02c893b1ba13f7e08", + "reference": "5b668aef16090008790395c02c893b1ba13f7e08", "shasum": "" }, "require": { + "doctrine/lexer": "1.*", "ext-tokenizer": "*", - "php": ">=7.0" + "php": "^7.1 || ^8.0", + "psr/cache": "^1 || ^2 || ^3" }, "require-dev": { - "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + "doctrine/cache": "^1.11 || ^2.0", + "doctrine/coding-standard": "^6.0 || ^8.1", + "phpstan/phpstan": "^0.12.20", + "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5", + "symfony/cache": "^4.4 || ^5.2" }, - "bin": [ - "bin/php-parse" - ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.9-dev" - } - }, "autoload": { "psr-4": { - "PhpParser\\": "lib/PhpParser" + "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Nikita Popov" + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" } ], - "description": "A PHP parser written in PHP", + "description": "Docblock Annotations Parser", + "homepage": "https://www.doctrine-project.org/projects/annotations.html", "keywords": [ - "parser", - "php" + "annotations", + "docblock", + "parser" ], "support": { - "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.1" + "issues": "https://github.com/doctrine/annotations/issues", + "source": "https://github.com/doctrine/annotations/tree/1.13.2" }, - "time": "2021-11-03T20:52:16+00:00" + "time": "2021-08-05T19:00:23+00:00" }, { - "name": "openlss/lib-array2xml", - "version": "1.0.0", + "name": "doctrine/instantiator", + "version": "1.4.0", "source": { "type": "git", - "url": "https://github.com/nullivex/lib-array2xml.git", - "reference": "a91f18a8dfc69ffabe5f9b068bc39bb202c81d90" + "url": "https://github.com/doctrine/instantiator.git", + "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nullivex/lib-array2xml/zipball/a91f18a8dfc69ffabe5f9b068bc39bb202c81d90", - "reference": "a91f18a8dfc69ffabe5f9b068bc39bb202c81d90", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b", + "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b", "shasum": "" }, "require": { - "php": ">=5.3.2" + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "doctrine/coding-standard": "^8.0", + "ext-pdo": "*", + "ext-phar": "*", + "phpbench/phpbench": "^0.13 || 1.0.0-alpha2", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "type": "library", "autoload": { - "psr-0": { - "LSS": "" + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "Apache-2.0" + "MIT" ], "authors": [ { - "name": "Bryan Tong", - "email": "bryan@nullivex.com", - "homepage": "https://www.nullivex.com" - }, - { - "name": "Tony Butler", - "email": "spudz76@gmail.com", - "homepage": "https://www.nullivex.com" + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "https://ocramius.github.io/" } ], - "description": "Array2XML conversion library credit to lalit.org", - "homepage": "https://www.nullivex.com", + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://www.doctrine-project.org/projects/instantiator.html", "keywords": [ - "array", - "array conversion", - "xml", - "xml conversion" + "constructor", + "instantiate" ], "support": { - "issues": "https://github.com/nullivex/lib-array2xml/issues", - "source": "https://github.com/nullivex/lib-array2xml/tree/master" + "issues": "https://github.com/doctrine/instantiator/issues", + "source": "https://github.com/doctrine/instantiator/tree/1.4.0" }, - "time": "2019-03-29T20:06:56+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", + "type": "tidelift" + } + ], + "time": "2020-11-10T18:47:58+00:00" }, { - "name": "phalcon/ide-stubs", - "version": "v4.1.0", + "name": "doctrine/lexer", + "version": "1.2.1", "source": { "type": "git", - "url": "https://github.com/phalcon/ide-stubs.git", - "reference": "77384e4f42542f11b065b2a860b9bca2ea20ad5a" + "url": "https://github.com/doctrine/lexer.git", + "reference": "e864bbf5904cb8f5bb334f99209b48018522f042" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phalcon/ide-stubs/zipball/77384e4f42542f11b065b2a860b9bca2ea20ad5a", - "reference": "77384e4f42542f11b065b2a860b9bca2ea20ad5a", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042", + "reference": "e864bbf5904cb8f5bb334f99209b48018522f042", "shasum": "" }, "require": { - "php": ">=7.2.0" + "php": "^7.2 || ^8.0" }, "require-dev": { - "squizlabs/php_codesniffer": "3.*", - "vimeo/psalm": "^3.4" + "doctrine/coding-standard": "^6.0", + "phpstan/phpstan": "^0.11.8", + "phpunit/phpunit": "^8.2" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" + } + }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Phalcon Team", - "email": "team@phalcon.io", - "homepage": "https://phalcon.io/en-us/team" + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" }, { - "name": "Contributors", - "homepage": "https://github.com/phalcon/ide-stubs/graphs/contributors" + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" } ], - "description": "The most complete Phalcon Framework IDE stubs library which enables autocompletion in modern IDEs.", - "homepage": "https://phalcon.io", + "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.", + "homepage": "https://www.doctrine-project.org/projects/lexer.html", "keywords": [ - "Devtools", - "Eclipse", - "autocomplete", - "ide", - "netbeans", - "phalcon", - "phpstorm", - "stub", - "stubs" + "annotations", + "docblock", + "lexer", + "parser", + "php" ], "support": { - "forum": "https://forum.phalcon.io/", - "issues": "https://github.com/phalcon/ide-stubs/issues", - "source": "https://github.com/phalcon/ide-stubs" + "issues": "https://github.com/doctrine/lexer/issues", + "source": "https://github.com/doctrine/lexer/tree/1.2.1" }, "funding": [ { - "url": "https://github.com/phalcon", - "type": "github" + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" }, { - "url": "https://opencollective.com/phalcon", - "type": "open_collective" + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", + "type": "tidelift" } ], - "time": "2020-11-13T10:58:11+00:00" + "time": "2020-05-25T17:44:05+00:00" }, { - "name": "phar-io/manifest", - "version": "2.0.3", + "name": "felixfbecker/advanced-json-rpc", + "version": "v3.2.1", "source": { "type": "git", - "url": "https://github.com/phar-io/manifest.git", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53" + "url": "https://github.com/felixfbecker/php-advanced-json-rpc.git", + "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53", + "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/b5f37dbff9a8ad360ca341f3240dc1c168b45447", + "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447", "shasum": "" }, "require": { - "ext-dom": "*", - "ext-phar": "*", - "ext-xmlwriter": "*", - "phar-io/version": "^3.0.1", - "php": "^7.2 || ^8.0" + "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", + "php": "^7.1 || ^8.0", + "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } + "require-dev": { + "phpunit/phpunit": "^7.0 || ^8.0" }, + "type": "library", "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "AdvancedJsonRpc\\": "lib/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "ISC" ], "authors": [ { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" - }, - { - "name": "Sebastian Heuer", - "email": "sebastian@phpeople.de", - "role": "Developer" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "Developer" + "name": "Felix Becker", + "email": "felix.b@outlook.com" } ], - "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", + "description": "A more advanced JSONRPC implementation", "support": { - "issues": "https://github.com/phar-io/manifest/issues", - "source": "https://github.com/phar-io/manifest/tree/2.0.3" + "issues": "https://github.com/felixfbecker/php-advanced-json-rpc/issues", + "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/v3.2.1" }, - "time": "2021-07-20T11:28:43+00:00" + "time": "2021-06-11T22:34:44+00:00" }, { - "name": "phar-io/version", - "version": "3.1.0", + "name": "felixfbecker/language-server-protocol", + "version": "1.5.1", "source": { "type": "git", - "url": "https://github.com/phar-io/version.git", - "reference": "bae7c545bef187884426f042434e561ab1ddb182" + "url": "https://github.com/felixfbecker/php-language-server-protocol.git", + "reference": "9d846d1f5cf101deee7a61c8ba7caa0a975cd730" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/version/zipball/bae7c545bef187884426f042434e561ab1ddb182", - "reference": "bae7c545bef187884426f042434e561ab1ddb182", + "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/9d846d1f5cf101deee7a61c8ba7caa0a975cd730", + "reference": "9d846d1f5cf101deee7a61c8ba7caa0a975cd730", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "php": ">=7.1" + }, + "require-dev": { + "phpstan/phpstan": "*", + "squizlabs/php_codesniffer": "^3.1", + "vimeo/psalm": "^4.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "LanguageServerProtocol\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "ISC" ], "authors": [ { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" - }, - { - "name": "Sebastian Heuer", - "email": "sebastian@phpeople.de", - "role": "Developer" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "Developer" + "name": "Felix Becker", + "email": "felix.b@outlook.com" } ], - "description": "Library for handling version information and constraints", + "description": "PHP classes for the Language Server Protocol", + "keywords": [ + "language", + "microsoft", + "php", + "server" + ], "support": { - "issues": "https://github.com/phar-io/version/issues", - "source": "https://github.com/phar-io/version/tree/3.1.0" + "issues": "https://github.com/felixfbecker/php-language-server-protocol/issues", + "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/1.5.1" }, - "time": "2021-02-23T14:00:09+00:00" + "time": "2021-02-22T14:02:09+00:00" }, { - "name": "php-cs-fixer/diff", - "version": "v1.3.1", + "name": "friendsofphp/php-cs-fixer", + "version": "v2.19.3", "source": { "type": "git", - "url": "https://github.com/PHP-CS-Fixer/diff.git", - "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759" + "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", + "reference": "75ac86f33fab4714ea5a39a396784d83ae3b5ed8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/dbd31aeb251639ac0b9e7e29405c1441907f5759", - "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/75ac86f33fab4714ea5a39a396784d83ae3b5ed8", + "reference": "75ac86f33fab4714ea5a39a396784d83ae3b5ed8", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0 || ^8.0" + "composer/semver": "^1.4 || ^2.0 || ^3.0", + "composer/xdebug-handler": "^1.2 || ^2.0", + "doctrine/annotations": "^1.2", + "ext-json": "*", + "ext-tokenizer": "*", + "php": "^5.6 || ^7.0 || ^8.0", + "php-cs-fixer/diff": "^1.3", + "symfony/console": "^3.4.43 || ^4.1.6 || ^5.0", + "symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0", + "symfony/filesystem": "^3.0 || ^4.0 || ^5.0", + "symfony/finder": "^3.0 || ^4.0 || ^5.0", + "symfony/options-resolver": "^3.0 || ^4.0 || ^5.0", + "symfony/polyfill-php70": "^1.0", + "symfony/polyfill-php72": "^1.4", + "symfony/process": "^3.0 || ^4.0 || ^5.0", + "symfony/stopwatch": "^3.0 || ^4.0 || ^5.0" }, "require-dev": { - "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0", - "symfony/process": "^3.3" + "justinrainbow/json-schema": "^5.0", + "keradus/cli-executor": "^1.4", + "mikey179/vfsstream": "^1.6", + "php-coveralls/php-coveralls": "^2.4.2", + "php-cs-fixer/accessible-object": "^1.0", + "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2", + "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1", + "phpspec/prophecy-phpunit": "^1.1 || ^2.0", + "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.13 || ^9.5", + "phpunitgoodpractices/polyfill": "^1.5", + "phpunitgoodpractices/traits": "^1.9.1", + "sanmai/phpunit-legacy-adapter": "^6.4 || ^8.2.1", + "symfony/phpunit-bridge": "^5.2.1", + "symfony/yaml": "^3.0 || ^4.0 || ^5.0" + }, + "suggest": { + "ext-dom": "For handling output formats in XML", + "ext-mbstring": "For handling non-UTF8 characters.", + "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.", + "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.", + "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible." + }, + "bin": [ + "php-cs-fixer" + ], + "type": "application", + "extra": { + "branch-alias": { + "dev-master": "2.19-dev" + } }, - "type": "library", "autoload": { + "psr-4": { + "PhpCsFixer\\": "src/" + }, "classmap": [ - "src/" + "tests/Test/AbstractFixerTestCase.php", + "tests/Test/AbstractIntegrationCaseFactory.php", + "tests/Test/AbstractIntegrationTestCase.php", + "tests/Test/Assert/AssertTokensTrait.php", + "tests/Test/IntegrationCase.php", + "tests/Test/IntegrationCaseFactory.php", + "tests/Test/IntegrationCaseFactoryInterface.php", + "tests/Test/InternalIntegrationCaseFactory.php", + "tests/Test/IsIdenticalConstraint.php", + "tests/Test/TokensWithObservedTransformers.php", + "tests/TestCase.php" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { - "name": "SpacePossum" + "name": "Dariusz Rumiński", + "email": "dariusz.ruminski@gmail.com" } ], - "description": "sebastian/diff v2 backport support for PHP5.6", - "homepage": "https://github.com/PHP-CS-Fixer", - "keywords": [ - "diff" - ], + "description": "A tool to automatically fix PHP code style", "support": { - "issues": "https://github.com/PHP-CS-Fixer/diff/issues", - "source": "https://github.com/PHP-CS-Fixer/diff/tree/v1.3.1" + "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", + "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.19.3" }, - "time": "2020-10-14T08:39:05+00:00" + "funding": [ + { + "url": "https://github.com/keradus", + "type": "github" + } + ], + "time": "2021-11-15T17:17:55+00:00" }, { - "name": "phpdocumentor/reflection-common", - "version": "2.2.0", + "name": "graham-campbell/result-type", + "version": "v1.0.4", "source": { "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b" + "url": "https://github.com/GrahamCampbell/Result-Type.git", + "reference": "0690bde05318336c7221785f2a932467f98b64ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b", - "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b", + "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/0690bde05318336c7221785f2a932467f98b64ca", + "reference": "0690bde05318336c7221785f2a932467f98b64ca", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "php": "^7.0 || ^8.0", + "phpoption/phpoption": "^1.8" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-2.x": "2.x-dev" - } + "require-dev": { + "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8" }, + "type": "library", "autoload": { "psr-4": { - "phpDocumentor\\Reflection\\": "src/" + "GrahamCampbell\\ResultType\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2500,114 +3079,85 @@ ], "authors": [ { - "name": "Jaap van Otterdijk", - "email": "opensource@ijaap.nl" + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" } ], - "description": "Common reflection classes used by phpdocumentor to reflect the code structure", - "homepage": "http://www.phpdoc.org", + "description": "An Implementation Of The Result Type", "keywords": [ - "FQSEN", - "phpDocumentor", - "phpdoc", - "reflection", - "static analysis" + "Graham Campbell", + "GrahamCampbell", + "Result Type", + "Result-Type", + "result" ], "support": { - "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues", - "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x" - }, - "time": "2020-06-27T09:03:43+00:00" - }, - { - "name": "phpdocumentor/reflection-docblock", - "version": "5.3.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", - "shasum": "" + "issues": "https://github.com/GrahamCampbell/Result-Type/issues", + "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.0.4" }, - "require": { - "ext-filter": "*", - "php": "^7.2 || ^8.0", - "phpdocumentor/reflection-common": "^2.2", - "phpdocumentor/type-resolver": "^1.3", - "webmozart/assert": "^1.9.1" - }, - "require-dev": { - "mockery/mockery": "~1.3.2", - "psalm/phar": "^4.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ + "funding": [ { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" + "url": "https://github.com/GrahamCampbell", + "type": "github" }, { - "name": "Jaap van Otterdijk", - "email": "account@ijaap.nl" + "url": "https://tidelift.com/funding/github/packagist/graham-campbell/result-type", + "type": "tidelift" } ], - "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "support": { - "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" - }, - "time": "2021-10-19T17:43:47+00:00" + "time": "2021-11-21T21:41:47+00:00" }, { - "name": "phpdocumentor/type-resolver", - "version": "1.5.1", + "name": "guzzlehttp/guzzle", + "version": "7.4.1", "source": { "type": "git", - "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae" + "url": "https://github.com/guzzle/guzzle.git", + "reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/a12f7e301eb7258bb68acd89d4aefa05c2906cae", - "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ee0a041b1760e6a53d2a39c8c34115adc2af2c79", + "reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0", - "phpdocumentor/reflection-common": "^2.0" + "ext-json": "*", + "guzzlehttp/promises": "^1.5", + "guzzlehttp/psr7": "^1.8.3 || ^2.1", + "php": "^7.2.5 || ^8.0", + "psr/http-client": "^1.0", + "symfony/deprecation-contracts": "^2.2 || ^3.0" + }, + "provide": { + "psr/http-client-implementation": "1.0" }, "require-dev": { - "ext-tokenizer": "*", - "psalm/phar": "^4.8" + "bamarni/composer-bin-plugin": "^1.4.1", + "ext-curl": "*", + "php-http/client-integration-tests": "^3.0", + "phpunit/phpunit": "^8.5.5 || ^9.3.5", + "psr/log": "^1.1 || ^2.0 || ^3.0" + }, + "suggest": { + "ext-curl": "Required for CURL handler support", + "ext-intl": "Required for Internationalized Domain Name (IDN) support", + "psr/log": "Required for using the Log middleware" }, "type": "library", "extra": { "branch-alias": { - "dev-1.x": "1.x-dev" + "dev-master": "7.4-dev" } }, "autoload": { "psr-4": { - "phpDocumentor\\Reflection\\": "src" - } + "GuzzleHttp\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2615,52 +3165,106 @@ ], "authors": [ { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Jeremy Lindblom", + "email": "jeremeamia@gmail.com", + "homepage": "https://github.com/jeremeamia" + }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" } ], - "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", + "description": "Guzzle is a PHP HTTP client library", + "keywords": [ + "client", + "curl", + "framework", + "http", + "http client", + "psr-18", + "psr-7", + "rest", + "web service" + ], "support": { - "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.5.1" + "issues": "https://github.com/guzzle/guzzle/issues", + "source": "https://github.com/guzzle/guzzle/tree/7.4.1" }, - "time": "2021-10-02T14:08:47+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle", + "type": "tidelift" + } + ], + "time": "2021-12-06T18:43:05+00:00" }, { - "name": "phpspec/prophecy", - "version": "1.14.0", + "name": "guzzlehttp/promises", + "version": "1.5.1", "source": { "type": "git", - "url": "https://github.com/phpspec/prophecy.git", - "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e" + "url": "https://github.com/guzzle/promises.git", + "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e", - "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e", + "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da", + "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.2", - "php": "^7.2 || ~8.0, <8.2", - "phpdocumentor/reflection-docblock": "^5.2", - "sebastian/comparator": "^3.0 || ^4.0", - "sebastian/recursion-context": "^3.0 || ^4.0" + "php": ">=5.5" }, "require-dev": { - "phpspec/phpspec": "^6.0 || ^7.0", - "phpunit/phpunit": "^8.0 || ^9.0" + "symfony/phpunit-bridge": "^4.4 || ^5.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.x-dev" + "dev-master": "1.5-dev" } }, "autoload": { "psr-4": { - "Prophecy\\": "src/Prophecy" - } + "GuzzleHttp\\Promise\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2668,299 +3272,359 @@ ], "authors": [ { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" }, { - "name": "Marcello Duarte", - "email": "marcello.duarte@gmail.com" + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" } ], - "description": "Highly opinionated mocking framework for PHP 5.3+", - "homepage": "https://github.com/phpspec/prophecy", + "description": "Guzzle promises library", "keywords": [ - "Double", - "Dummy", - "fake", - "mock", - "spy", - "stub" + "promise" ], "support": { - "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/1.14.0" + "issues": "https://github.com/guzzle/promises/issues", + "source": "https://github.com/guzzle/promises/tree/1.5.1" }, - "time": "2021-09-10T09:02:12+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises", + "type": "tidelift" + } + ], + "time": "2021-10-22T20:56:57+00:00" }, { - "name": "phpunit/php-code-coverage", - "version": "7.0.15", + "name": "guzzlehttp/psr7", + "version": "2.1.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "819f92bba8b001d4363065928088de22f25a3a48" + "url": "https://github.com/guzzle/psr7.git", + "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/819f92bba8b001d4363065928088de22f25a3a48", - "reference": "819f92bba8b001d4363065928088de22f25a3a48", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/089edd38f5b8abba6cb01567c2a8aaa47cec4c72", + "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72", "shasum": "" }, "require": { - "ext-dom": "*", - "ext-xmlwriter": "*", - "php": ">=7.2", - "phpunit/php-file-iterator": "^2.0.2", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^3.1.3 || ^4.0", - "sebastian/code-unit-reverse-lookup": "^1.0.1", - "sebastian/environment": "^4.2.2", - "sebastian/version": "^2.0.1", - "theseer/tokenizer": "^1.1.3" + "php": "^7.2.5 || ^8.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.0", + "ralouphie/getallheaders": "^3.0" + }, + "provide": { + "psr/http-factory-implementation": "1.0", + "psr/http-message-implementation": "1.0" }, "require-dev": { - "phpunit/phpunit": "^8.2.2" + "bamarni/composer-bin-plugin": "^1.4.1", + "http-interop/http-factory-tests": "^0.9", + "phpunit/phpunit": "^8.5.8 || ^9.3.10" }, "suggest": { - "ext-xdebug": "^2.7.2" + "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "7.0-dev" + "dev-master": "2.1-dev" } }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "GuzzleHttp\\Psr7\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://sagikazarmark.hu" } ], - "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", - "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "description": "PSR-7 message implementation that also provides common utility methods", "keywords": [ - "coverage", - "testing", - "xunit" + "http", + "message", + "psr-7", + "request", + "response", + "stream", + "uri", + "url" ], "support": { - "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/7.0.15" + "issues": "https://github.com/guzzle/psr7/issues", + "source": "https://github.com/guzzle/psr7/tree/2.1.0" }, "funding": [ { - "url": "https://github.com/sebastianbergmann", + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7", + "type": "tidelift" } ], - "time": "2021-07-26T12:20:09+00:00" + "time": "2021-10-06T17:43:30+00:00" }, { - "name": "phpunit/php-file-iterator", - "version": "2.0.4", + "name": "mustache/mustache", + "version": "v2.14.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "28af674ff175d0768a5a978e6de83f697d4a7f05" + "url": "https://github.com/bobthecow/mustache.php.git", + "reference": "4e2724dd40ae9499a55e7db7df82665be0ab7e34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/28af674ff175d0768a5a978e6de83f697d4a7f05", - "reference": "28af674ff175d0768a5a978e6de83f697d4a7f05", + "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/4e2724dd40ae9499a55e7db7df82665be0ab7e34", + "reference": "4e2724dd40ae9499a55e7db7df82665be0ab7e34", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=5.2.4" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "friendsofphp/php-cs-fixer": "~1.11", + "phpunit/phpunit": "~3.7|~4.0|~5.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, "autoload": { - "classmap": [ - "src/" - ] + "psr-0": { + "Mustache": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "name": "Justin Hileman", + "email": "justin@justinhileman.info", + "homepage": "http://justinhileman.com" } ], - "description": "FilterIterator implementation that filters files based on a list of suffixes.", - "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "description": "A Mustache implementation in PHP.", + "homepage": "https://github.com/bobthecow/mustache.php", "keywords": [ - "filesystem", - "iterator" + "mustache", + "templating" ], "support": { - "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.4" + "issues": "https://github.com/bobthecow/mustache.php/issues", + "source": "https://github.com/bobthecow/mustache.php/tree/v2.14.0" }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2021-07-19T06:46:01+00:00" + "time": "2021-12-14T14:42:17+00:00" }, { - "name": "phpunit/php-text-template", - "version": "1.2.1", + "name": "myclabs/deep-copy", + "version": "1.10.2", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" + "url": "https://github.com/myclabs/DeepCopy.git", + "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220", + "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.1 || ^8.0" + }, + "replace": { + "myclabs/deep-copy": "self.version" + }, + "require-dev": { + "doctrine/collections": "^1.0", + "doctrine/common": "^2.6", + "phpunit/phpunit": "^7.1" }, "type": "library", "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + }, + "files": [ + "src/DeepCopy/deep_copy.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" ], - "description": "Simple template engine.", - "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "description": "Create deep copies (clones) of your objects", "keywords": [ - "template" + "clone", + "copy", + "duplicate", + "object", + "object graph" ], "support": { - "issues": "https://github.com/sebastianbergmann/php-text-template/issues", - "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1" + "issues": "https://github.com/myclabs/DeepCopy/issues", + "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2" }, - "time": "2015-06-21T13:50:34+00:00" + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", + "type": "tidelift" + } + ], + "time": "2020-11-13T09:40:50+00:00" }, { - "name": "phpunit/php-timer", - "version": "2.1.3", + "name": "netresearch/jsonmapper", + "version": "v4.0.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662" + "url": "https://github.com/cweiske/jsonmapper.git", + "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/2454ae1765516d20c4ffe103d85a58a9a3bd5662", - "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d", + "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d", "shasum": "" }, "require": { + "ext-json": "*", + "ext-pcre": "*", + "ext-reflection": "*", + "ext-spl": "*", "php": ">=7.1" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0", + "squizlabs/php_codesniffer": "~3.5" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.1-dev" - } - }, "autoload": { - "classmap": [ - "src/" - ] + "psr-0": { + "JsonMapper": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "OSL-3.0" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "name": "Christian Weiske", + "email": "cweiske@cweiske.de", + "homepage": "http://github.com/cweiske/jsonmapper/", + "role": "Developer" } ], - "description": "Utility class for timing", - "homepage": "https://github.com/sebastianbergmann/php-timer/", - "keywords": [ - "timer" - ], + "description": "Map nested JSON structures onto PHP classes", "support": { - "issues": "https://github.com/sebastianbergmann/php-timer/issues", - "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.3" + "email": "cweiske@cweiske.de", + "issues": "https://github.com/cweiske/jsonmapper/issues", + "source": "https://github.com/cweiske/jsonmapper/tree/v4.0.0" }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T08:20:02+00:00" + "time": "2020-12-01T19:48:11+00:00" }, { - "name": "phpunit/php-token-stream", - "version": "4.0.4", + "name": "nikic/php-parser", + "version": "v4.13.2", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3" + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "210577fe3cf7badcc5814d99455df46564f3c077" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/a853a0e183b9db7eed023d7933a858fa1c8d25a3", - "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077", + "reference": "210577fe3cf7badcc5814d99455df46564f3c077", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": "^7.3 || ^8.0" + "php": ">=7.0" }, "require-dev": { - "phpunit/phpunit": "^9.0" + "ircmaxell/php-yacc": "^0.0.7", + "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" }, + "bin": [ + "bin/php-parse" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.9-dev" } }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2968,365 +3632,332 @@ ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "name": "Nikita Popov" } ], - "description": "Wrapper around PHP's tokenizer extension.", - "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "description": "A PHP parser written in PHP", "keywords": [ - "tokenizer" + "parser", + "php" ], "support": { - "issues": "https://github.com/sebastianbergmann/php-token-stream/issues", - "source": "https://github.com/sebastianbergmann/php-token-stream/tree/master" + "issues": "https://github.com/nikic/PHP-Parser/issues", + "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2" }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "abandoned": true, - "time": "2020-08-04T08:28:15+00:00" + "time": "2021-11-30T19:35:32+00:00" }, { - "name": "phpunit/phpunit", - "version": "8.5.21", + "name": "openlss/lib-array2xml", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "50a58a60b85947b0bee4c8ecfe0f4bbdcf20e984" + "url": "https://github.com/nullivex/lib-array2xml.git", + "reference": "a91f18a8dfc69ffabe5f9b068bc39bb202c81d90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/50a58a60b85947b0bee4c8ecfe0f4bbdcf20e984", - "reference": "50a58a60b85947b0bee4c8ecfe0f4bbdcf20e984", + "url": "https://api.github.com/repos/nullivex/lib-array2xml/zipball/a91f18a8dfc69ffabe5f9b068bc39bb202c81d90", + "reference": "a91f18a8dfc69ffabe5f9b068bc39bb202c81d90", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.3.1", - "ext-dom": "*", - "ext-json": "*", - "ext-libxml": "*", - "ext-mbstring": "*", - "ext-xml": "*", - "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.10.0", - "phar-io/manifest": "^2.0.3", - "phar-io/version": "^3.0.2", - "php": ">=7.2", - "phpspec/prophecy": "^1.10.3", - "phpunit/php-code-coverage": "^7.0.12", - "phpunit/php-file-iterator": "^2.0.4", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-timer": "^2.1.2", - "sebastian/comparator": "^3.0.2", - "sebastian/diff": "^3.0.2", - "sebastian/environment": "^4.2.3", - "sebastian/exporter": "^3.1.2", - "sebastian/global-state": "^3.0.0", - "sebastian/object-enumerator": "^3.0.3", - "sebastian/resource-operations": "^2.0.1", - "sebastian/type": "^1.1.3", - "sebastian/version": "^2.0.1" - }, - "require-dev": { - "ext-pdo": "*" - }, - "suggest": { - "ext-soap": "*", - "ext-xdebug": "*", - "phpunit/php-invoker": "^2.0.0" + "php": ">=5.3.2" }, - "bin": [ - "phpunit" - ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "8.5-dev" - } - }, "autoload": { - "classmap": [ - "src/" - ] + "psr-0": { + "LSS": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "Apache-2.0" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "name": "Bryan Tong", + "email": "bryan@nullivex.com", + "homepage": "https://www.nullivex.com" + }, + { + "name": "Tony Butler", + "email": "spudz76@gmail.com", + "homepage": "https://www.nullivex.com" } ], - "description": "The PHP Unit Testing framework.", - "homepage": "https://phpunit.de/", + "description": "Array2XML conversion library credit to lalit.org", + "homepage": "https://www.nullivex.com", "keywords": [ - "phpunit", - "testing", - "xunit" + "array", + "array conversion", + "xml", + "xml conversion" ], "support": { - "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.21" + "issues": "https://github.com/nullivex/lib-array2xml/issues", + "source": "https://github.com/nullivex/lib-array2xml/tree/master" }, - "funding": [ - { - "url": "https://phpunit.de/donate.html", - "type": "custom" - }, - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2021-09-25T07:37:20+00:00" + "time": "2019-03-29T20:06:56+00:00" }, { - "name": "predis/predis", - "version": "v1.1.9", + "name": "phalcon/ide-stubs", + "version": "v4.1.0", "source": { "type": "git", - "url": "https://github.com/predis/predis.git", - "reference": "c50c3393bb9f47fa012d0cdfb727a266b0818259" + "url": "https://github.com/phalcon/ide-stubs.git", + "reference": "77384e4f42542f11b065b2a860b9bca2ea20ad5a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/predis/predis/zipball/c50c3393bb9f47fa012d0cdfb727a266b0818259", - "reference": "c50c3393bb9f47fa012d0cdfb727a266b0818259", + "url": "https://api.github.com/repos/phalcon/ide-stubs/zipball/77384e4f42542f11b065b2a860b9bca2ea20ad5a", + "reference": "77384e4f42542f11b065b2a860b9bca2ea20ad5a", "shasum": "" }, "require": { - "php": ">=5.3.9" - }, - "require-dev": { - "phpunit/phpunit": "~4.8" - }, - "suggest": { - "ext-curl": "Allows access to Webdis when paired with phpiredis", - "ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol" + "php": ">=7.2.0" }, - "type": "library", - "autoload": { - "psr-4": { - "Predis\\": "src/" - } + "require-dev": { + "squizlabs/php_codesniffer": "3.*", + "vimeo/psalm": "^3.4" }, + "type": "library", "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Daniele Alessandri", - "email": "suppakilla@gmail.com", - "homepage": "http://clorophilla.net", - "role": "Creator & Maintainer" + "name": "Phalcon Team", + "email": "team@phalcon.io", + "homepage": "https://phalcon.io/en-us/team" }, { - "name": "Till Krüss", - "homepage": "https://till.im", - "role": "Maintainer" + "name": "Contributors", + "homepage": "https://github.com/phalcon/ide-stubs/graphs/contributors" } ], - "description": "Flexible and feature-complete Redis client for PHP and HHVM", - "homepage": "http://github.com/predis/predis", + "description": "The most complete Phalcon Framework IDE stubs library which enables autocompletion in modern IDEs.", + "homepage": "https://phalcon.io", "keywords": [ - "nosql", - "predis", - "redis" + "Devtools", + "Eclipse", + "autocomplete", + "ide", + "netbeans", + "phalcon", + "phpstorm", + "stub", + "stubs" ], "support": { - "issues": "https://github.com/predis/predis/issues", - "source": "https://github.com/predis/predis/tree/v1.1.9" + "forum": "https://forum.phalcon.io/", + "issues": "https://github.com/phalcon/ide-stubs/issues", + "source": "https://github.com/phalcon/ide-stubs" }, "funding": [ { - "url": "https://github.com/sponsors/tillkruss", + "url": "https://github.com/phalcon", "type": "github" + }, + { + "url": "https://opencollective.com/phalcon", + "type": "open_collective" } ], - "time": "2021-10-05T19:02:38+00:00" + "time": "2020-11-13T10:58:11+00:00" }, { - "name": "psr/cache", - "version": "1.0.1", + "name": "phar-io/manifest", + "version": "2.0.3", "source": { "type": "git", - "url": "https://github.com/php-fig/cache.git", - "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8" + "url": "https://github.com/phar-io/manifest.git", + "reference": "97803eca37d319dfa7826cc2437fc020857acb53" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8", - "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", + "reference": "97803eca37d319dfa7826cc2437fc020857acb53", "shasum": "" }, "require": { - "php": ">=5.3.0" + "ext-dom": "*", + "ext-phar": "*", + "ext-xmlwriter": "*", + "phar-io/version": "^3.0.1", + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { - "psr-4": { - "Psr\\Cache\\": "src/" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" } ], - "description": "Common interface for caching libraries", - "keywords": [ - "cache", - "psr", - "psr-6" - ], + "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", "support": { - "source": "https://github.com/php-fig/cache/tree/master" + "issues": "https://github.com/phar-io/manifest/issues", + "source": "https://github.com/phar-io/manifest/tree/2.0.3" }, - "time": "2016-08-06T20:24:11+00:00" + "time": "2021-07-20T11:28:43+00:00" }, { - "name": "psr/container", - "version": "1.1.2", + "name": "phar-io/version", + "version": "3.1.0", "source": { "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" + "url": "https://github.com/phar-io/version.git", + "reference": "bae7c545bef187884426f042434e561ab1ddb182" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", + "url": "https://api.github.com/repos/phar-io/version/zipball/bae7c545bef187884426f042434e561ab1ddb182", + "reference": "bae7c545bef187884426f042434e561ab1ddb182", "shasum": "" }, "require": { - "php": ">=7.4.0" + "php": "^7.2 || ^8.0" }, "type": "library", "autoload": { - "psr-4": { - "Psr\\Container\\": "src/" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" } ], - "description": "Common Container Interface (PHP FIG PSR-11)", - "homepage": "https://github.com/php-fig/container", - "keywords": [ - "PSR-11", - "container", - "container-interface", - "container-interop", - "psr" - ], + "description": "Library for handling version information and constraints", "support": { - "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.2" + "issues": "https://github.com/phar-io/version/issues", + "source": "https://github.com/phar-io/version/tree/3.1.0" }, - "time": "2021-11-05T16:50:12+00:00" + "time": "2021-02-23T14:00:09+00:00" }, { - "name": "psr/event-dispatcher", - "version": "1.0.0", + "name": "php-cs-fixer/diff", + "version": "v1.3.1", "source": { "type": "git", - "url": "https://github.com/php-fig/event-dispatcher.git", - "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" + "url": "https://github.com/PHP-CS-Fixer/diff.git", + "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", - "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", + "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/dbd31aeb251639ac0b9e7e29405c1441907f5759", + "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759", "shasum": "" }, "require": { - "php": ">=7.2.0" + "php": "^5.6 || ^7.0 || ^8.0" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } + "require-dev": { + "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0", + "symfony/process": "^3.3" }, + "type": "library", "autoload": { - "psr-4": { - "Psr\\EventDispatcher\\": "src/" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + }, + { + "name": "SpacePossum" } ], - "description": "Standard interfaces for event handling.", + "description": "sebastian/diff v2 backport support for PHP5.6", + "homepage": "https://github.com/PHP-CS-Fixer", "keywords": [ - "events", - "psr", - "psr-14" + "diff" ], "support": { - "issues": "https://github.com/php-fig/event-dispatcher/issues", - "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" + "issues": "https://github.com/PHP-CS-Fixer/diff/issues", + "source": "https://github.com/PHP-CS-Fixer/diff/tree/v1.3.1" }, - "time": "2019-01-08T18:20:26+00:00" + "time": "2020-10-14T08:39:05+00:00" }, { - "name": "psr/http-client", - "version": "1.0.1", + "name": "phpdocumentor/reflection-common", + "version": "2.2.0", "source": { "type": "git", - "url": "https://github.com/php-fig/http-client.git", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621" + "url": "https://github.com/phpDocumentor/ReflectionCommon.git", + "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b", + "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b", "shasum": "" }, "require": { - "php": "^7.0 || ^8.0", - "psr/http-message": "^1.0" + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-2.x": "2.x-dev" } }, "autoload": { "psr-4": { - "Psr\\Http\\Client\\": "src/" + "phpDocumentor\\Reflection\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -3335,50 +3966,59 @@ ], "authors": [ { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "name": "Jaap van Otterdijk", + "email": "opensource@ijaap.nl" } ], - "description": "Common interface for HTTP clients", - "homepage": "https://github.com/php-fig/http-client", + "description": "Common reflection classes used by phpdocumentor to reflect the code structure", + "homepage": "http://www.phpdoc.org", "keywords": [ - "http", - "http-client", - "psr", - "psr-18" + "FQSEN", + "phpDocumentor", + "phpdoc", + "reflection", + "static analysis" ], "support": { - "source": "https://github.com/php-fig/http-client/tree/master" + "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues", + "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x" }, - "time": "2020-06-29T06:28:15+00:00" + "time": "2020-06-27T09:03:43+00:00" }, { - "name": "psr/http-factory", - "version": "1.0.1", + "name": "phpdocumentor/reflection-docblock", + "version": "5.3.0", "source": { "type": "git", - "url": "https://github.com/php-fig/http-factory.git", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be" + "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", + "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", + "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", "shasum": "" }, - "require": { - "php": ">=7.0.0", - "psr/http-message": "^1.0" + "require": { + "ext-filter": "*", + "php": "^7.2 || ^8.0", + "phpdocumentor/reflection-common": "^2.2", + "phpdocumentor/type-resolver": "^1.3", + "webmozart/assert": "^1.9.1" + }, + "require-dev": { + "mockery/mockery": "~1.3.2", + "psalm/phar": "^4.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "5.x-dev" } }, "autoload": { "psr-4": { - "Psr\\Http\\Message\\": "src/" + "phpDocumentor\\Reflection\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -3387,52 +4027,52 @@ ], "authors": [ { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + }, + { + "name": "Jaap van Otterdijk", + "email": "account@ijaap.nl" } ], - "description": "Common interfaces for PSR-7 HTTP message factories", - "keywords": [ - "factory", - "http", - "message", - "psr", - "psr-17", - "psr-7", - "request", - "response" - ], + "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { - "source": "https://github.com/php-fig/http-factory/tree/master" + "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" }, - "time": "2019-04-30T12:38:16+00:00" + "time": "2021-10-19T17:43:47+00:00" }, { - "name": "psr/http-message", - "version": "1.0.1", + "name": "phpdocumentor/type-resolver", + "version": "1.5.1", "source": { "type": "git", - "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + "url": "https://github.com/phpDocumentor/TypeResolver.git", + "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/a12f7e301eb7258bb68acd89d4aefa05c2906cae", + "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.2 || ^8.0", + "phpdocumentor/reflection-common": "^2.0" + }, + "require-dev": { + "ext-tokenizer": "*", + "psalm/phar": "^4.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-1.x": "1.x-dev" } }, "autoload": { "psr-4": { - "Psr\\Http\\Message\\": "src/" + "phpDocumentor\\Reflection\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -3441,101 +4081,123 @@ ], "authors": [ { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "name": "Mike van Riel", + "email": "me@mikevanriel.com" } ], - "description": "Common interface for HTTP messages", - "homepage": "https://github.com/php-fig/http-message", - "keywords": [ - "http", - "http-message", - "psr", - "psr-7", - "request", - "response" - ], + "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { - "source": "https://github.com/php-fig/http-message/tree/master" + "issues": "https://github.com/phpDocumentor/TypeResolver/issues", + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.5.1" }, - "time": "2016-08-06T14:39:51+00:00" + "time": "2021-10-02T14:08:47+00:00" }, { - "name": "psr/log", - "version": "1.1.4", + "name": "phpoption/phpoption", + "version": "1.8.1", "source": { "type": "git", - "url": "https://github.com/php-fig/log.git", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11" + "url": "https://github.com/schmittjoh/php-option.git", + "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15", + "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.0 || ^8.0" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.4.1", + "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "1.8-dev" } }, "autoload": { "psr-4": { - "Psr\\Log\\": "Psr/Log/" + "PhpOption\\": "src/PhpOption/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "Apache-2.0" ], "authors": [ { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh" + }, + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" } ], - "description": "Common interface for logging libraries", - "homepage": "https://github.com/php-fig/log", + "description": "Option Type for PHP", "keywords": [ - "log", - "psr", - "psr-3" + "language", + "option", + "php", + "type" ], "support": { - "source": "https://github.com/php-fig/log/tree/1.1.4" + "issues": "https://github.com/schmittjoh/php-option/issues", + "source": "https://github.com/schmittjoh/php-option/tree/1.8.1" }, - "time": "2021-05-03T11:20:27+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption", + "type": "tidelift" + } + ], + "time": "2021-12-04T23:24:31+00:00" }, { - "name": "ralouphie/getallheaders", - "version": "3.0.3", + "name": "phpspec/prophecy", + "version": "v1.15.0", "source": { "type": "git", - "url": "https://github.com/ralouphie/getallheaders.git", - "reference": "120b605dfeb996808c31b6477290a714d356e822" + "url": "https://github.com/phpspec/prophecy.git", + "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", - "reference": "120b605dfeb996808c31b6477290a714d356e822", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13", + "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13", "shasum": "" }, "require": { - "php": ">=5.6" + "doctrine/instantiator": "^1.2", + "php": "^7.2 || ~8.0, <8.2", + "phpdocumentor/reflection-docblock": "^5.2", + "sebastian/comparator": "^3.0 || ^4.0", + "sebastian/recursion-context": "^3.0 || ^4.0" }, "require-dev": { - "php-coveralls/php-coveralls": "^2.1", - "phpunit/phpunit": "^5 || ^6.5" + "phpspec/phpspec": "^6.0 || ^7.0", + "phpunit/phpunit": "^8.0 || ^9.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, "autoload": { - "files": [ - "src/getallheaders.php" - ] + "psr-4": { + "Prophecy\\": "src/Prophecy" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3543,41 +4205,67 @@ ], "authors": [ { - "name": "Ralph Khattar", - "email": "ralph.khattar@gmail.com" + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + }, + { + "name": "Marcello Duarte", + "email": "marcello.duarte@gmail.com" } ], - "description": "A polyfill for getallheaders.", + "description": "Highly opinionated mocking framework for PHP 5.3+", + "homepage": "https://github.com/phpspec/prophecy", + "keywords": [ + "Double", + "Dummy", + "fake", + "mock", + "spy", + "stub" + ], "support": { - "issues": "https://github.com/ralouphie/getallheaders/issues", - "source": "https://github.com/ralouphie/getallheaders/tree/develop" + "issues": "https://github.com/phpspec/prophecy/issues", + "source": "https://github.com/phpspec/prophecy/tree/v1.15.0" }, - "time": "2019-03-08T08:55:37+00:00" + "time": "2021-12-08T12:19:24+00:00" }, { - "name": "sebastian/code-unit-reverse-lookup", - "version": "1.0.2", + "name": "phpunit/php-code-coverage", + "version": "7.0.15", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619" + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "819f92bba8b001d4363065928088de22f25a3a48" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/819f92bba8b001d4363065928088de22f25a3a48", + "reference": "819f92bba8b001d4363065928088de22f25a3a48", "shasum": "" }, "require": { - "php": ">=5.6" + "ext-dom": "*", + "ext-xmlwriter": "*", + "php": ">=7.2", + "phpunit/php-file-iterator": "^2.0.2", + "phpunit/php-text-template": "^1.2.1", + "phpunit/php-token-stream": "^3.1.3 || ^4.0", + "sebastian/code-unit-reverse-lookup": "^1.0.1", + "sebastian/environment": "^4.2.2", + "sebastian/version": "^2.0.1", + "theseer/tokenizer": "^1.1.3" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^8.2.2" + }, + "suggest": { + "ext-xdebug": "^2.7.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "7.0-dev" } }, "autoload": { @@ -3592,14 +4280,20 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "description": "Looks up which function or method a line of code belongs to", - "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ], "support": { - "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", - "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2" + "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/7.0.15" }, "funding": [ { @@ -3607,26 +4301,24 @@ "type": "github" } ], - "time": "2020-11-30T08:15:22+00:00" + "time": "2021-07-26T12:20:09+00:00" }, { - "name": "sebastian/comparator", - "version": "3.0.3", + "name": "phpunit/php-file-iterator", + "version": "2.0.5", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "1071dfcef776a57013124ff35e1fc41ccd294758" + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1071dfcef776a57013124ff35e1fc41ccd294758", - "reference": "1071dfcef776a57013124ff35e1fc41ccd294758", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5", + "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5", "shasum": "" }, "require": { - "php": ">=7.1", - "sebastian/diff": "^3.0", - "sebastian/exporter": "^3.1" + "php": ">=7.1" }, "require-dev": { "phpunit/phpunit": "^8.5" @@ -3634,7 +4326,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -3649,31 +4341,19 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Volker Dusch", - "email": "github@wallbash.com" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@2bepublished.at" + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "description": "Provides the functionality to compare PHP values for equality", - "homepage": "https://github.com/sebastianbergmann/comparator", + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", "keywords": [ - "comparator", - "compare", - "equality" + "filesystem", + "iterator" ], - "support": { - "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.3" + "support": { + "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.5" }, "funding": [ { @@ -3681,35 +4361,26 @@ "type": "github" } ], - "time": "2020-11-30T08:04:30+00:00" + "time": "2021-12-02T12:42:26+00:00" }, { - "name": "sebastian/diff", - "version": "3.0.3", + "name": "phpunit/php-text-template", + "version": "1.2.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211" + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/14f72dd46eaf2f2293cbe79c93cc0bc43161a211", - "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", "shasum": "" }, "require": { - "php": ">=7.1" - }, - "require-dev": { - "phpunit/phpunit": "^7.5 || ^8.0", - "symfony/process": "^2 || ^3.3 || ^4" + "php": ">=5.3.3" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, "autoload": { "classmap": [ "src/" @@ -3722,60 +4393,45 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "description": "Diff implementation", - "homepage": "https://github.com/sebastianbergmann/diff", + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", "keywords": [ - "diff", - "udiff", - "unidiff", - "unified diff" + "template" ], "support": { - "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/3.0.3" + "issues": "https://github.com/sebastianbergmann/php-text-template/issues", + "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1" }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T07:59:04+00:00" + "time": "2015-06-21T13:50:34+00:00" }, { - "name": "sebastian/environment", - "version": "4.2.4", + "name": "phpunit/php-timer", + "version": "2.1.3", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0" + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", - "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/2454ae1765516d20c4ffe103d85a58a9a3bd5662", + "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662", "shasum": "" }, "require": { "php": ">=7.1" }, "require-dev": { - "phpunit/phpunit": "^7.5" - }, - "suggest": { - "ext-posix": "*" + "phpunit/phpunit": "^8.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "2.1-dev" } }, "autoload": { @@ -3790,19 +4446,18 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "description": "Provides functionality to handle HHVM/PHP environments", - "homepage": "http://www.github.com/sebastianbergmann/environment", + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", "keywords": [ - "Xdebug", - "environment", - "hhvm" + "timer" ], "support": { - "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/4.2.4" + "issues": "https://github.com/sebastianbergmann/php-timer/issues", + "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.3" }, "funding": [ { @@ -3810,34 +4465,33 @@ "type": "github" } ], - "time": "2020-11-30T07:53:42+00:00" + "time": "2020-11-30T08:20:02+00:00" }, { - "name": "sebastian/exporter", - "version": "3.1.4", + "name": "phpunit/php-token-stream", + "version": "4.0.4", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "0c32ea2e40dbf59de29f3b49bf375176ce7dd8db" + "url": "https://github.com/sebastianbergmann/php-token-stream.git", + "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/0c32ea2e40dbf59de29f3b49bf375176ce7dd8db", - "reference": "0c32ea2e40dbf59de29f3b49bf375176ce7dd8db", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/a853a0e183b9db7eed023d7933a858fa1c8d25a3", + "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3", "shasum": "" }, "require": { - "php": ">=7.0", - "sebastian/recursion-context": "^3.0" + "ext-tokenizer": "*", + "php": "^7.3 || ^8.0" }, "require-dev": { - "ext-mbstring": "*", - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1.x-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -3853,33 +4507,16 @@ { "name": "Sebastian Bergmann", "email": "sebastian@phpunit.de" - }, - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Volker Dusch", - "email": "github@wallbash.com" - }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" } ], - "description": "Provides the functionality to export PHP variables for visualization", - "homepage": "http://www.github.com/sebastianbergmann/exporter", + "description": "Wrapper around PHP's tokenizer extension.", + "homepage": "https://github.com/sebastianbergmann/php-token-stream/", "keywords": [ - "export", - "exporter" + "tokenizer" ], "support": { - "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.4" + "issues": "https://github.com/sebastianbergmann/php-token-stream/issues", + "source": "https://github.com/sebastianbergmann/php-token-stream/tree/master" }, "funding": [ { @@ -3887,38 +4524,65 @@ "type": "github" } ], - "time": "2021-11-11T13:51:24+00:00" + "abandoned": true, + "time": "2020-08-04T08:28:15+00:00" }, { - "name": "sebastian/global-state", - "version": "3.0.1", + "name": "phpunit/phpunit", + "version": "8.5.21", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "474fb9edb7ab891665d3bfc6317f42a0a150454b" + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "50a58a60b85947b0bee4c8ecfe0f4bbdcf20e984" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/474fb9edb7ab891665d3bfc6317f42a0a150454b", - "reference": "474fb9edb7ab891665d3bfc6317f42a0a150454b", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/50a58a60b85947b0bee4c8ecfe0f4bbdcf20e984", + "reference": "50a58a60b85947b0bee4c8ecfe0f4bbdcf20e984", "shasum": "" }, "require": { + "doctrine/instantiator": "^1.3.1", + "ext-dom": "*", + "ext-json": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-xml": "*", + "ext-xmlwriter": "*", + "myclabs/deep-copy": "^1.10.0", + "phar-io/manifest": "^2.0.3", + "phar-io/version": "^3.0.2", "php": ">=7.2", - "sebastian/object-reflector": "^1.1.1", - "sebastian/recursion-context": "^3.0" + "phpspec/prophecy": "^1.10.3", + "phpunit/php-code-coverage": "^7.0.12", + "phpunit/php-file-iterator": "^2.0.4", + "phpunit/php-text-template": "^1.2.1", + "phpunit/php-timer": "^2.1.2", + "sebastian/comparator": "^3.0.2", + "sebastian/diff": "^3.0.2", + "sebastian/environment": "^4.2.3", + "sebastian/exporter": "^3.1.2", + "sebastian/global-state": "^3.0.0", + "sebastian/object-enumerator": "^3.0.3", + "sebastian/resource-operations": "^2.0.1", + "sebastian/type": "^1.1.3", + "sebastian/version": "^2.0.1" }, "require-dev": { - "ext-dom": "*", - "phpunit/phpunit": "^8.0" + "ext-pdo": "*" }, "suggest": { - "ext-uopz": "*" + "ext-soap": "*", + "ext-xdebug": "*", + "phpunit/php-invoker": "^2.0.0" }, + "bin": [ + "phpunit" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "8.5-dev" } }, "autoload": { @@ -3933,1348 +4597,1172 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "description": "Snapshotting of global state", - "homepage": "http://www.github.com/sebastianbergmann/global-state", + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", "keywords": [ - "global state" + "phpunit", + "testing", + "xunit" ], "support": { - "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/3.0.1" + "issues": "https://github.com/sebastianbergmann/phpunit/issues", + "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.21" }, "funding": [ + { + "url": "https://phpunit.de/donate.html", + "type": "custom" + }, { "url": "https://github.com/sebastianbergmann", "type": "github" } ], - "time": "2020-11-30T07:43:24+00:00" + "time": "2021-09-25T07:37:20+00:00" }, { - "name": "sebastian/object-enumerator", - "version": "3.0.4", + "name": "predis/predis", + "version": "v1.1.9", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2" + "url": "https://github.com/predis/predis.git", + "reference": "c50c3393bb9f47fa012d0cdfb727a266b0818259" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", - "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", + "url": "https://api.github.com/repos/predis/predis/zipball/c50c3393bb9f47fa012d0cdfb727a266b0818259", + "reference": "c50c3393bb9f47fa012d0cdfb727a266b0818259", "shasum": "" }, "require": { - "php": ">=7.0", - "sebastian/object-reflector": "^1.1.1", - "sebastian/recursion-context": "^3.0" + "php": ">=5.3.9" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "~4.8" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0.x-dev" - } + "suggest": { + "ext-curl": "Allows access to Webdis when paired with phpiredis", + "ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol" }, + "type": "library", "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "Predis\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "name": "Daniele Alessandri", + "email": "suppakilla@gmail.com", + "homepage": "http://clorophilla.net", + "role": "Creator & Maintainer" + }, + { + "name": "Till Krüss", + "homepage": "https://till.im", + "role": "Maintainer" } ], - "description": "Traverses array structures and object graphs to enumerate all referenced objects", - "homepage": "https://github.com/sebastianbergmann/object-enumerator/", + "description": "Flexible and feature-complete Redis client for PHP and HHVM", + "homepage": "http://github.com/predis/predis", + "keywords": [ + "nosql", + "predis", + "redis" + ], "support": { - "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", - "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4" + "issues": "https://github.com/predis/predis/issues", + "source": "https://github.com/predis/predis/tree/v1.1.9" }, "funding": [ { - "url": "https://github.com/sebastianbergmann", + "url": "https://github.com/sponsors/tillkruss", "type": "github" } ], - "time": "2020-11-30T07:40:27+00:00" + "time": "2021-10-05T19:02:38+00:00" }, { - "name": "sebastian/object-reflector", - "version": "1.1.2", + "name": "psr/cache", + "version": "3.0.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d" + "url": "https://github.com/php-fig/cache.git", + "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", - "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", + "url": "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", + "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", "shasum": "" }, "require": { - "php": ">=7.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.0" + "php": ">=8.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "Psr\\Cache\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" } ], - "description": "Allows reflection of object attributes, including inherited and non-public ones", - "homepage": "https://github.com/sebastianbergmann/object-reflector/", + "description": "Common interface for caching libraries", + "keywords": [ + "cache", + "psr", + "psr-6" + ], "support": { - "issues": "https://github.com/sebastianbergmann/object-reflector/issues", - "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2" + "source": "https://github.com/php-fig/cache/tree/3.0.0" }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T07:37:18+00:00" + "time": "2021-02-03T23:26:27+00:00" }, { - "name": "sebastian/recursion-context", - "version": "3.0.1", + "name": "psr/http-client", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb" + "url": "https://github.com/php-fig/http-client.git", + "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb", - "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", "shasum": "" }, "require": { - "php": ">=7.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.0" + "php": "^7.0 || ^8.0", + "psr/http-message": "^1.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "Psr\\Http\\Client\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net" + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" } ], - "description": "Provides functionality to recursively process PHP variables", - "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "description": "Common interface for HTTP clients", + "homepage": "https://github.com/php-fig/http-client", + "keywords": [ + "http", + "http-client", + "psr", + "psr-18" + ], "support": { - "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1" + "source": "https://github.com/php-fig/http-client/tree/master" }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T07:34:24+00:00" + "time": "2020-06-29T06:28:15+00:00" }, { - "name": "sebastian/resource-operations", - "version": "2.0.2", + "name": "psr/http-factory", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3" + "url": "https://github.com/php-fig/http-factory.git", + "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/31d35ca87926450c44eae7e2611d45a7a65ea8b3", - "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.0.0", + "psr/http-message": "^1.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" } ], - "description": "Provides a list of PHP built-in functions that operate on resources", - "homepage": "https://www.github.com/sebastianbergmann/resource-operations", + "description": "Common interfaces for PSR-7 HTTP message factories", + "keywords": [ + "factory", + "http", + "message", + "psr", + "psr-17", + "psr-7", + "request", + "response" + ], "support": { - "issues": "https://github.com/sebastianbergmann/resource-operations/issues", - "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.2" + "source": "https://github.com/php-fig/http-factory/tree/master" }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T07:30:19+00:00" + "time": "2019-04-30T12:38:16+00:00" }, { - "name": "sebastian/type", - "version": "1.1.4", + "name": "psr/http-message", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/type.git", - "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4" + "url": "https://github.com/php-fig/http-message.git", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/0150cfbc4495ed2df3872fb31b26781e4e077eb4", - "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", "shasum": "" }, "require": { - "php": ">=7.2" - }, - "require-dev": { - "phpunit/phpunit": "^8.2" + "php": ">=5.3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" } ], - "description": "Collection of value objects that represent the types of the PHP type system", - "homepage": "https://github.com/sebastianbergmann/type", + "description": "Common interface for HTTP messages", + "homepage": "https://github.com/php-fig/http-message", + "keywords": [ + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" + ], "support": { - "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/1.1.4" + "source": "https://github.com/php-fig/http-message/tree/master" }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T07:25:11+00:00" + "time": "2016-08-06T14:39:51+00:00" }, { - "name": "sebastian/version", - "version": "2.0.1", + "name": "ralouphie/getallheaders", + "version": "3.0.3", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/version.git", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" + "url": "https://github.com/ralouphie/getallheaders.git", + "reference": "120b605dfeb996808c31b6477290a714d356e822" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", + "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", + "reference": "120b605dfeb996808c31b6477290a714d356e822", "shasum": "" }, "require": { "php": ">=5.6" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } + "require-dev": { + "php-coveralls/php-coveralls": "^2.1", + "phpunit/phpunit": "^5 || ^6.5" }, + "type": "library", "autoload": { - "classmap": [ - "src/" + "files": [ + "src/getallheaders.php" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "name": "Ralph Khattar", + "email": "ralph.khattar@gmail.com" } ], - "description": "Library that helps with managing the version number of Git-hosted PHP projects", - "homepage": "https://github.com/sebastianbergmann/version", + "description": "A polyfill for getallheaders.", "support": { - "issues": "https://github.com/sebastianbergmann/version/issues", - "source": "https://github.com/sebastianbergmann/version/tree/master" + "issues": "https://github.com/ralouphie/getallheaders/issues", + "source": "https://github.com/ralouphie/getallheaders/tree/develop" }, - "time": "2016-10-03T07:35:21+00:00" + "time": "2019-03-08T08:55:37+00:00" }, { - "name": "squizlabs/php_codesniffer", - "version": "3.6.1", + "name": "sebastian/code-unit-reverse-lookup", + "version": "1.0.2", "source": { "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "f268ca40d54617c6e06757f83f699775c9b3ff2e" + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/f268ca40d54617c6e06757f83f699775c9b3ff2e", - "reference": "f268ca40d54617c6e06757f83f699775c9b3ff2e", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619", + "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619", "shasum": "" }, "require": { - "ext-simplexml": "*", - "ext-tokenizer": "*", - "ext-xmlwriter": "*", - "php": ">=5.4.0" + "php": ">=5.6" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" + "phpunit/phpunit": "^8.5" }, - "bin": [ - "bin/phpcs", - "bin/phpcbf" - ], "type": "library", "extra": { "branch-alias": { - "dev-master": "3.x-dev" + "dev-master": "1.0.x-dev" } }, + "autoload": { + "classmap": [ + "src/" + ] + }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], "authors": [ { - "name": "Greg Sherwood", - "role": "lead" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" } ], - "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", - "keywords": [ - "phpcs", - "standards" - ], + "description": "Looks up which function or method a line of code belongs to", + "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", "support": { - "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", - "source": "https://github.com/squizlabs/PHP_CodeSniffer", - "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" + "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", + "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2" }, - "time": "2021-10-11T04:00:11+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-11-30T08:15:22+00:00" }, { - "name": "symfony/browser-kit", - "version": "v5.3.4", + "name": "sebastian/comparator", + "version": "3.0.3", "source": { "type": "git", - "url": "https://github.com/symfony/browser-kit.git", - "reference": "c1e3f64fcc631c96e2c5843b666db66679ced11c" + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "1071dfcef776a57013124ff35e1fc41ccd294758" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/c1e3f64fcc631c96e2c5843b666db66679ced11c", - "reference": "c1e3f64fcc631c96e2c5843b666db66679ced11c", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1071dfcef776a57013124ff35e1fc41ccd294758", + "reference": "1071dfcef776a57013124ff35e1fc41ccd294758", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/dom-crawler": "^4.4|^5.0", - "symfony/polyfill-php80": "^1.16" + "php": ">=7.1", + "sebastian/diff": "^3.0", + "sebastian/exporter": "^3.1" }, "require-dev": { - "symfony/css-selector": "^4.4|^5.0", - "symfony/http-client": "^4.4|^5.0", - "symfony/mime": "^4.4|^5.0", - "symfony/process": "^4.4|^5.0" - }, - "suggest": { - "symfony/process": "" + "phpunit/phpunit": "^8.5" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, "autoload": { - "psr-4": { - "Symfony\\Component\\BrowserKit\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" }, { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" } ], - "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", - "homepage": "https://symfony.com", + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "https://github.com/sebastianbergmann/comparator", + "keywords": [ + "comparator", + "compare", + "equality" + ], "support": { - "source": "https://github.com/symfony/browser-kit/tree/v5.3.4" + "issues": "https://github.com/sebastianbergmann/comparator/issues", + "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.3" }, "funding": [ { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", + "url": "https://github.com/sebastianbergmann", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" } ], - "time": "2021-07-21T12:40:44+00:00" + "time": "2020-11-30T08:04:30+00:00" }, { - "name": "symfony/console", - "version": "v5.3.10", + "name": "sebastian/diff", + "version": "3.0.3", "source": { "type": "git", - "url": "https://github.com/symfony/console.git", - "reference": "d4e409d9fbcfbf71af0e5a940abb7b0b4bad0bd3" + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/d4e409d9fbcfbf71af0e5a940abb7b0b4bad0bd3", - "reference": "d4e409d9fbcfbf71af0e5a940abb7b0b4bad0bd3", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/14f72dd46eaf2f2293cbe79c93cc0bc43161a211", + "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1", - "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php73": "^1.8", - "symfony/polyfill-php80": "^1.16", - "symfony/service-contracts": "^1.1|^2", - "symfony/string": "^5.1" - }, - "conflict": { - "psr/log": ">=3", - "symfony/dependency-injection": "<4.4", - "symfony/dotenv": "<5.1", - "symfony/event-dispatcher": "<4.4", - "symfony/lock": "<4.4", - "symfony/process": "<4.4" - }, - "provide": { - "psr/log-implementation": "1.0|2.0" + "php": ">=7.1" }, "require-dev": { - "psr/log": "^1|^2", - "symfony/config": "^4.4|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/event-dispatcher": "^4.4|^5.0", - "symfony/lock": "^4.4|^5.0", - "symfony/process": "^4.4|^5.0", - "symfony/var-dumper": "^4.4|^5.0" - }, - "suggest": { - "psr/log": "For using the console logger", - "symfony/event-dispatcher": "", - "symfony/lock": "", - "symfony/process": "" + "phpunit/phpunit": "^7.5 || ^8.0", + "symfony/process": "^2 || ^3.3 || ^4" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, "autoload": { - "psr-4": { - "Symfony\\Component\\Console\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" }, { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" } ], - "description": "Eases the creation of beautiful and testable command line interfaces", - "homepage": "https://symfony.com", + "description": "Diff implementation", + "homepage": "https://github.com/sebastianbergmann/diff", "keywords": [ - "cli", - "command line", - "console", - "terminal" + "diff", + "udiff", + "unidiff", + "unified diff" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.3.10" + "issues": "https://github.com/sebastianbergmann/diff/issues", + "source": "https://github.com/sebastianbergmann/diff/tree/3.0.3" }, "funding": [ { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", + "url": "https://github.com/sebastianbergmann", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" } ], - "time": "2021-10-26T09:30:15+00:00" + "time": "2020-11-30T07:59:04+00:00" }, { - "name": "symfony/css-selector", - "version": "v5.3.4", + "name": "sebastian/environment", + "version": "4.2.4", "source": { "type": "git", - "url": "https://github.com/symfony/css-selector.git", - "reference": "7fb120adc7f600a59027775b224c13a33530dd90" + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/7fb120adc7f600a59027775b224c13a33530dd90", - "reference": "7fb120adc7f600a59027775b224c13a33530dd90", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", + "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/polyfill-php80": "^1.16" + "php": ">=7.1" + }, + "require-dev": { + "phpunit/phpunit": "^7.5" + }, + "suggest": { + "ext-posix": "*" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.2-dev" + } + }, "autoload": { - "psr-4": { - "Symfony\\Component\\CssSelector\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "src/" ] }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Jean-François Simon", - "email": "jeanfrancois.simon@sensiolabs.com" - }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" } ], - "description": "Converts CSS selectors to XPath expressions", - "homepage": "https://symfony.com", + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "http://www.github.com/sebastianbergmann/environment", + "keywords": [ + "Xdebug", + "environment", + "hhvm" + ], "support": { - "source": "https://github.com/symfony/css-selector/tree/v5.3.4" + "issues": "https://github.com/sebastianbergmann/environment/issues", + "source": "https://github.com/sebastianbergmann/environment/tree/4.2.4" }, "funding": [ { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", + "url": "https://github.com/sebastianbergmann", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" } ], - "time": "2021-07-21T12:38:00+00:00" + "time": "2020-11-30T07:53:42+00:00" }, { - "name": "symfony/deprecation-contracts", - "version": "v2.4.0", + "name": "sebastian/exporter", + "version": "3.1.4", "source": { "type": "git", - "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627" + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "0c32ea2e40dbf59de29f3b49bf375176ce7dd8db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627", - "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/0c32ea2e40dbf59de29f3b49bf375176ce7dd8db", + "reference": "0c32ea2e40dbf59de29f3b49bf375176ce7dd8db", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.0", + "sebastian/recursion-context": "^3.0" + }, + "require-dev": { + "ext-mbstring": "*", + "phpunit/phpunit": "^8.5" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.4-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" + "dev-master": "3.1.x-dev" } }, "autoload": { - "files": [ - "function.php" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" }, { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" } ], - "description": "A generic function and convention to trigger deprecation notices", - "homepage": "https://symfony.com", + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "http://www.github.com/sebastianbergmann/exporter", + "keywords": [ + "export", + "exporter" + ], "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.4.0" + "issues": "https://github.com/sebastianbergmann/exporter/issues", + "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.4" }, "funding": [ { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", + "url": "https://github.com/sebastianbergmann", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" } ], - "time": "2021-03-23T23:28:01+00:00" + "time": "2021-11-11T13:51:24+00:00" }, { - "name": "symfony/dom-crawler", - "version": "v5.3.7", + "name": "sebastian/global-state", + "version": "3.0.1", "source": { "type": "git", - "url": "https://github.com/symfony/dom-crawler.git", - "reference": "c7eef3a60ccfdd8eafe07f81652e769ac9c7146c" + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "474fb9edb7ab891665d3bfc6317f42a0a150454b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/c7eef3a60ccfdd8eafe07f81652e769ac9c7146c", - "reference": "c7eef3a60ccfdd8eafe07f81652e769ac9c7146c", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/474fb9edb7ab891665d3bfc6317f42a0a150454b", + "reference": "474fb9edb7ab891665d3bfc6317f42a0a150454b", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1", - "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "^1.16" - }, - "conflict": { - "masterminds/html5": "<2.6" + "php": ">=7.2", + "sebastian/object-reflector": "^1.1.1", + "sebastian/recursion-context": "^3.0" }, "require-dev": { - "masterminds/html5": "^2.6", - "symfony/css-selector": "^4.4|^5.0" + "ext-dom": "*", + "phpunit/phpunit": "^8.0" }, "suggest": { - "symfony/css-selector": "" + "ext-uopz": "*" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, "autoload": { - "psr-4": { - "Symfony\\Component\\DomCrawler\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" } ], - "description": "Eases DOM navigation for HTML and XML documents", - "homepage": "https://symfony.com", + "description": "Snapshotting of global state", + "homepage": "http://www.github.com/sebastianbergmann/global-state", + "keywords": [ + "global state" + ], "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v5.3.7" + "issues": "https://github.com/sebastianbergmann/global-state/issues", + "source": "https://github.com/sebastianbergmann/global-state/tree/3.0.1" }, "funding": [ { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", + "url": "https://github.com/sebastianbergmann", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" } ], - "time": "2021-08-29T19:32:13+00:00" + "time": "2020-11-30T07:43:24+00:00" }, { - "name": "symfony/event-dispatcher", - "version": "v5.3.7", + "name": "sebastian/object-enumerator", + "version": "3.0.4", "source": { "type": "git", - "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "ce7b20d69c66a20939d8952b617506a44d102130" + "url": "https://github.com/sebastianbergmann/object-enumerator.git", + "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ce7b20d69c66a20939d8952b617506a44d102130", - "reference": "ce7b20d69c66a20939d8952b617506a44d102130", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", + "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1", - "symfony/event-dispatcher-contracts": "^2", - "symfony/polyfill-php80": "^1.16" - }, - "conflict": { - "symfony/dependency-injection": "<4.4" - }, - "provide": { - "psr/event-dispatcher-implementation": "1.0", - "symfony/event-dispatcher-implementation": "2.0" + "php": ">=7.0", + "sebastian/object-reflector": "^1.1.1", + "sebastian/recursion-context": "^3.0" }, "require-dev": { - "psr/log": "^1|^2|^3", - "symfony/config": "^4.4|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/error-handler": "^4.4|^5.0", - "symfony/expression-language": "^4.4|^5.0", - "symfony/http-foundation": "^4.4|^5.0", - "symfony/service-contracts": "^1.1|^2", - "symfony/stopwatch": "^4.4|^5.0" - }, - "suggest": { - "symfony/dependency-injection": "", - "symfony/http-kernel": "" + "phpunit/phpunit": "^6.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, "autoload": { - "psr-4": { - "Symfony\\Component\\EventDispatcher\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" } ], - "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", - "homepage": "https://symfony.com", + "description": "Traverses array structures and object graphs to enumerate all referenced objects", + "homepage": "https://github.com/sebastianbergmann/object-enumerator/", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.3.7" + "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", + "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4" }, "funding": [ { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", + "url": "https://github.com/sebastianbergmann", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" } ], - "time": "2021-08-04T21:20:46+00:00" + "time": "2020-11-30T07:40:27+00:00" }, { - "name": "symfony/event-dispatcher-contracts", - "version": "v2.4.0", + "name": "sebastian/object-reflector", + "version": "1.1.2", "source": { "type": "git", - "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "69fee1ad2332a7cbab3aca13591953da9cdb7a11" + "url": "https://github.com/sebastianbergmann/object-reflector.git", + "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/69fee1ad2332a7cbab3aca13591953da9cdb7a11", - "reference": "69fee1ad2332a7cbab3aca13591953da9cdb7a11", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", + "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", "shasum": "" }, "require": { - "php": ">=7.2.5", - "psr/event-dispatcher": "^1" + "php": ">=7.0" }, - "suggest": { - "symfony/event-dispatcher-implementation": "" + "require-dev": { + "phpunit/phpunit": "^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.4-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" + "dev-master": "1.1-dev" } }, "autoload": { - "psr-4": { - "Symfony\\Contracts\\EventDispatcher\\": "" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" } ], - "description": "Generic abstractions related to dispatching event", - "homepage": "https://symfony.com", - "keywords": [ - "abstractions", - "contracts", - "decoupling", - "interfaces", - "interoperability", - "standards" - ], + "description": "Allows reflection of object attributes, including inherited and non-public ones", + "homepage": "https://github.com/sebastianbergmann/object-reflector/", "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.4.0" + "issues": "https://github.com/sebastianbergmann/object-reflector/issues", + "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2" }, "funding": [ { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", + "url": "https://github.com/sebastianbergmann", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" } ], - "time": "2021-03-23T23:28:01+00:00" + "time": "2020-11-30T07:37:18+00:00" }, { - "name": "symfony/filesystem", - "version": "v5.3.4", + "name": "sebastian/recursion-context", + "version": "3.0.1", "source": { "type": "git", - "url": "https://github.com/symfony/filesystem.git", - "reference": "343f4fe324383ca46792cae728a3b6e2f708fb32" + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/343f4fe324383ca46792cae728a3b6e2f708fb32", - "reference": "343f4fe324383ca46792cae728a3b6e2f708fb32", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb", + "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-php80": "^1.16" + "php": ">=7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, "autoload": { - "psr-4": { - "Symfony\\Component\\Filesystem\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" }, { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" } ], - "description": "Provides basic utilities for the filesystem", - "homepage": "https://symfony.com", + "description": "Provides functionality to recursively process PHP variables", + "homepage": "http://www.github.com/sebastianbergmann/recursion-context", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.3.4" + "issues": "https://github.com/sebastianbergmann/recursion-context/issues", + "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1" }, "funding": [ { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", + "url": "https://github.com/sebastianbergmann", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" } ], - "time": "2021-07-21T12:40:44+00:00" + "time": "2020-11-30T07:34:24+00:00" }, { - "name": "symfony/finder", - "version": "v5.3.7", + "name": "sebastian/resource-operations", + "version": "2.0.2", "source": { "type": "git", - "url": "https://github.com/symfony/finder.git", - "reference": "a10000ada1e600d109a6c7632e9ac42e8bf2fb93" + "url": "https://github.com/sebastianbergmann/resource-operations.git", + "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/a10000ada1e600d109a6c7632e9ac42e8bf2fb93", - "reference": "a10000ada1e600d109a6c7632e9ac42e8bf2fb93", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/31d35ca87926450c44eae7e2611d45a7a65ea8b3", + "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/polyfill-php80": "^1.16" + "php": ">=7.1" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, "autoload": { - "psr-4": { - "Symfony\\Component\\Finder\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" } ], - "description": "Finds files and directories via an intuitive fluent interface", - "homepage": "https://symfony.com", + "description": "Provides a list of PHP built-in functions that operate on resources", + "homepage": "https://www.github.com/sebastianbergmann/resource-operations", "support": { - "source": "https://github.com/symfony/finder/tree/v5.3.7" + "issues": "https://github.com/sebastianbergmann/resource-operations/issues", + "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.2" }, "funding": [ { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", + "url": "https://github.com/sebastianbergmann", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" } ], - "time": "2021-08-04T21:20:46+00:00" + "time": "2020-11-30T07:30:19+00:00" }, { - "name": "symfony/options-resolver", - "version": "v5.3.7", + "name": "sebastian/type", + "version": "1.1.4", "source": { "type": "git", - "url": "https://github.com/symfony/options-resolver.git", - "reference": "4b78e55b179003a42523a362cc0e8327f7a69b5e" + "url": "https://github.com/sebastianbergmann/type.git", + "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/4b78e55b179003a42523a362cc0e8327f7a69b5e", - "reference": "4b78e55b179003a42523a362cc0e8327f7a69b5e", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/0150cfbc4495ed2df3872fb31b26781e4e077eb4", + "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1", - "symfony/polyfill-php73": "~1.0", - "symfony/polyfill-php80": "^1.16" + "php": ">=7.2" + }, + "require-dev": { + "phpunit/phpunit": "^8.2" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, "autoload": { - "psr-4": { - "Symfony\\Component\\OptionsResolver\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "description": "Provides an improved replacement for the array_replace PHP function", - "homepage": "https://symfony.com", - "keywords": [ - "config", - "configuration", - "options" - ], + "description": "Collection of value objects that represent the types of the PHP type system", + "homepage": "https://github.com/sebastianbergmann/type", "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.3.7" + "issues": "https://github.com/sebastianbergmann/type/issues", + "source": "https://github.com/sebastianbergmann/type/tree/1.1.4" }, "funding": [ { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", + "url": "https://github.com/sebastianbergmann", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" } ], - "time": "2021-08-04T21:20:46+00:00" + "time": "2020-11-30T07:25:11+00:00" }, { - "name": "symfony/polyfill-ctype", - "version": "v1.23.0", + "name": "sebastian/version", + "version": "2.0.1", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce" + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce", - "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", "shasum": "" }, "require": { - "php": ">=7.1" - }, - "suggest": { - "ext-ctype": "For best performance" + "php": ">=5.6" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "dev-master": "2.0.x-dev" } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Ctype\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Gert de Pagter", - "email": "BackEndTea@gmail.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for ctype functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "ctype", - "polyfill", - "portable" - ], - "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0" + "classmap": [ + "src/" + ] }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "time": "2021-02-19T12:13:01+00:00" + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "support": { + "issues": "https://github.com/sebastianbergmann/version/issues", + "source": "https://github.com/sebastianbergmann/version/tree/master" + }, + "time": "2016-10-03T07:35:21+00:00" }, { - "name": "symfony/polyfill-intl-grapheme", - "version": "v1.23.1", + "name": "squizlabs/php_codesniffer", + "version": "3.6.2", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "16880ba9c5ebe3642d1995ab866db29270b36535" + "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/16880ba9c5ebe3642d1995ab866db29270b36535", - "reference": "16880ba9c5ebe3642d1995ab866db29270b36535", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a", + "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a", "shasum": "" }, "require": { - "php": ">=7.1" + "ext-simplexml": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": ">=5.4.0" }, - "suggest": { - "ext-intl": "For best performance" + "require-dev": { + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" }, + "bin": [ + "bin/phpcs", + "bin/phpcbf" + ], "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "dev-master": "3.x-dev" } }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Grapheme\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Greg Sherwood", + "role": "lead" } ], - "description": "Symfony polyfill for intl's grapheme_* functions", - "homepage": "https://symfony.com", + "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", "keywords": [ - "compatibility", - "grapheme", - "intl", - "polyfill", - "portable", - "shim" + "phpcs", + "standards" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.1" + "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", + "source": "https://github.com/squizlabs/PHP_CodeSniffer", + "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2021-05-27T12:26:48+00:00" + "time": "2021-12-12T21:44:58+00:00" }, { - "name": "symfony/polyfill-intl-normalizer", - "version": "v1.23.0", + "name": "symfony/browser-kit", + "version": "v5.4.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8" + "url": "https://github.com/symfony/browser-kit.git", + "reference": "d250db364a35ba5d60626b2a6f10f2eaf2073bde" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/d250db364a35ba5d60626b2a6f10f2eaf2073bde", + "reference": "d250db364a35ba5d60626b2a6f10f2eaf2073bde", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2.5", + "symfony/dom-crawler": "^4.4|^5.0|^6.0", + "symfony/polyfill-php80": "^1.16" + }, + "require-dev": { + "symfony/css-selector": "^4.4|^5.0|^6.0", + "symfony/http-client": "^4.4|^5.0|^6.0", + "symfony/mime": "^4.4|^5.0|^6.0", + "symfony/process": "^4.4|^5.0|^6.0" }, "suggest": { - "ext-intl": "For best performance" + "symfony/process": "" }, "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.23-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, "autoload": { "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + "Symfony\\Component\\BrowserKit\\": "" }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -5283,26 +5771,18 @@ ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill for intl's Normalizer class and related functions", + "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "intl", - "normalizer", - "polyfill", - "portable", - "shim" - ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0" + "source": "https://github.com/symfony/browser-kit/tree/v5.4.0" }, "funding": [ { @@ -5318,44 +5798,33 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2021-10-26T22:29:18+00:00" }, { - "name": "symfony/polyfill-mbstring", - "version": "v1.23.1", + "name": "symfony/css-selector", + "version": "v5.4.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6" + "url": "https://github.com/symfony/css-selector.git", + "reference": "44b933f98bb4b5220d10bed9ce5662f8c2d13dcc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6", - "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/44b933f98bb4b5220d10bed9ce5662f8c2d13dcc", + "reference": "44b933f98bb4b5220d10bed9ce5662f8c2d13dcc", "shasum": "" }, "require": { - "php": ">=7.1" - }, - "suggest": { - "ext-mbstring": "For best performance" + "php": ">=7.2.5", + "symfony/polyfill-php80": "^1.16" }, "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.23-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, "autoload": { "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" + "Symfony\\Component\\CssSelector\\": "" }, - "files": [ - "bootstrap.php" + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -5364,25 +5833,22 @@ ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Jean-François Simon", + "email": "jeanfrancois.simon@sensiolabs.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill for the Mbstring extension", + "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "mbstring", - "polyfill", - "portable", - "shim" - ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1" + "source": "https://github.com/symfony/css-selector/tree/v5.4.0" }, "funding": [ { @@ -5398,34 +5864,47 @@ "type": "tidelift" } ], - "time": "2021-05-27T12:26:48+00:00" + "time": "2021-09-09T08:06:01+00:00" }, { - "name": "symfony/polyfill-php70", - "version": "v1.20.0", + "name": "symfony/dom-crawler", + "version": "v5.4.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644" + "url": "https://github.com/symfony/dom-crawler.git", + "reference": "5b06626e940a3ad54e573511d64d4e00dc8d0fd8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/5f03a781d984aae42cebd18e7912fa80f02ee644", - "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/5b06626e940a3ad54e573511d64d4e00dc8d0fd8", + "reference": "5b06626e940a3ad54e573511d64d4e00dc8d0fd8", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php80": "^1.16" }, - "type": "metapackage", - "extra": { - "branch-alias": { - "dev-main": "1.20-dev" + "conflict": { + "masterminds/html5": "<2.6" + }, + "require-dev": { + "masterminds/html5": "^2.6", + "symfony/css-selector": "^4.4|^5.0|^6.0" + }, + "suggest": { + "symfony/css-selector": "" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\DomCrawler\\": "" }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5433,24 +5912,18 @@ ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions", + "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], "support": { - "source": "https://github.com/symfony/polyfill-php70/tree/v1.20.0" + "source": "https://github.com/symfony/dom-crawler/tree/v5.4.0" }, "funding": [ { @@ -5466,41 +5939,35 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-11-23T10:19:22+00:00" }, - { - "name": "symfony/polyfill-php72", - "version": "v1.23.0", + { + "name": "symfony/filesystem", + "version": "v5.4.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "9a142215a36a3888e30d0a9eeea9766764e96976" + "url": "https://github.com/symfony/filesystem.git", + "reference": "731f917dc31edcffec2c6a777f3698c33bea8f01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976", - "reference": "9a142215a36a3888e30d0a9eeea9766764e96976", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/731f917dc31edcffec2c6a777f3698c33bea8f01", + "reference": "731f917dc31edcffec2c6a777f3698c33bea8f01", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2.5", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.8", + "symfony/polyfill-php80": "^1.16" }, "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.23-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, "autoload": { "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" + "Symfony\\Component\\Filesystem\\": "" }, - "files": [ - "bootstrap.php" + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -5509,24 +5976,18 @@ ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", + "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.23.0" + "source": "https://github.com/symfony/filesystem/tree/v5.4.0" }, "funding": [ { @@ -5542,44 +6003,34 @@ "type": "tidelift" } ], - "time": "2021-05-27T09:17:38+00:00" + "time": "2021-10-28T13:39:27+00:00" }, { - "name": "symfony/polyfill-php73", - "version": "v1.23.0", + "name": "symfony/finder", + "version": "v5.4.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010" + "url": "https://github.com/symfony/finder.git", + "reference": "d2f29dac98e96a98be467627bd49c2efb1bc2590" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010", - "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010", + "url": "https://api.github.com/repos/symfony/finder/zipball/d2f29dac98e96a98be467627bd49c2efb1bc2590", + "reference": "d2f29dac98e96a98be467627bd49c2efb1bc2590", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-php80": "^1.16" }, "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.23-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, "autoload": { "psr-4": { - "Symfony\\Polyfill\\Php73\\": "" + "Symfony\\Component\\Finder\\": "" }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -5588,24 +6039,18 @@ ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", + "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.23.0" + "source": "https://github.com/symfony/finder/tree/v5.4.0" }, "funding": [ { @@ -5621,44 +6066,35 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2021-11-28T15:25:38+00:00" }, { - "name": "symfony/polyfill-php80", - "version": "v1.23.1", + "name": "symfony/options-resolver", + "version": "v5.4.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be" + "url": "https://github.com/symfony/options-resolver.git", + "reference": "b0fb78576487af19c500aaddb269fd36701d4847" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be", - "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/b0fb78576487af19c500aaddb269fd36701d4847", + "reference": "b0fb78576487af19c500aaddb269fd36701d4847", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-php73": "~1.0", + "symfony/polyfill-php80": "^1.16" }, "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.23-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, "autoload": { "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" + "Symfony\\Component\\OptionsResolver\\": "" }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -5667,28 +6103,23 @@ ], "authors": [ { - "name": "Ion Bazan", - "email": "ion.bazan@gmail.com" - }, - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "description": "Provides an improved replacement for the array_replace PHP function", "homepage": "https://symfony.com", "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" + "config", + "configuration", + "options" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1" + "source": "https://github.com/symfony/options-resolver/tree/v5.4.0" }, "funding": [ { @@ -5704,34 +6135,34 @@ "type": "tidelift" } ], - "time": "2021-07-28T13:41:28+00:00" + "time": "2021-11-23T10:19:22+00:00" }, { - "name": "symfony/process", - "version": "v5.3.7", + "name": "symfony/polyfill-php70", + "version": "v1.20.0", "source": { "type": "git", - "url": "https://github.com/symfony/process.git", - "reference": "38f26c7d6ed535217ea393e05634cb0b244a1967" + "url": "https://github.com/symfony/polyfill-php70.git", + "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/38f26c7d6ed535217ea393e05634cb0b244a1967", - "reference": "38f26c7d6ed535217ea393e05634cb0b244a1967", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/5f03a781d984aae42cebd18e7912fa80f02ee644", + "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/polyfill-php80": "^1.16" + "php": ">=7.1" }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Process\\": "" + "type": "metapackage", + "extra": { + "branch-alias": { + "dev-main": "1.20-dev" }, - "exclude-from-classmap": [ - "/Tests/" - ] + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5739,18 +6170,24 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Executes commands in sub-processes", + "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions", "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], "support": { - "source": "https://github.com/symfony/process/tree/v5.3.7" + "source": "https://github.com/symfony/polyfill-php70/tree/v1.20.0" }, "funding": [ { @@ -5766,43 +6203,42 @@ "type": "tidelift" } ], - "time": "2021-08-04T21:20:46+00:00" + "time": "2020-10-23T14:02:19+00:00" }, { - "name": "symfony/service-contracts", - "version": "v2.4.0", + "name": "symfony/polyfill-php72", + "version": "v1.23.0", "source": { "type": "git", - "url": "https://github.com/symfony/service-contracts.git", - "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb" + "url": "https://github.com/symfony/polyfill-php72.git", + "reference": "9a142215a36a3888e30d0a9eeea9766764e96976" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", - "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976", + "reference": "9a142215a36a3888e30d0a9eeea9766764e96976", "shasum": "" }, "require": { - "php": ">=7.2.5", - "psr/container": "^1.1" - }, - "suggest": { - "symfony/service-implementation": "" + "php": ">=7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "1.23-dev" }, "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { "psr-4": { - "Symfony\\Contracts\\Service\\": "" - } + "Symfony\\Polyfill\\Php72\\": "" + }, + "files": [ + "bootstrap.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5818,18 +6254,16 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Generic abstractions related to writing services", + "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", "homepage": "https://symfony.com", "keywords": [ - "abstractions", - "contracts", - "decoupling", - "interfaces", - "interoperability", - "standards" + "compatibility", + "polyfill", + "portable", + "shim" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.4.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.23.0" }, "funding": [ { @@ -5845,30 +6279,30 @@ "type": "tidelift" } ], - "time": "2021-04-01T10:43:52+00:00" + "time": "2021-05-27T09:17:38+00:00" }, { - "name": "symfony/stopwatch", - "version": "v5.3.4", + "name": "symfony/process", + "version": "v5.4.0", "source": { "type": "git", - "url": "https://github.com/symfony/stopwatch.git", - "reference": "b24c6a92c6db316fee69e38c80591e080e41536c" + "url": "https://github.com/symfony/process.git", + "reference": "5be20b3830f726e019162b26223110c8f47cf274" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/b24c6a92c6db316fee69e38c80591e080e41536c", - "reference": "b24c6a92c6db316fee69e38c80591e080e41536c", + "url": "https://api.github.com/repos/symfony/process/zipball/5be20b3830f726e019162b26223110c8f47cf274", + "reference": "5be20b3830f726e019162b26223110c8f47cf274", "shasum": "" }, "require": { "php": ">=7.2.5", - "symfony/service-contracts": "^1.0|^2" + "symfony/polyfill-php80": "^1.16" }, "type": "library", "autoload": { "psr-4": { - "Symfony\\Component\\Stopwatch\\": "" + "Symfony\\Component\\Process\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -5888,10 +6322,10 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Provides a way to profile code", + "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v5.3.4" + "source": "https://github.com/symfony/process/tree/v5.4.0" }, "funding": [ { @@ -5907,44 +6341,31 @@ "type": "tidelift" } ], - "time": "2021-07-10T08:58:57+00:00" + "time": "2021-11-28T15:25:38+00:00" }, { - "name": "symfony/string", - "version": "v5.3.10", + "name": "symfony/stopwatch", + "version": "v5.4.0", "source": { "type": "git", - "url": "https://github.com/symfony/string.git", - "reference": "d70c35bb20bbca71fc4ab7921e3c6bda1a82a60c" + "url": "https://github.com/symfony/stopwatch.git", + "reference": "208ef96122bfed82a8f3a61458a07113a08bdcfe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/d70c35bb20bbca71fc4ab7921e3c6bda1a82a60c", - "reference": "d70c35bb20bbca71fc4ab7921e3c6bda1a82a60c", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/208ef96122bfed82a8f3a61458a07113a08bdcfe", + "reference": "208ef96122bfed82a8f3a61458a07113a08bdcfe", "shasum": "" }, "require": { "php": ">=7.2.5", - "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-intl-grapheme": "~1.0", - "symfony/polyfill-intl-normalizer": "~1.0", - "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "~1.15" - }, - "require-dev": { - "symfony/error-handler": "^4.4|^5.0", - "symfony/http-client": "^4.4|^5.0", - "symfony/translation-contracts": "^1.1|^2", - "symfony/var-exporter": "^4.4|^5.0" + "symfony/service-contracts": "^1|^2|^3" }, "type": "library", "autoload": { "psr-4": { - "Symfony\\Component\\String\\": "" + "Symfony\\Component\\Stopwatch\\": "" }, - "files": [ - "Resources/functions.php" - ], "exclude-from-classmap": [ "/Tests/" ] @@ -5955,26 +6376,18 @@ ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way", + "description": "Provides a way to profile code", "homepage": "https://symfony.com", - "keywords": [ - "grapheme", - "i18n", - "string", - "unicode", - "utf-8", - "utf8" - ], "support": { - "source": "https://github.com/symfony/string/tree/v5.3.10" + "source": "https://github.com/symfony/stopwatch/tree/v5.4.0" }, "funding": [ { @@ -5990,32 +6403,32 @@ "type": "tidelift" } ], - "time": "2021-10-27T18:21:46+00:00" + "time": "2021-11-23T10:19:22+00:00" }, { "name": "symfony/yaml", - "version": "v5.3.6", + "version": "v5.4.0", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "4500fe63dc9c6ffc32d3b1cb0448c329f9c814b7" + "reference": "034ccc0994f1ae3f7499fa5b1f2e75d5e7a94efc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/4500fe63dc9c6ffc32d3b1cb0448c329f9c814b7", - "reference": "4500fe63dc9c6ffc32d3b1cb0448c329f9c814b7", + "url": "https://api.github.com/repos/symfony/yaml/zipball/034ccc0994f1ae3f7499fa5b1f2e75d5e7a94efc", + "reference": "034ccc0994f1ae3f7499fa5b1f2e75d5e7a94efc", "shasum": "" }, "require": { "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1", - "symfony/polyfill-ctype": "~1.8" + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-ctype": "^1.8" }, "conflict": { - "symfony/console": "<4.4" + "symfony/console": "<5.3" }, "require-dev": { - "symfony/console": "^4.4|^5.0" + "symfony/console": "^5.3|^6.0" }, "suggest": { "symfony/console": "For validating YAML files using the lint command" @@ -6049,7 +6462,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v5.3.6" + "source": "https://github.com/symfony/yaml/tree/v5.4.0" }, "funding": [ { @@ -6065,7 +6478,7 @@ "type": "tidelift" } ], - "time": "2021-07-29T06:20:01+00:00" + "time": "2021-11-28T15:25:38+00:00" }, { "name": "theseer/tokenizer", @@ -6119,16 +6532,16 @@ }, { "name": "twig/twig", - "version": "v1.44.5", + "version": "v1.44.6", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "dd4353357c5a116322e92a00d16043a31881a81e" + "reference": "ae39480f010ef88adc7938503c9b02d3baf2f3b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/dd4353357c5a116322e92a00d16043a31881a81e", - "reference": "dd4353357c5a116322e92a00d16043a31881a81e", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/ae39480f010ef88adc7938503c9b02d3baf2f3b3", + "reference": "ae39480f010ef88adc7938503c9b02d3baf2f3b3", "shasum": "" }, "require": { @@ -6181,7 +6594,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v1.44.5" + "source": "https://github.com/twigphp/Twig/tree/v1.44.6" }, "funding": [ { @@ -6193,20 +6606,20 @@ "type": "tidelift" } ], - "time": "2021-09-17T08:35:19+00:00" + "time": "2021-11-25T13:31:46+00:00" }, { "name": "vimeo/psalm", - "version": "4.12.0", + "version": "v4.15.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "e42bc4a23f67acba28a23bb09c348e2ff38a1d87" + "reference": "a1b5e489e6fcebe40cb804793d964e99fc347820" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/e42bc4a23f67acba28a23bb09c348e2ff38a1d87", - "reference": "e42bc4a23f67acba28a23bb09c348e2ff38a1d87", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/a1b5e489e6fcebe40cb804793d964e99fc347820", + "reference": "a1b5e489e6fcebe40cb804793d964e99fc347820", "shasum": "" }, "require": { @@ -6252,7 +6665,8 @@ "weirdan/prophecy-shim": "^1.0 || ^2.0" }, "suggest": { - "ext-igbinary": "^2.0.5" + "ext-curl": "In order to send data to shepherd", + "ext-igbinary": "^2.0.5 is required, used to serialize caching data" }, "bin": [ "psalm", @@ -6296,41 +6710,45 @@ ], "support": { "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/4.12.0" + "source": "https://github.com/vimeo/psalm/tree/v4.15.0" }, - "time": "2021-11-06T10:31:17+00:00" + "time": "2021-12-07T11:25:29+00:00" }, { "name": "vlucas/phpdotenv", - "version": "v2.6.8", + "version": "v5.4.1", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "f1e2a35e53abe9322f0ab9ada689967e30055d40" + "reference": "264dce589e7ce37a7ba99cb901eed8249fbec92f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/f1e2a35e53abe9322f0ab9ada689967e30055d40", - "reference": "f1e2a35e53abe9322f0ab9ada689967e30055d40", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/264dce589e7ce37a7ba99cb901eed8249fbec92f", + "reference": "264dce589e7ce37a7ba99cb901eed8249fbec92f", "shasum": "" }, "require": { - "php": "^5.3.9 || ^7.0 || ^8.0", - "symfony/polyfill-ctype": "^1.17" + "ext-pcre": "*", + "graham-campbell/result-type": "^1.0.2", + "php": "^7.1.3 || ^8.0", + "phpoption/phpoption": "^1.8", + "symfony/polyfill-ctype": "^1.23", + "symfony/polyfill-mbstring": "^1.23.1", + "symfony/polyfill-php80": "^1.23.1" }, "require-dev": { + "bamarni/composer-bin-plugin": "^1.4.1", "ext-filter": "*", - "ext-pcre": "*", - "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.21" + "phpunit/phpunit": "^7.5.20 || ^8.5.21 || ^9.5.10" }, "suggest": { - "ext-filter": "Required to use the boolean validator.", - "ext-pcre": "Required to use most of the library." + "ext-filter": "Required to use the boolean validator." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "5.4-dev" } }, "autoload": { @@ -6345,11 +6763,13 @@ "authors": [ { "name": "Graham Campbell", - "email": "hello@gjcampbell.co.uk" + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" }, { "name": "Vance Lucas", - "email": "vance@vancelucas.com" + "email": "vance@vancelucas.com", + "homepage": "https://github.com/vlucas" } ], "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.", @@ -6360,7 +6780,7 @@ ], "support": { "issues": "https://github.com/vlucas/phpdotenv/issues", - "source": "https://github.com/vlucas/phpdotenv/tree/v2.6.8" + "source": "https://github.com/vlucas/phpdotenv/tree/v5.4.1" }, "funding": [ { @@ -6372,7 +6792,7 @@ "type": "tidelift" } ], - "time": "2021-10-02T19:02:17+00:00" + "time": "2021-12-12T23:22:04+00:00" }, { "name": "webmozart/assert", @@ -6486,7 +6906,9 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "phalcon/zephir": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { From 16c158274d09ab0cff92463dac02fae0cbd98655 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Mon, 20 Dec 2021 00:17:57 +0000 Subject: [PATCH 10/91] #15598 - Add `mixed` type instead of `var` --- phalcon/Annotations/Collection.zep | 2 +- phalcon/Assets/Collection.zep | 2 +- phalcon/Di/Di.zep | 8 ++++---- phalcon/Forms/Form.zep | 2 +- phalcon/Messages/Messages.zep | 8 ++++---- phalcon/Mvc/Model/Resultset.zep | 8 ++++---- phalcon/Session/Adapter/AbstractAdapter.zep | 2 +- phalcon/Session/Adapter/Noop.zep | 2 +- phalcon/Session/Adapter/Stream.zep | 2 +- phalcon/Support/Collection.zep | 8 ++++---- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/phalcon/Annotations/Collection.zep b/phalcon/Annotations/Collection.zep index a9a871d35a2..818bff99d8f 100644 --- a/phalcon/Annotations/Collection.zep +++ b/phalcon/Annotations/Collection.zep @@ -69,7 +69,7 @@ class Collection implements Iterator, Countable /** * Returns the current annotation in the iterator */ - public function current() -> | bool + public function current() -> mixed { var annotation; diff --git a/phalcon/Assets/Collection.zep b/phalcon/Assets/Collection.zep index ab8a650790b..a45691c1f5a 100644 --- a/phalcon/Assets/Collection.zep +++ b/phalcon/Assets/Collection.zep @@ -241,7 +241,7 @@ class Collection implements Countable, IteratorAggregate * * @link https://php.net/manual/en/iteratoraggregate.getiterator.php */ - public function getIterator() + public function getIterator() -> <\Traversable> { return new ArrayIterator(this->assets); } diff --git a/phalcon/Di/Di.zep b/phalcon/Di/Di.zep index e97afc454ef..f059d548426 100644 --- a/phalcon/Di/Di.zep +++ b/phalcon/Di/Di.zep @@ -453,7 +453,7 @@ class Di implements DiInterface * var_dump($di["request"]); *``` */ - public function offsetGet(var name) -> var + public function offsetGet(mixed name) -> var { return this->getShared(name); } @@ -461,7 +461,7 @@ class Di implements DiInterface /** * Check if a service is registered using the array syntax */ - public function offsetExists(var name) -> bool + public function offsetExists(mixed name) -> bool { return this->has(name); } @@ -473,7 +473,7 @@ class Di implements DiInterface * $di["request"] = new \Phalcon\Http\Request(); *``` */ - public function offsetSet(var name, var definition) -> void + public function offsetSet(mixed name, mixed definition) -> void { this->setShared(name, definition); } @@ -481,7 +481,7 @@ class Di implements DiInterface /** * Removes a service from the services container using the array syntax */ - public function offsetUnset(var name) -> void + public function offsetUnset(mixed name) -> void { this->remove(name); } diff --git a/phalcon/Forms/Form.zep b/phalcon/Forms/Form.zep index 51bb34d0f57..a45d531b913 100644 --- a/phalcon/Forms/Form.zep +++ b/phalcon/Forms/Form.zep @@ -319,7 +319,7 @@ class Form extends Injectable implements Countable, Iterator, AttributesInterfac /** * Returns the current element in the iterator */ - public function current() -> | bool + public function current() -> mixed { var element; diff --git a/phalcon/Messages/Messages.zep b/phalcon/Messages/Messages.zep index bfb27a03d5d..bb8e2ee3cac 100644 --- a/phalcon/Messages/Messages.zep +++ b/phalcon/Messages/Messages.zep @@ -201,7 +201,7 @@ class Messages implements ArrayAccess, Countable, Iterator, JsonSerializable * * @param int index */ - public function offsetExists(var index) -> boolean + public function offsetExists(mixed index) -> bool { return isset this->messages[index]; } @@ -215,7 +215,7 @@ class Messages implements ArrayAccess, Countable, Iterator, JsonSerializable * ); *``` */ - public function offsetGet(var index) -> var + public function offsetGet(mixed index) -> mixed { var message, returnValue = null; @@ -235,7 +235,7 @@ class Messages implements ArrayAccess, Countable, Iterator, JsonSerializable * * @param \Phalcon\Messages\Message message */ - public function offsetSet(var index, var message) -> void + public function offsetSet(mixed index, mixed message) -> void { if typeof message != "object" { throw new Exception("The message must be an object"); @@ -251,7 +251,7 @@ class Messages implements ArrayAccess, Countable, Iterator, JsonSerializable * unset($message["database"]); *``` */ - public function offsetUnset(var index) -> void + public function offsetUnset(mixed index) -> void { if isset this->messages[index] { array_splice(this->messages, index, 1); diff --git a/phalcon/Mvc/Model/Resultset.zep b/phalcon/Mvc/Model/Resultset.zep index ae846638a4d..b8b2c7eb8a0 100644 --- a/phalcon/Mvc/Model/Resultset.zep +++ b/phalcon/Mvc/Model/Resultset.zep @@ -481,7 +481,7 @@ abstract class Resultset /** * Gets row in a specific position of the resultset */ - public function offsetGet(var index) -> | bool + public function offsetGet(mixed index) -> mixed { if unlikely index >= this->count { throw new Exception("The index does not exist in the cursor"); @@ -498,7 +498,7 @@ abstract class Resultset /** * Checks whether offset exists in the resultset */ - public function offsetExists(var index) -> bool + public function offsetExists(mixed index) -> bool { return index < this->count; } @@ -509,7 +509,7 @@ abstract class Resultset * @param int index * @param \Phalcon\Mvc\ModelInterface value */ - public function offsetSet(var index, var value) -> void + public function offsetSet(mixed index, mixed value) -> void { throw new Exception("Cursor is an immutable ArrayAccess object"); } @@ -517,7 +517,7 @@ abstract class Resultset /** * Resultsets cannot be changed. It has only been implemented to meet the definition of the ArrayAccess interface */ - public function offsetUnset(var offset) -> void + public function offsetUnset(mixed offset) -> void { throw new Exception("Cursor is an immutable ArrayAccess object"); } diff --git a/phalcon/Session/Adapter/AbstractAdapter.zep b/phalcon/Session/Adapter/AbstractAdapter.zep index 9404c462abf..c01a8015c36 100644 --- a/phalcon/Session/Adapter/AbstractAdapter.zep +++ b/phalcon/Session/Adapter/AbstractAdapter.zep @@ -43,7 +43,7 @@ abstract class AbstractAdapter implements SessionHandlerInterface /** * Garbage Collector */ - public function gc(var maxlifetime) + public function gc(int maxlifetime) -> int|bool { return true; } diff --git a/phalcon/Session/Adapter/Noop.zep b/phalcon/Session/Adapter/Noop.zep index 2403d124a99..3c117e154fd 100644 --- a/phalcon/Session/Adapter/Noop.zep +++ b/phalcon/Session/Adapter/Noop.zep @@ -96,7 +96,7 @@ class Noop implements SessionHandlerInterface /** * Garbage Collector */ - public function gc(var maxlifetime) + public function gc(int maxlifetime) -> int|bool { return true; } diff --git a/phalcon/Session/Adapter/Stream.zep b/phalcon/Session/Adapter/Stream.zep index 768d2f0792a..39ab2e2d331 100644 --- a/phalcon/Session/Adapter/Stream.zep +++ b/phalcon/Session/Adapter/Stream.zep @@ -86,7 +86,7 @@ class Stream extends Noop /** * Garbage Collector */ - public function gc(var maxlifetime) + public function gc(int maxlifetime) -> int|bool { var file, pattern, time; diff --git a/phalcon/Support/Collection.zep b/phalcon/Support/Collection.zep index 77355e8ae72..cea62e46a06 100644 --- a/phalcon/Support/Collection.zep +++ b/phalcon/Support/Collection.zep @@ -227,7 +227,7 @@ class Collection implements * Whether a offset exists * See [offsetExists](https://php.net/manual/en/arrayaccess.offsetexists.php) */ - public function offsetExists(var element) -> bool + public function offsetExists(mixed element) -> bool { let element = (string) element; @@ -238,7 +238,7 @@ class Collection implements * Offset to retrieve * See [offsetGet](https://php.net/manual/en/arrayaccess.offsetget.php) */ - public function offsetGet(var element) + public function offsetGet(mixed element) { let element = (string) element; @@ -249,7 +249,7 @@ class Collection implements * Offset to set * See [offsetSet](https://php.net/manual/en/arrayaccess.offsetset.php) */ - public function offsetSet(var element, var value) -> void + public function offsetSet(mixed element, mixed value) -> void { let element = (string) element; @@ -260,7 +260,7 @@ class Collection implements * Offset to unset * See [offsetUnset](https://php.net/manual/en/arrayaccess.offsetunset.php) */ - public function offsetUnset(var element) -> void + public function offsetUnset(mixed element) -> void { let element = (string) element; From 7282c0ddbbf89ba14faff245c11a746c96836276 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Mon, 3 Jan 2022 21:59:42 +0000 Subject: [PATCH 11/91] #15598 - Add test aliases --- docker/7.4/.bashrc | 9 +++++++++ docker/8.0/.bashrc | 10 ++++++++++ docker/8.1/.bashrc | 10 ++++++++++ 3 files changed, 29 insertions(+) diff --git a/docker/7.4/.bashrc b/docker/7.4/.bashrc index 345094d1019..a4915d97793 100644 --- a/docker/7.4/.bashrc +++ b/docker/7.4/.bashrc @@ -89,3 +89,12 @@ alias phpcs='php -d extension=ext/modules/phalcon.so ./vendor/bin/phpcs ' alias phpcbf='php -d extension=ext/modules/phalcon.so ./vendor/bin/phpcbf ' alias psalm='php ./vendor/bin/psalm ' +alias test-unit='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter unit' +alias test-cli='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter cli' +alias test-integration='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter integration' +alias test-db-common='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database -g common' +alias test-db-mysql='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database --env mysql -g mysql' +alias test-db-pgsql='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database --env pgsql -g pgsql' +alias test-db-sqlite='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database --env sqlite -g sqlite' +alias test-db='test-db-common && test-db-mysql && test-db-pgsql && test-db-sqlite' +alias test-all='test-unit && test-cli && test-integration && test-db' diff --git a/docker/8.0/.bashrc b/docker/8.0/.bashrc index a8c943aeccb..a4915d97793 100644 --- a/docker/8.0/.bashrc +++ b/docker/8.0/.bashrc @@ -88,3 +88,13 @@ alias codecept='php -d extension=ext/modules/phalcon.so ./vendor/bin/codecept ' alias phpcs='php -d extension=ext/modules/phalcon.so ./vendor/bin/phpcs ' alias phpcbf='php -d extension=ext/modules/phalcon.so ./vendor/bin/phpcbf ' alias psalm='php ./vendor/bin/psalm ' + +alias test-unit='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter unit' +alias test-cli='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter cli' +alias test-integration='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter integration' +alias test-db-common='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database -g common' +alias test-db-mysql='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database --env mysql -g mysql' +alias test-db-pgsql='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database --env pgsql -g pgsql' +alias test-db-sqlite='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database --env sqlite -g sqlite' +alias test-db='test-db-common && test-db-mysql && test-db-pgsql && test-db-sqlite' +alias test-all='test-unit && test-cli && test-integration && test-db' diff --git a/docker/8.1/.bashrc b/docker/8.1/.bashrc index a8c943aeccb..a4915d97793 100644 --- a/docker/8.1/.bashrc +++ b/docker/8.1/.bashrc @@ -88,3 +88,13 @@ alias codecept='php -d extension=ext/modules/phalcon.so ./vendor/bin/codecept ' alias phpcs='php -d extension=ext/modules/phalcon.so ./vendor/bin/phpcs ' alias phpcbf='php -d extension=ext/modules/phalcon.so ./vendor/bin/phpcbf ' alias psalm='php ./vendor/bin/psalm ' + +alias test-unit='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter unit' +alias test-cli='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter cli' +alias test-integration='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter integration' +alias test-db-common='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database -g common' +alias test-db-mysql='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database --env mysql -g mysql' +alias test-db-pgsql='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database --env pgsql -g pgsql' +alias test-db-sqlite='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database --env sqlite -g sqlite' +alias test-db='test-db-common && test-db-mysql && test-db-pgsql && test-db-sqlite' +alias test-all='test-unit && test-cli && test-integration && test-db' From fd2707c008de810d7cd626f42252208523ef3e6b Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 9 Jan 2022 20:55:48 +0000 Subject: [PATCH 12/91] #15598 - Change from `var` to `mixed` --- phalcon/Assets/Manager.zep | 3 +-- phalcon/Di/Di.zep | 2 +- phalcon/Support/Collection.zep | 2 +- phalcon/Support/Registry.zep | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/phalcon/Assets/Manager.zep b/phalcon/Assets/Manager.zep index 599b38012c4..d5e13cf3d85 100644 --- a/phalcon/Assets/Manager.zep +++ b/phalcon/Assets/Manager.zep @@ -654,8 +654,7 @@ class Manager extends AbstractInjectionAware } } - if (true !== empty(filters) && join) - { + if (true !== empty(filters) && join) { /** * Write the file using file_put_contents. This respects the * openbase-dir also writes to streams diff --git a/phalcon/Di/Di.zep b/phalcon/Di/Di.zep index f059d548426..4b68bd1bca6 100644 --- a/phalcon/Di/Di.zep +++ b/phalcon/Di/Di.zep @@ -453,7 +453,7 @@ class Di implements DiInterface * var_dump($di["request"]); *``` */ - public function offsetGet(mixed name) -> var + public function offsetGet(mixed name) -> mixed { return this->getShared(name); } diff --git a/phalcon/Support/Collection.zep b/phalcon/Support/Collection.zep index cea62e46a06..74122cedb53 100644 --- a/phalcon/Support/Collection.zep +++ b/phalcon/Support/Collection.zep @@ -238,7 +238,7 @@ class Collection implements * Offset to retrieve * See [offsetGet](https://php.net/manual/en/arrayaccess.offsetget.php) */ - public function offsetGet(mixed element) + public function offsetGet(mixed element) -> mixed { let element = (string) element; diff --git a/phalcon/Support/Registry.zep b/phalcon/Support/Registry.zep index d7797c215b5..34f2771cbc0 100644 --- a/phalcon/Support/Registry.zep +++ b/phalcon/Support/Registry.zep @@ -183,7 +183,7 @@ final class Registry extends Collection * * @link https://php.net/manual/en/arrayaccess.offsetget.php */ - final public function offsetGet(var element) -> var + final public function offsetGet(mixed element) -> mixed { return parent::get(element); } From fdeb56feea2dff6a076fe206a237d4dfc65ca862 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 15 Jan 2022 11:01:47 +0000 Subject: [PATCH 13/91] #15598 - Add PHP 8.1 to the matrix --- .github/workflows/build-docker.yml | 2 +- .github/workflows/main.yml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 7123b1263d2..76a3bb82a50 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: [ '7.4', '8.0' ] + php-versions: [ '7.4', '8.0', '8.1' ] name: Build Dockerfile PHP ${{ matrix.php-versions }} steps: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 28d450cc51e..e8e106fc9c7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -81,7 +81,7 @@ jobs: strategy: fail-fast: false matrix: - php: [ '7.4', '8.0' ] + php: [ '7.4', '8.0', '8.1' ] ts: [ 'nts', 'ts' ] arch: [ 'x64' ] @@ -120,6 +120,9 @@ jobs: - name: windows2016-vc15 php: '8.0' + - name: windows2016-vc15 + php: '8.1' + steps: - uses: actions/checkout@v2 From 8d6c4bcddba60dced138c0d9d6980985479cae45 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 15 Jan 2022 11:02:49 +0000 Subject: [PATCH 14/91] #15598 - Remove nullable from `AbstractValidator:prepareCode()` method --- phalcon/Filter/Validation/AbstractValidator.zep | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phalcon/Filter/Validation/AbstractValidator.zep b/phalcon/Filter/Validation/AbstractValidator.zep index 03e9f34fdd6..83990007af6 100644 --- a/phalcon/Filter/Validation/AbstractValidator.zep +++ b/phalcon/Filter/Validation/AbstractValidator.zep @@ -178,13 +178,13 @@ abstract class AbstractValidator implements ValidatorInterface /** * Prepares a validation code. */ - protected function prepareCode(string! field) -> int | null + protected function prepareCode(string! field) -> int { var code; - let code = this->getOption("code"); + let code = this->getOption("code", 0); - if typeof code == "array" { + if typeof code === "array" { let code = code[field]; } From 8c7b73b31aa324b28ec8c4a433443a6c74d29564 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 15 Jan 2022 11:07:54 +0000 Subject: [PATCH 15/91] #15598 - Add `Phalcon\Db\Enum::FETCH_DEFAULT` constant --- CHANGELOG-5.0.md | 3 +++ phalcon/Db/Enum.zep | 1 + 2 files changed, 4 insertions(+) diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md index 461dcbef7d0..fee8d517fe8 100644 --- a/CHANGELOG-5.0.md +++ b/CHANGELOG-5.0.md @@ -3,6 +3,9 @@ ## Fixed - Fixed `Phalcon\Logger\AbstractAdapter::getFormattedItem()` to not add `PHP_EOL` at the end of the message and added it to the `Phalcon\Logger\Adapter\Stream` [#14547](https://github.com/phalcon/cphalcon/issues/14547) +## Added +- Added missing PDO constant `Phalcon\Db\Enum::FETCH_DEFAULT` (`\Pdo::FETCH_DEFAULT`) + # [5.0.0beta2](https://github.com/phalcon/cphalcon/releases/tag/v5.0.0beta2) (2022-01-06) diff --git a/phalcon/Db/Enum.zep b/phalcon/Db/Enum.zep index 836bcf9fb57..8c89fa99164 100644 --- a/phalcon/Db/Enum.zep +++ b/phalcon/Db/Enum.zep @@ -32,4 +32,5 @@ class Enum const FETCH_PROPS_LATE = \Pdo::FETCH_PROPS_LATE; const FETCH_SERIALIZE = \Pdo::FETCH_SERIALIZE; const FETCH_UNIQUE = \Pdo::FETCH_UNIQUE; + const FETCH_DEFAULT = \Pdo::FETCH_DEFAULT; } From 8f149bd3806d4e86f4477cbaf8a000652058cbd3 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 15 Jan 2022 11:15:46 +0000 Subject: [PATCH 16/91] #15598 - Replicate `Phalcon\Filter\Sanitize\StringVal` to custom code --- CHANGELOG-5.0.md | 5 ++++- phalcon/Filter/Sanitize/StringVal.zep | 20 ++++++++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md index fee8d517fe8..ef7d5493712 100644 --- a/CHANGELOG-5.0.md +++ b/CHANGELOG-5.0.md @@ -4,7 +4,10 @@ - Fixed `Phalcon\Logger\AbstractAdapter::getFormattedItem()` to not add `PHP_EOL` at the end of the message and added it to the `Phalcon\Logger\Adapter\Stream` [#14547](https://github.com/phalcon/cphalcon/issues/14547) ## Added -- Added missing PDO constant `Phalcon\Db\Enum::FETCH_DEFAULT` (`\Pdo::FETCH_DEFAULT`) +- Added missing PDO constant `Phalcon\Db\Enum::FETCH_DEFAULT` (`\Pdo::FETCH_DEFAULT`) [#15598](https://github.com/phalcon/cphalcon/issues/15598) + +## Changed +- Replicated `filter_var(input, FILTER_SANITIZE_STRING)` in `Phalcon\Filter\Sanitize\StringVal` to custom solution, due PHP8.1 deprecation [#15598](https://github.com/phalcon/cphalcon/issues/15598) # [5.0.0beta2](https://github.com/phalcon/cphalcon/releases/tag/v5.0.0beta2) (2022-01-06) diff --git a/phalcon/Filter/Sanitize/StringVal.zep b/phalcon/Filter/Sanitize/StringVal.zep index 5e2fae5c68b..65cd68b759e 100644 --- a/phalcon/Filter/Sanitize/StringVal.zep +++ b/phalcon/Filter/Sanitize/StringVal.zep @@ -11,8 +11,6 @@ namespace Phalcon\Filter\Sanitize; /** - * Phalcon\Filter\Sanitize\String - * * Sanitizes a value to string */ class StringVal @@ -20,10 +18,24 @@ class StringVal /** * @param mixed $input The text to sanitize * - * @return string + * @return string|false */ public function __invoke(var input) { - return filter_var(input, FILTER_UNSAFE_RAW); + /** + * Since PHP8.1, filter `FILTER_SANITIZE_STRING` is deprecated. + * + * Code below is identical replication of `filter_var(input, FILTER_SANITIZE_STRING)` + * for backward compatibility. + */ + + if typeof input === "array" { + return false; + } + + let input = str_replace(chr(0), "", (string)input); + let input = preg_replace("/<[^>]*>?/", "", input); + + return str_replace(["'", "\""], ["'", """], input); } } From 88cf733e8048e832a36bcae2e822c2c7dcf67216 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 15 Jan 2022 11:16:48 +0000 Subject: [PATCH 17/91] #15598 - Mass change from `getenv()` to `$_ENV` --- tests/_config/functions.php | 2 +- tests/_data/fixtures/models/InvoicesSchema.php | 6 +----- tests/_support/Helper/Database.php | 1 - 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/tests/_config/functions.php b/tests/_config/functions.php index 84fe6fc0c9b..6a67554d9d6 100644 --- a/tests/_config/functions.php +++ b/tests/_config/functions.php @@ -207,7 +207,7 @@ function env(string $key, $default = null) return constant($key); } - return getenv($key) ?: $default; + return $_ENV[$key] ?? $default; } } diff --git a/tests/_data/fixtures/models/InvoicesSchema.php b/tests/_data/fixtures/models/InvoicesSchema.php index fee19208c76..17b0d383885 100644 --- a/tests/_data/fixtures/models/InvoicesSchema.php +++ b/tests/_data/fixtures/models/InvoicesSchema.php @@ -15,8 +15,6 @@ use Phalcon\Mvc\Model; -use function getenv; - class InvoicesSchema extends Model { public $inv_id; @@ -29,8 +27,6 @@ class InvoicesSchema extends Model public function initialize() { $this->setSource('co_invoices'); - $this->setSchema( - getenv('DATA_MYSQL_NAME') - ); + $this->setSchema($_ENV['DATA_MYSQL_NAME']); } } diff --git a/tests/_support/Helper/Database.php b/tests/_support/Helper/Database.php index 5413e81f4e4..c6d60eca60f 100644 --- a/tests/_support/Helper/Database.php +++ b/tests/_support/Helper/Database.php @@ -12,7 +12,6 @@ use function date; use function env; -use function getenv; use function getOptionsMysql; use function getOptionsPostgresql; use function getOptionsSqlite; From 508deda1b61631d0f5b70493557bb63f1ad807d1 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 15 Jan 2022 11:21:42 +0000 Subject: [PATCH 18/91] #15598 - Fix PHP8.1 compatibility in `Phalcon\Http\Request\File:getRealType()` method --- CHANGELOG-5.0.md | 1 + phalcon/Http/Request/File.zep | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md index ef7d5493712..a86090cf908 100644 --- a/CHANGELOG-5.0.md +++ b/CHANGELOG-5.0.md @@ -2,6 +2,7 @@ ## Fixed - Fixed `Phalcon\Logger\AbstractAdapter::getFormattedItem()` to not add `PHP_EOL` at the end of the message and added it to the `Phalcon\Logger\Adapter\Stream` [#14547](https://github.com/phalcon/cphalcon/issues/14547) +- Fixed PHP8.1 compatibility in `Phalcon\Http\Request\File:getRealType()` method [#15598](https://github.com/phalcon/cphalcon/issues/15598) ## Added - Added missing PDO constant `Phalcon\Db\Enum::FETCH_DEFAULT` (`\Pdo::FETCH_DEFAULT`) [#15598](https://github.com/phalcon/cphalcon/issues/15598) diff --git a/phalcon/Http/Request/File.zep b/phalcon/Http/Request/File.zep index 3c33f150a9c..8ae53db2c9e 100644 --- a/phalcon/Http/Request/File.zep +++ b/phalcon/Http/Request/File.zep @@ -117,7 +117,7 @@ class File implements FileInterface let finfo = finfo_open(FILEINFO_MIME_TYPE); - if typeof finfo != "resource" { + if finfo === false { return ""; } From d2318918d6a8ffa192fab502531f746c967f5685 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 15 Jan 2022 14:37:20 +0000 Subject: [PATCH 19/91] #15598 - Standardize property types on `fetch()` and `fetchAll()` methods --- CHANGELOG-5.0.md | 1 + phalcon/Db/Result/Pdo.zep | 40 ++++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md index a86090cf908..b216c79aed1 100644 --- a/CHANGELOG-5.0.md +++ b/CHANGELOG-5.0.md @@ -9,6 +9,7 @@ ## Changed - Replicated `filter_var(input, FILTER_SANITIZE_STRING)` in `Phalcon\Filter\Sanitize\StringVal` to custom solution, due PHP8.1 deprecation [#15598](https://github.com/phalcon/cphalcon/issues/15598) +- Changed property types, as in original, in `Phalcon\Db\Result\Pdo:fetch()` and `Phalcon\Db\Result\Pdo:fetchAll()` methods [#15598](https://github.com/phalcon/cphalcon/issues/15598) # [5.0.0beta2](https://github.com/phalcon/cphalcon/releases/tag/v5.0.0beta2) (2022-01-06) diff --git a/phalcon/Db/Result/Pdo.zep b/phalcon/Db/Result/Pdo.zep index c3ac7670175..7da2fb34c6a 100644 --- a/phalcon/Db/Result/Pdo.zep +++ b/phalcon/Db/Result/Pdo.zep @@ -10,6 +10,7 @@ namespace Phalcon\Db\Result; +use Pdo; use Phalcon\Db\Enum; use Phalcon\Db\ResultInterface; use Phalcon\Db\Adapter\AdapterInterface; @@ -55,7 +56,7 @@ class Pdo implements ResultInterface * * @var int */ - protected fetchMode = Enum::FETCH_OBJ; + protected fetchMode = Enum::FETCH_DEFAULT; /** * Internal resultset @@ -83,9 +84,13 @@ class Pdo implements ResultInterface /** * Phalcon\Db\Result\Pdo constructor */ - public function __construct( connection, <\PDOStatement> result, - sqlStatement = null, bindParams = null, bindTypes = null) - { + public function __construct( + connection, + <\PDOStatement> result, + sqlStatement = null, + bindParams = null, + bindTypes = null + ) { let this->connection = connection, this->pdoStatement = result, this->sqlStatement = sqlStatement, @@ -147,7 +152,7 @@ class Pdo implements ResultInterface number--; while n != number { - statement->$fetch(); + statement->$fetch(this->fetchMode); let n++; } @@ -180,10 +185,14 @@ class Pdo implements ResultInterface * } *``` */ - public function $fetch(var fetchStyle = null, var cursorOrientation = null, var cursorOffset = null) + public function $fetch(int fetchStyle = null, int cursorOrientation = Pdo::FETCH_ORI_NEXT, int cursorOffset = 0) { + var mode; + + let mode = typeof fetchStyle === "int" ? fetchStyle : this->fetchMode; + return this->pdoStatement->$fetch( - fetchStyle, + mode, cursorOrientation, cursorOffset ); @@ -202,22 +211,15 @@ class Pdo implements ResultInterface * $robots = $result->fetchAll(); *``` */ - public function fetchAll(var fetchStyle = null, var fetchArgument = null, var ctorArgs = null) -> array + public function fetchAll(int fetchStyle = null, int fetchArgument = Pdo::FETCH_ORI_NEXT, int ctorArgs = 0) -> array { - var pdoStatement; + var pdoStatement, mode; let pdoStatement = this->pdoStatement; - - if typeof fetchStyle != "integer" { - return pdoStatement->fetchAll(); - } + let mode = typeof fetchStyle === "int" ? fetchStyle : this->fetchMode; if fetchStyle == Enum::FETCH_CLASS { - return pdoStatement->fetchAll( - fetchStyle, - fetchArgument, - ctorArgs - ); + return pdoStatement->fetchAll(mode, fetchArgument, ctorArgs); } if fetchStyle == Enum::FETCH_COLUMN || fetchStyle == Enum::FETCH_FUNC { @@ -246,7 +248,7 @@ class Pdo implements ResultInterface */ public function fetchArray() { - return this->pdoStatement->$fetch(); + return this->pdoStatement->$fetch(this->fetchMode); } /** From 56cb416b951ffd271eb1f0a60d5e4b92067db668 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 15 Jan 2022 14:58:09 +0000 Subject: [PATCH 20/91] #15598 - Change workflow template for PECL generation --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index acd6fd63e28..612d38f7723 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -66,9 +66,10 @@ jobs: generate: needs: setup_workflow - uses: zephir-lang/templates/.github/workflows/phalcon-pecl.yml@main + uses: zephir-lang/templates/.github/workflows/phalcon-pecl-zephir-composer.yml@main with: extensions: ${{ needs.setup_workflow.outputs.zephir_extensions }} + php-version: '8.1' secrets: composer-token: ${{ secrets.GITHUB_TOKEN }} From 1473de4e7b5e9da4702dd0cb07523ada5a92ce7b Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 15 Jan 2022 14:59:06 +0000 Subject: [PATCH 21/91] #15598 - Add `__serialize()` and `__unserialize()` methods in `Model` class --- phalcon/Mvc/Model.zep | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/phalcon/Mvc/Model.zep b/phalcon/Mvc/Model.zep index fd731c4dfce..c0688f7d4eb 100644 --- a/phalcon/Mvc/Model.zep +++ b/phalcon/Mvc/Model.zep @@ -5812,4 +5812,15 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface, return key; } + + public function __serialize() -> array + { + // Nothing here + return []; + } + + public function __unserialize(array data) -> void + { + // Nothing here + } } From be7b05a8387b32f9e9a537c62b202f274759161c Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 15 Jan 2022 15:00:12 +0000 Subject: [PATCH 22/91] #15598 - Update composer dependencies --- composer.json | 5 +- composer.lock | 6489 ++++++++++++++++++++++++++----------------------- 2 files changed, 3412 insertions(+), 3082 deletions(-) diff --git a/composer.json b/composer.json index 5b6ffc84f3c..42b4ea04fd2 100644 --- a/composer.json +++ b/composer.json @@ -72,7 +72,10 @@ "config": { "optimize-autoloader": true, "preferred-install": "dist", - "sort-packages": true + "sort-packages": true, + "allow-plugins": { + "composer/package-versions-deprecated": true + } }, "autoload-dev": { "psr-4": { diff --git a/composer.lock b/composer.lock index 61f793e12e6..15a87551ca0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,49 +4,72 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7ca430ec5b6c9c0043cf56f68ec1872e", - "packages": [], - "packages-dev": [ + "content-hash": "0c5d52f42387cd2305e3e92a31ca0ced", + "packages": [ { - "name": "amphp/amp", - "version": "v2.6.1", + "name": "monolog/monolog", + "version": "2.3.5", "source": { "type": "git", - "url": "https://github.com/amphp/amp.git", - "reference": "c5fc66a78ee38d7ac9195a37bacaf940eb3f65ae" + "url": "https://github.com/Seldaek/monolog.git", + "reference": "fd4380d6fc37626e2f799f29d91195040137eba9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/amp/zipball/c5fc66a78ee38d7ac9195a37bacaf940eb3f65ae", - "reference": "c5fc66a78ee38d7ac9195a37bacaf940eb3f65ae", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd4380d6fc37626e2f799f29d91195040137eba9", + "reference": "fd4380d6fc37626e2f799f29d91195040137eba9", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2", + "psr/log": "^1.0.1 || ^2.0 || ^3.0" + }, + "provide": { + "psr/log-implementation": "1.0.0 || 2.0.0 || 3.0.0" }, "require-dev": { - "amphp/php-cs-fixer-config": "dev-master", - "amphp/phpunit-util": "^1", - "ext-json": "*", - "jetbrains/phpstorm-stubs": "^2019.3", - "phpunit/phpunit": "^7 | ^8 | ^9", - "psalm/phar": "^3.11@dev", - "react/promise": "^2" + "aws/aws-sdk-php": "^2.4.9 || ^3.0", + "doctrine/couchdb": "~1.0@dev", + "elasticsearch/elasticsearch": "^7", + "graylog2/gelf-php": "^1.4.2", + "mongodb/mongodb": "^1.8", + "php-amqplib/php-amqplib": "~2.4 || ^3", + "php-console/php-console": "^3.1.3", + "phpspec/prophecy": "^1.6.1", + "phpstan/phpstan": "^0.12.91", + "phpunit/phpunit": "^8.5", + "predis/predis": "^1.1", + "rollbar/rollbar": "^1.3", + "ruflin/elastica": ">=0.90@dev", + "swiftmailer/swiftmailer": "^5.3|^6.0" + }, + "suggest": { + "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", + "doctrine/couchdb": "Allow sending log messages to a CouchDB server", + "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client", + "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", + "ext-curl": "Required to send log messages using the IFTTTHandler, the LogglyHandler, the SendGridHandler, the SlackWebhookHandler or the TelegramBotHandler", + "ext-mbstring": "Allow to work properly with unicode symbols", + "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)", + "ext-openssl": "Required to send log messages using SSL", + "ext-sockets": "Allow sending log messages to a Syslog server (via UDP driver)", + "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", + "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)", + "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", + "php-console/php-console": "Allow sending log messages to Google Chrome", + "rollbar/rollbar": "Allow sending log messages to Rollbar", + "ruflin/elastica": "Allow sending log messages to an Elastic Search server" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-main": "2.x-dev" } }, "autoload": { "psr-4": { - "Amp\\": "lib" - }, - "files": [ - "lib/functions.php", - "lib/Internal/functions.php" - ] + "Monolog\\": "src/Monolog" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -54,86 +77,80 @@ ], "authors": [ { - "name": "Daniel Lowrey", - "email": "rdlowrey@php.net" - }, - { - "name": "Aaron Piotrowski", - "email": "aaron@trowski.com" - }, - { - "name": "Bob Weinand", - "email": "bobwei9@hotmail.com" - }, - { - "name": "Niklas Keller", - "email": "me@kelunik.com" + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "https://seld.be" } ], - "description": "A non-blocking concurrency framework for PHP applications.", - "homepage": "http://amphp.org/amp", + "description": "Sends your logs to files, sockets, inboxes, databases and various web services", + "homepage": "https://github.com/Seldaek/monolog", "keywords": [ - "async", - "asynchronous", - "awaitable", - "concurrency", - "event", - "event-loop", - "future", - "non-blocking", - "promise" + "log", + "logging", + "psr-3" ], "support": { - "irc": "irc://irc.freenode.org/amphp", - "issues": "https://github.com/amphp/amp/issues", - "source": "https://github.com/amphp/amp/tree/v2.6.1" + "issues": "https://github.com/Seldaek/monolog/issues", + "source": "https://github.com/Seldaek/monolog/tree/2.3.5" }, "funding": [ { - "url": "https://github.com/amphp", + "url": "https://github.com/Seldaek", "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/monolog/monolog", + "type": "tidelift" } ], - "time": "2021-09-23T18:43:08+00:00" + "time": "2021-10-01T21:08:31+00:00" }, { - "name": "amphp/byte-stream", - "version": "v1.8.1", + "name": "phalcon/zephir", + "version": "dev-development", "source": { "type": "git", - "url": "https://github.com/amphp/byte-stream.git", - "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd" + "url": "https://github.com/zephir-lang/zephir.git", + "reference": "8472676e012aca7cee076b88bdf8c2334e58f9d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/byte-stream/zipball/acbd8002b3536485c997c4e019206b3f10ca15bd", - "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd", + "url": "https://api.github.com/repos/zephir-lang/zephir/zipball/8472676e012aca7cee076b88bdf8c2334e58f9d6", + "reference": "8472676e012aca7cee076b88bdf8c2334e58f9d6", "shasum": "" }, "require": { - "amphp/amp": "^2", - "php": ">=7.1" + "ext-ctype": "*", + "ext-hash": "*", + "ext-json": "*", + "ext-mbstring": "*", + "ext-pcre": "*", + "ext-xml": "*", + "ext-zlib": "*", + "monolog/monolog": "^2.3", + "php": ">=7.4.1", + "symfony/console": "^5.2", + "symfony/event-dispatcher": "^5.3" }, "require-dev": { - "amphp/php-cs-fixer-config": "dev-master", - "amphp/phpunit-util": "^1.4", - "friendsofphp/php-cs-fixer": "^2.3", - "jetbrains/phpstorm-stubs": "^2019.3", - "phpunit/phpunit": "^6 || ^7 || ^8", - "psalm/phar": "^3.11.4" + "ext-gmp": "*", + "ext-pdo": "*", + "ext-pdo_sqlite": "*", + "ext-zip": "*", + "phpunit/phpunit": "^9.5", + "psr/log": "1.1.*" }, + "default-branch": true, + "bin": [ + "zephir" + ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, "autoload": { "psr-4": { - "Amp\\ByteStream\\": "lib" + "Zephir\\": "Library" }, "files": [ - "lib/functions.php" + "Library/functions.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -142,71 +159,62 @@ ], "authors": [ { - "name": "Aaron Piotrowski", - "email": "aaron@trowski.com" + "name": "Phalcon Team", + "email": "team@zephir-lang.com", + "homepage": "https://zephir-lang.com" }, { - "name": "Niklas Keller", - "email": "me@kelunik.com" + "name": "Contributors", + "homepage": "https://github.com/zephir-lang/zephir/graphs/contributors" } ], - "description": "A stream abstraction to make working with non-blocking I/O simple.", - "homepage": "http://amphp.org/byte-stream", + "description": "Zephir is a compiled high level language aimed to the creation of C-extensions for PHP", + "homepage": "https://zephir-lang.com", "keywords": [ - "amp", - "amphp", - "async", - "io", - "non-blocking", - "stream" + "extension", + "internals", + "phalcon", + "zephir" ], "support": { - "irc": "irc://irc.freenode.org/amphp", - "issues": "https://github.com/amphp/byte-stream/issues", - "source": "https://github.com/amphp/byte-stream/tree/v1.8.1" + "docs": "https://docs.zephir-lang.com", + "irc": "irc://irc.freenode.net/zephir", + "issues": "https://github.com/zephir-lang/zephir/issues?state=open", + "source": "https://github.com/zephir-lang/zephir" }, "funding": [ { - "url": "https://github.com/amphp", + "url": "https://opencollective.com/phalcon", + "type": "custom" + }, + { + "url": "https://github.com/phalcon", "type": "github" } ], - "time": "2021-03-30T17:13:30+00:00" + "time": "2022-01-15T14:42:28+00:00" }, { - "name": "behat/gherkin", - "version": "v4.9.0", + "name": "psr/container", + "version": "1.1.2", "source": { "type": "git", - "url": "https://github.com/Behat/Gherkin.git", - "reference": "0bc8d1e30e96183e4f36db9dc79caead300beff4" + "url": "https://github.com/php-fig/container.git", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/Gherkin/zipball/0bc8d1e30e96183e4f36db9dc79caead300beff4", - "reference": "0bc8d1e30e96183e4f36db9dc79caead300beff4", + "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", "shasum": "" }, "require": { - "php": "~7.2|~8.0" - }, - "require-dev": { - "cucumber/cucumber": "dev-gherkin-22.0.0", - "phpunit/phpunit": "~8|~9", - "symfony/yaml": "~3|~4|~5" - }, - "suggest": { - "symfony/yaml": "If you want to parse features, represented in YAML files" + "php": ">=7.4.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.x-dev" - } - }, "autoload": { - "psr-0": { - "Behat\\Gherkin": "src/" + "psr-4": { + "Psr\\Container\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -215,92 +223,52 @@ ], "authors": [ { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" } ], - "description": "Gherkin DSL parser for PHP", - "homepage": "http://behat.org/", + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", "keywords": [ - "BDD", - "Behat", - "Cucumber", - "DSL", - "gherkin", - "parser" + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" ], "support": { - "issues": "https://github.com/Behat/Gherkin/issues", - "source": "https://github.com/Behat/Gherkin/tree/v4.9.0" + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/1.1.2" }, - "time": "2021-10-12T13:05:09+00:00" + "time": "2021-11-05T16:50:12+00:00" }, { - "name": "codeception/codeception", - "version": "4.1.27", + "name": "psr/event-dispatcher", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/Codeception/Codeception.git", - "reference": "2d9a11e6f487e3bcc17e22b7552fb6a10cec5c7c" + "url": "https://github.com/php-fig/event-dispatcher.git", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/Codeception/zipball/2d9a11e6f487e3bcc17e22b7552fb6a10cec5c7c", - "reference": "2d9a11e6f487e3bcc17e22b7552fb6a10cec5c7c", + "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", "shasum": "" }, "require": { - "behat/gherkin": "^4.4.0", - "codeception/lib-asserts": "^1.0 | 2.0.*@dev", - "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.1.1 | ^9.0", - "codeception/stub": "^2.0 | ^3.0 | ^4.0", - "ext-curl": "*", - "ext-json": "*", - "ext-mbstring": "*", - "guzzlehttp/psr7": "^1.4 | ^2.0", - "php": ">=5.6.0 <9.0", - "symfony/console": ">=2.7 <6.0", - "symfony/css-selector": ">=2.7 <6.0", - "symfony/event-dispatcher": ">=2.7 <6.0", - "symfony/finder": ">=2.7 <6.0", - "symfony/yaml": ">=2.7 <6.0" - }, - "require-dev": { - "codeception/module-asserts": "^1.0 | 2.0.*@dev", - "codeception/module-cli": "^1.0 | 2.0.*@dev", - "codeception/module-db": "^1.0 | 2.0.*@dev", - "codeception/module-filesystem": "^1.0 | 2.0.*@dev", - "codeception/module-phpbrowser": "^1.0 | 2.0.*@dev", - "codeception/specify": "~0.3", - "codeception/util-universalframework": "*@dev", - "monolog/monolog": "~1.8", - "squizlabs/php_codesniffer": "~2.0", - "symfony/process": ">=2.7 <6.0", - "vlucas/phpdotenv": "^2.0 | ^3.0 | ^4.0 | ^5.0" - }, - "suggest": { - "codeception/specify": "BDD-style code blocks", - "codeception/verify": "BDD-style assertions", - "hoa/console": "For interactive console functionality", - "stecman/symfony-console-completion": "For BASH autocompletion", - "symfony/phpunit-bridge": "For phpunit-bridge support" + "php": ">=7.2.0" }, - "bin": [ - "codecept" - ], "type": "library", "extra": { - "branch-alias": [] + "branch-alias": { + "dev-master": "1.0.x-dev" + } }, "autoload": { "psr-4": { - "Codeception\\": "src/Codeception", - "Codeception\\Extension\\": "ext" - }, - "files": [ - "functions.php" - ] + "Psr\\EventDispatcher\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -308,56 +276,49 @@ ], "authors": [ { - "name": "Michael Bodnarchuk", - "email": "davert@mail.ua", - "homepage": "http://codegyre.com" + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" } ], - "description": "BDD-style testing framework", - "homepage": "http://codeception.com/", + "description": "Standard interfaces for event handling.", "keywords": [ - "BDD", - "TDD", - "acceptance testing", - "functional testing", - "unit testing" + "events", + "psr", + "psr-14" ], "support": { - "issues": "https://github.com/Codeception/Codeception/issues", - "source": "https://github.com/Codeception/Codeception/tree/4.1.27" + "issues": "https://github.com/php-fig/event-dispatcher/issues", + "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" }, - "funding": [ - { - "url": "https://opencollective.com/codeception", - "type": "open_collective" - } - ], - "time": "2021-12-22T06:40:46+00:00" + "time": "2019-01-08T18:20:26+00:00" }, { - "name": "codeception/lib-asserts", - "version": "1.13.2", + "name": "psr/log", + "version": "1.1.4", "source": { "type": "git", - "url": "https://github.com/Codeception/lib-asserts.git", - "reference": "184231d5eab66bc69afd6b9429344d80c67a33b6" + "url": "https://github.com/php-fig/log.git", + "reference": "d49695b909c3b7628b6289db5479a1c204601f11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/lib-asserts/zipball/184231d5eab66bc69afd6b9429344d80c67a33b6", - "reference": "184231d5eab66bc69afd6b9429344d80c67a33b6", + "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", + "reference": "d49695b909c3b7628b6289db5479a1c204601f11", "shasum": "" }, "require": { - "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.0.3 | ^9.0", - "ext-dom": "*", - "php": ">=5.6.0 <9.0" + "php": ">=5.3.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "Psr\\Log\\": "Psr/Log/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -365,62 +326,78 @@ ], "authors": [ { - "name": "Michael Bodnarchuk", - "email": "davert@mail.ua", - "homepage": "http://codegyre.com" - }, - { - "name": "Gintautas Miselis" - }, - { - "name": "Gustavo Nieves", - "homepage": "https://medium.com/@ganieves" + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" } ], - "description": "Assertion methods used by Codeception core and Asserts module", - "homepage": "https://codeception.com/", + "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", "keywords": [ - "codeception" + "log", + "psr", + "psr-3" ], "support": { - "issues": "https://github.com/Codeception/lib-asserts/issues", - "source": "https://github.com/Codeception/lib-asserts/tree/1.13.2" + "source": "https://github.com/php-fig/log/tree/1.1.4" }, - "time": "2020-10-21T16:26:20+00:00" + "time": "2021-05-03T11:20:27+00:00" }, { - "name": "codeception/lib-innerbrowser", - "version": "1.5.1", + "name": "symfony/console", + "version": "v5.4.2", "source": { "type": "git", - "url": "https://github.com/Codeception/lib-innerbrowser.git", - "reference": "31b4b56ad53c3464fcb2c0a14d55a51a201bd3c2" + "url": "https://github.com/symfony/console.git", + "reference": "a2c6b7ced2eb7799a35375fb9022519282b5405e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/lib-innerbrowser/zipball/31b4b56ad53c3464fcb2c0a14d55a51a201bd3c2", - "reference": "31b4b56ad53c3464fcb2c0a14d55a51a201bd3c2", + "url": "https://api.github.com/repos/symfony/console/zipball/a2c6b7ced2eb7799a35375fb9022519282b5405e", + "reference": "a2c6b7ced2eb7799a35375fb9022519282b5405e", "shasum": "" }, "require": { - "codeception/codeception": "4.*@dev", - "ext-dom": "*", - "ext-json": "*", - "ext-mbstring": "*", - "php": ">=5.6.0 <9.0", - "symfony/browser-kit": ">=2.7 <6.0", - "symfony/dom-crawler": ">=2.7 <6.0" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php73": "^1.9", + "symfony/polyfill-php80": "^1.16", + "symfony/service-contracts": "^1.1|^2|^3", + "symfony/string": "^5.1|^6.0" }, "conflict": { - "codeception/codeception": "<4.0" + "psr/log": ">=3", + "symfony/dependency-injection": "<4.4", + "symfony/dotenv": "<5.1", + "symfony/event-dispatcher": "<4.4", + "symfony/lock": "<4.4", + "symfony/process": "<4.4" + }, + "provide": { + "psr/log-implementation": "1.0|2.0" }, "require-dev": { - "codeception/util-universalframework": "dev-master" + "psr/log": "^1|^2", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/event-dispatcher": "^4.4|^5.0|^6.0", + "symfony/lock": "^4.4|^5.0|^6.0", + "symfony/process": "^4.4|^5.0|^6.0", + "symfony/var-dumper": "^4.4|^5.0|^6.0" + }, + "suggest": { + "psr/log": "For using the console logger", + "symfony/event-dispatcher": "", + "symfony/lock": "", + "symfony/process": "" }, "type": "library", "autoload": { - "classmap": [ - "src/" + "psr-4": { + "Symfony\\Component\\Console\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -429,47 +406,71 @@ ], "authors": [ { - "name": "Michael Bodnarchuk", - "email": "davert@mail.ua", - "homepage": "http://codegyre.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { - "name": "Gintautas Miselis" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Parent library for all Codeception framework modules and PhpBrowser", - "homepage": "https://codeception.com/", + "description": "Eases the creation of beautiful and testable command line interfaces", + "homepage": "https://symfony.com", "keywords": [ - "codeception" + "cli", + "command line", + "console", + "terminal" ], "support": { - "issues": "https://github.com/Codeception/lib-innerbrowser/issues", - "source": "https://github.com/Codeception/lib-innerbrowser/tree/1.5.1" + "source": "https://github.com/symfony/console/tree/v5.4.2" }, - "time": "2021-08-30T15:21:42+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-12-20T16:11:12+00:00" }, { - "name": "codeception/module-apc", - "version": "1.0.2", + "name": "symfony/deprecation-contracts", + "version": "v2.5.0", "source": { "type": "git", - "url": "https://github.com/Codeception/module-apc.git", - "reference": "07fbd6dd12b9d3f4b738bcac8266eecefb470365" + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/module-apc/zipball/07fbd6dd12b9d3f4b738bcac8266eecefb470365", - "reference": "07fbd6dd12b9d3f4b738bcac8266eecefb470365", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8", + "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8", "shasum": "" }, "require": { - "codeception/codeception": "^4.0", - "php": ">=5.6.0 <9.0" + "php": ">=7.1" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, "autoload": { - "classmap": [ - "src/" + "files": [ + "function.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -478,50 +479,83 @@ ], "authors": [ { - "name": "Serghei Iakovlev" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { - "name": "Gintautas Miselis" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "APC module for Codeception", - "homepage": "http://codeception.com/", - "keywords": [ - "apc", - "codeception" - ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", "support": { - "issues": "https://github.com/Codeception/module-apc/issues", - "source": "https://github.com/Codeception/module-apc/tree/1.0.2" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0" }, - "time": "2020-10-26T06:16:02+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-07-12T14:48:14+00:00" }, { - "name": "codeception/module-asserts", - "version": "1.3.1", + "name": "symfony/event-dispatcher", + "version": "v5.4.0", "source": { "type": "git", - "url": "https://github.com/Codeception/module-asserts.git", - "reference": "59374f2fef0cabb9e8ddb53277e85cdca74328de" + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "27d39ae126352b9fa3be5e196ccf4617897be3eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/module-asserts/zipball/59374f2fef0cabb9e8ddb53277e85cdca74328de", - "reference": "59374f2fef0cabb9e8ddb53277e85cdca74328de", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/27d39ae126352b9fa3be5e196ccf4617897be3eb", + "reference": "27d39ae126352b9fa3be5e196ccf4617897be3eb", "shasum": "" }, "require": { - "codeception/codeception": "*@dev", - "codeception/lib-asserts": "^1.13.1", - "php": ">=5.6.0 <9.0" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/event-dispatcher-contracts": "^2|^3", + "symfony/polyfill-php80": "^1.16" }, "conflict": { - "codeception/codeception": "<4.0" + "symfony/dependency-injection": "<4.4" + }, + "provide": { + "psr/event-dispatcher-implementation": "1.0", + "symfony/event-dispatcher-implementation": "2.0" + }, + "require-dev": { + "psr/log": "^1|^2|^3", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/error-handler": "^4.4|^5.0|^6.0", + "symfony/expression-language": "^4.4|^5.0|^6.0", + "symfony/http-foundation": "^4.4|^5.0|^6.0", + "symfony/service-contracts": "^1.1|^2|^3", + "symfony/stopwatch": "^4.4|^5.0|^6.0" + }, + "suggest": { + "symfony/dependency-injection": "", + "symfony/http-kernel": "" }, "type": "library", "autoload": { - "classmap": [ - "src/" + "psr-4": { + "Symfony\\Component\\EventDispatcher\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -530,55 +564,70 @@ ], "authors": [ { - "name": "Michael Bodnarchuk" - }, - { - "name": "Gintautas Miselis" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { - "name": "Gustavo Nieves", - "homepage": "https://medium.com/@ganieves" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Codeception module containing various assertions", - "homepage": "https://codeception.com/", - "keywords": [ - "assertions", - "asserts", - "codeception" - ], + "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", + "homepage": "https://symfony.com", "support": { - "issues": "https://github.com/Codeception/module-asserts/issues", - "source": "https://github.com/Codeception/module-asserts/tree/1.3.1" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.0" }, - "time": "2020-10-21T16:48:15+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-11-23T10:19:22+00:00" }, { - "name": "codeception/module-cli", - "version": "1.1.1", + "name": "symfony/event-dispatcher-contracts", + "version": "v2.5.0", "source": { "type": "git", - "url": "https://github.com/Codeception/module-cli.git", - "reference": "1f841ad4a1d43e5d9e60a43c4cc9e5af8008024f" + "url": "https://github.com/symfony/event-dispatcher-contracts.git", + "reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/module-cli/zipball/1f841ad4a1d43e5d9e60a43c4cc9e5af8008024f", - "reference": "1f841ad4a1d43e5d9e60a43c4cc9e5af8008024f", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/66bea3b09be61613cd3b4043a65a8ec48cfa6d2a", + "reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a", "shasum": "" }, "require": { - "codeception/codeception": "*@dev", - "php": ">=5.6.0 <9.0" + "php": ">=7.2.5", + "psr/event-dispatcher": "^1" }, - "conflict": { - "codeception/codeception": "<4.0" + "suggest": { + "symfony/event-dispatcher-implementation": "" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "Symfony\\Contracts\\EventDispatcher\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -586,45 +635,82 @@ ], "authors": [ { - "name": "Michael Bodnarchuk" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Codeception module for testing basic shell commands and shell output", - "homepage": "http://codeception.com/", + "description": "Generic abstractions related to dispatching event", + "homepage": "https://symfony.com", "keywords": [ - "codeception" + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" ], "support": { - "issues": "https://github.com/Codeception/module-cli/issues", - "source": "https://github.com/Codeception/module-cli/tree/1.1.1" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.0" }, - "time": "2020-12-26T16:56:19+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-07-12T14:48:14+00:00" }, { - "name": "codeception/module-db", - "version": "1.1.0", + "name": "symfony/polyfill-ctype", + "version": "v1.24.0", "source": { "type": "git", - "url": "https://github.com/Codeception/module-db.git", - "reference": "8c8076cd05d4db95798acd7dba2a56578210982c" + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "30885182c981ab175d4d034db0f6f469898070ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/module-db/zipball/8c8076cd05d4db95798acd7dba2a56578210982c", - "reference": "8c8076cd05d4db95798acd7dba2a56578210982c", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab", + "reference": "30885182c981ab175d4d034db0f6f469898070ab", "shasum": "" }, "require": { - "codeception/codeception": "*@dev", - "php": ">=5.6.0 <9.0" + "php": ">=7.1" }, - "conflict": { - "codeception/codeception": "<4.0" + "provide": { + "ext-ctype": "*" + }, + "suggest": { + "ext-ctype": "For best performance" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.23-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, "autoload": { - "classmap": [ - "src/" + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + }, + "files": [ + "bootstrap.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -633,51 +719,77 @@ ], "authors": [ { - "name": "Michael Bodnarchuk" + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" }, { - "name": "Gintautas Miselis" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "DB module for Codeception", - "homepage": "http://codeception.com/", + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", "keywords": [ - "codeception", - "database-testing", - "db-testing" + "compatibility", + "ctype", + "polyfill", + "portable" ], "support": { - "issues": "https://github.com/Codeception/module-db/issues", - "source": "https://github.com/Codeception/module-db/tree/1.1.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0" }, - "time": "2020-12-20T13:37:07+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-10-20T20:35:02+00:00" }, { - "name": "codeception/module-filesystem", - "version": "1.0.3", + "name": "symfony/polyfill-intl-grapheme", + "version": "v1.24.0", "source": { "type": "git", - "url": "https://github.com/Codeception/module-filesystem.git", - "reference": "781be167fb1557bfc9b61e0a4eac60a32c534ec1" + "url": "https://github.com/symfony/polyfill-intl-grapheme.git", + "reference": "81b86b50cf841a64252b439e738e97f4a34e2783" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/module-filesystem/zipball/781be167fb1557bfc9b61e0a4eac60a32c534ec1", - "reference": "781be167fb1557bfc9b61e0a4eac60a32c534ec1", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783", + "reference": "81b86b50cf841a64252b439e738e97f4a34e2783", "shasum": "" }, "require": { - "codeception/codeception": "^4.0", - "php": ">=5.6.0 <9.0", - "symfony/finder": ">=2.7 <6.0" + "php": ">=7.1" }, - "conflict": { - "codeception/codeception": "<4.0" + "suggest": { + "ext-intl": "For best performance" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.23-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, "autoload": { - "classmap": [ - "src/" + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + }, + "files": [ + "bootstrap.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -686,57 +798,82 @@ ], "authors": [ { - "name": "Michael Bodnarchuk" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { - "name": "Gintautas Miselis" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Codeception module for testing local filesystem", - "homepage": "http://codeception.com/", + "description": "Symfony polyfill for intl's grapheme_* functions", + "homepage": "https://symfony.com", "keywords": [ - "codeception", - "filesystem" + "compatibility", + "grapheme", + "intl", + "polyfill", + "portable", + "shim" ], "support": { - "issues": "https://github.com/Codeception/module-filesystem/issues", - "source": "https://github.com/Codeception/module-filesystem/tree/1.0.3" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.24.0" }, - "time": "2020-10-24T14:46:40+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-11-23T21:10:46+00:00" }, { - "name": "codeception/module-phalcon5", - "version": "v1.0.1", + "name": "symfony/polyfill-intl-normalizer", + "version": "v1.24.0", "source": { "type": "git", - "url": "https://github.com/Codeception/module-phalcon5.git", - "reference": "330564e8a8e5d2b16095bf434028b2b31a477a9a" + "url": "https://github.com/symfony/polyfill-intl-normalizer.git", + "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/module-phalcon5/zipball/330564e8a8e5d2b16095bf434028b2b31a477a9a", - "reference": "330564e8a8e5d2b16095bf434028b2b31a477a9a", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8", + "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8", "shasum": "" }, "require": { - "codeception/codeception": "^4.0", - "codeception/lib-innerbrowser": "^1.0", - "codeception/module-asserts": "^1.0", - "codeception/module-db": "^1.0", - "codeception/module-phpbrowser": "^1.0", - "ext-json": "*", - "php": ">=7.4.0" + "php": ">=7.1" }, - "require-dev": { - "codeception/util-robohelpers": "dev-master", - "squizlabs/php_codesniffer": "^3.4", - "vimeo/psalm": "^3.6", - "vlucas/phpdotenv": "^4.1" + "suggest": { + "ext-intl": "For best performance" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.23-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, + "files": [ + "bootstrap.php" + ], "classmap": [ - "src/" + "Resources/stubs" ] }, "notification-url": "https://packagist.org/downloads/", @@ -745,62 +882,82 @@ ], "authors": [ { - "name": "Phalcon Team", - "email": "team@phalcon.io", - "homepage": "https://phalcon.io/en/team" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { - "name": "Codeception Team", - "email": "team@codeception.com", - "homepage": "https://codeception.com/" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Codeception module for Phalcon 5 framework", - "homepage": "https://codeception.com/", + "description": "Symfony polyfill for intl's Normalizer class and related functions", + "homepage": "https://symfony.com", "keywords": [ - "codeception", - "phalcon", - "phalcon5" + "compatibility", + "intl", + "normalizer", + "polyfill", + "portable", + "shim" ], "support": { - "issues": "https://github.com/Codeception/module-phalcon5/issues", - "source": "https://github.com/Codeception/module-phalcon5/tree/v1.0.1" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.24.0" }, - "time": "2021-12-16T13:03:56+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-02-19T12:13:01+00:00" }, { - "name": "codeception/module-phpbrowser", - "version": "1.0.2", + "name": "symfony/polyfill-mbstring", + "version": "v1.24.0", "source": { "type": "git", - "url": "https://github.com/Codeception/module-phpbrowser.git", - "reference": "770a6be4160a5c0c08d100dd51bff35f6056bbf1" + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/module-phpbrowser/zipball/770a6be4160a5c0c08d100dd51bff35f6056bbf1", - "reference": "770a6be4160a5c0c08d100dd51bff35f6056bbf1", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825", + "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825", "shasum": "" }, "require": { - "codeception/codeception": "^4.0", - "codeception/lib-innerbrowser": "^1.3", - "guzzlehttp/guzzle": "^6.3|^7.0", - "php": ">=5.6.0 <9.0" - }, - "conflict": { - "codeception/codeception": "<4.0" + "php": ">=7.1" }, - "require-dev": { - "codeception/module-rest": "^1.0" + "provide": { + "ext-mbstring": "*" }, "suggest": { - "codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests" + "ext-mbstring": "For best performance" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.23-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, "autoload": { - "classmap": [ - "src/" + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + }, + "files": [ + "bootstrap.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -809,51 +966,78 @@ ], "authors": [ { - "name": "Michael Bodnarchuk" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { - "name": "Gintautas Miselis" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Codeception module for testing web application over HTTP", - "homepage": "http://codeception.com/", + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", "keywords": [ - "codeception", - "functional-testing", - "http" + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" ], "support": { - "issues": "https://github.com/Codeception/module-phpbrowser/issues", - "source": "https://github.com/Codeception/module-phpbrowser/tree/1.0.2" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0" }, - "time": "2020-10-24T15:29:28+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-11-30T18:21:41+00:00" }, { - "name": "codeception/module-redis", - "version": "1.3.0", + "name": "symfony/polyfill-php73", + "version": "v1.24.0", "source": { "type": "git", - "url": "https://github.com/Codeception/module-redis.git", - "reference": "cc04c3de32114c68c4e3c552766606e762b23117" + "url": "https://github.com/symfony/polyfill-php73.git", + "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/module-redis/zipball/cc04c3de32114c68c4e3c552766606e762b23117", - "reference": "cc04c3de32114c68c4e3c552766606e762b23117", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/cc5db0e22b3cb4111010e48785a97f670b350ca5", + "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5", "shasum": "" }, "require": { - "codeception/codeception": "^4.0", - "php": "^7.4 || ^8.0", - "predis/predis": "^1.0" - }, - "require-dev": { - "codeception/stub": "^3.7" + "php": ">=7.1" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.23-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php73\\": "" + }, + "files": [ + "bootstrap.php" + ], "classmap": [ - "src/" + "Resources/stubs" ] }, "notification-url": "https://packagist.org/downloads/", @@ -862,54 +1046,78 @@ ], "authors": [ { - "name": "Michael Bodnarchuk" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { - "name": "Dmitriy Maltsev" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Redis module for Codeception", - "homepage": "https://codeception.com/", + "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", + "homepage": "https://symfony.com", "keywords": [ - "codeception", - "redis" + "compatibility", + "polyfill", + "portable", + "shim" ], "support": { - "issues": "https://github.com/Codeception/module-redis/issues", - "source": "https://github.com/Codeception/module-redis/tree/1.3.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.24.0" }, - "time": "2021-11-30T03:16:07+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-06-05T21:20:04+00:00" }, { - "name": "codeception/phpunit-wrapper", - "version": "8.1.4", + "name": "symfony/polyfill-php80", + "version": "v1.24.0", "source": { "type": "git", - "url": "https://github.com/Codeception/phpunit-wrapper.git", - "reference": "f41335f0b4dd17cf7bbc63e87943b3ae72a8bbc3" + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/f41335f0b4dd17cf7bbc63e87943b3ae72a8bbc3", - "reference": "f41335f0b4dd17cf7bbc63e87943b3ae72a8bbc3", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9", + "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9", "shasum": "" }, "require": { - "php": ">=7.2", - "phpunit/php-code-coverage": "^7.0", - "phpunit/phpunit": "^8.0", - "sebastian/comparator": "^3.0", - "sebastian/diff": "^3.0" - }, - "require-dev": { - "codeception/specify": "*", - "vlucas/phpdotenv": "^3.0" + "php": ">=7.1" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.23-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, "autoload": { "psr-4": { - "Codeception\\PHPUnit\\": "src/" - } + "Symfony\\Polyfill\\Php80\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -917,91 +1125,83 @@ ], "authors": [ { - "name": "Davert", - "email": "davert.php@resend.cc" - } - ], - "description": "PHPUnit classes used by Codeception", - "support": { - "issues": "https://github.com/Codeception/phpunit-wrapper/issues", - "source": "https://github.com/Codeception/phpunit-wrapper/tree/8.1.4" - }, - "time": "2020-12-28T14:00:08+00:00" - }, - { - "name": "codeception/stub", - "version": "4.0.0", - "source": { - "type": "git", - "url": "https://github.com/Codeception/Stub.git", - "reference": "4c9cf3e19bd5f064e08e7f3ba6be651c218dc6ae" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Codeception/Stub/zipball/4c9cf3e19bd5f064e08e7f3ba6be651c218dc6ae", - "reference": "4c9cf3e19bd5f064e08e7f3ba6be651c218dc6ae", - "shasum": "" - }, - "require": { - "php": "^7.4 | ^8.0", - "phpunit/phpunit": "^8.4 | ^9.0" - }, - "require-dev": { - "consolidation/robo": "^3.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Codeception\\": "src/" + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" ], - "description": "Flexible Stub wrapper for PHPUnit's Mock Builder", + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], "support": { - "issues": "https://github.com/Codeception/Stub/issues", - "source": "https://github.com/Codeception/Stub/tree/4.0.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0" }, - "time": "2021-12-07T14:39:17+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-09-13T13:58:33+00:00" }, { - "name": "composer/package-versions-deprecated", - "version": "1.11.99.4", + "name": "symfony/service-contracts", + "version": "v2.5.0", "source": { "type": "git", - "url": "https://github.com/composer/package-versions-deprecated.git", - "reference": "b174585d1fe49ceed21928a945138948cb394600" + "url": "https://github.com/symfony/service-contracts.git", + "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b174585d1fe49ceed21928a945138948cb394600", - "reference": "b174585d1fe49ceed21928a945138948cb394600", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc", + "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc", "shasum": "" }, "require": { - "composer-plugin-api": "^1.1.0 || ^2.0", - "php": "^7 || ^8" + "php": ">=7.2.5", + "psr/container": "^1.1", + "symfony/deprecation-contracts": "^2.1" }, - "replace": { - "ocramius/package-versions": "1.11.99" + "conflict": { + "ext-psr": "<1.1|>=2" }, - "require-dev": { - "composer/composer": "^1.9.3 || ^2.0@dev", - "ext-zip": "^1.13", - "phpunit/phpunit": "^6.5 || ^7" + "suggest": { + "symfony/service-implementation": "" }, - "type": "composer-plugin", + "type": "library", "extra": { - "class": "PackageVersions\\Installer", "branch-alias": { - "dev-master": "1.x-dev" + "dev-main": "2.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" } }, "autoload": { "psr-4": { - "PackageVersions\\": "src/PackageVersions" + "Symfony\\Contracts\\Service\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -1010,67 +1210,85 @@ ], "authors": [ { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", + "description": "Generic abstractions related to writing services", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], "support": { - "issues": "https://github.com/composer/package-versions-deprecated/issues", - "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.4" + "source": "https://github.com/symfony/service-contracts/tree/v2.5.0" }, "funding": [ { - "url": "https://packagist.com", + "url": "https://symfony.com/sponsor", "type": "custom" }, { - "url": "https://github.com/composer", + "url": "https://github.com/fabpot", "type": "github" }, { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2021-09-13T08:41:34+00:00" + "time": "2021-11-04T16:48:04+00:00" }, { - "name": "composer/pcre", - "version": "1.0.0", + "name": "symfony/string", + "version": "v5.4.2", "source": { "type": "git", - "url": "https://github.com/composer/pcre.git", - "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2" + "url": "https://github.com/symfony/string.git", + "reference": "e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/3d322d715c43a1ac36c7fe215fa59336265500f2", - "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2", + "url": "https://api.github.com/repos/symfony/string/zipball/e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d", + "reference": "e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d", "shasum": "" }, "require": { - "php": "^5.3.2 || ^7.0 || ^8.0" + "php": ">=7.2.5", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-intl-grapheme": "~1.0", + "symfony/polyfill-intl-normalizer": "~1.0", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php80": "~1.15" + }, + "conflict": { + "symfony/translation-contracts": ">=3.0" }, "require-dev": { - "phpstan/phpstan": "^1", - "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^4.2 || ^5" + "symfony/error-handler": "^4.4|^5.0|^6.0", + "symfony/http-client": "^4.4|^5.0|^6.0", + "symfony/translation-contracts": "^1.1|^2", + "symfony/var-exporter": "^4.4|^5.0|^6.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.x-dev" - } - }, "autoload": { "psr-4": { - "Composer\\Pcre\\": "src" - } + "Symfony\\Component\\String\\": "" + }, + "files": [ + "Resources/functions.php" + ], + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1078,69 +1296,85 @@ ], "authors": [ { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "PCRE wrapping library that offers type-safe preg_* replacements.", + "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way", + "homepage": "https://symfony.com", "keywords": [ - "PCRE", - "preg", - "regex", - "regular expression" + "grapheme", + "i18n", + "string", + "unicode", + "utf-8", + "utf8" ], "support": { - "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/1.0.0" + "source": "https://github.com/symfony/string/tree/v5.4.2" }, "funding": [ { - "url": "https://packagist.com", + "url": "https://symfony.com/sponsor", "type": "custom" }, { - "url": "https://github.com/composer", + "url": "https://github.com/fabpot", "type": "github" }, { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2021-12-06T15:17:27+00:00" - }, + "time": "2021-12-16T21:52:00+00:00" + } + ], + "packages-dev": [ { - "name": "composer/semver", - "version": "3.2.6", + "name": "amphp/amp", + "version": "v2.6.1", "source": { "type": "git", - "url": "https://github.com/composer/semver.git", - "reference": "83e511e247de329283478496f7a1e114c9517506" + "url": "https://github.com/amphp/amp.git", + "reference": "c5fc66a78ee38d7ac9195a37bacaf940eb3f65ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/83e511e247de329283478496f7a1e114c9517506", - "reference": "83e511e247de329283478496f7a1e114c9517506", + "url": "https://api.github.com/repos/amphp/amp/zipball/c5fc66a78ee38d7ac9195a37bacaf940eb3f65ae", + "reference": "c5fc66a78ee38d7ac9195a37bacaf940eb3f65ae", "shasum": "" }, "require": { - "php": "^5.3.2 || ^7.0 || ^8.0" + "php": ">=7.1" }, "require-dev": { - "phpstan/phpstan": "^0.12.54", - "symfony/phpunit-bridge": "^4.2 || ^5" + "amphp/php-cs-fixer-config": "dev-master", + "amphp/phpunit-util": "^1", + "ext-json": "*", + "jetbrains/phpstorm-stubs": "^2019.3", + "phpunit/phpunit": "^7 | ^8 | ^9", + "psalm/phar": "^3.11@dev", + "react/promise": "^2" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { "psr-4": { - "Composer\\Semver\\": "src" - } + "Amp\\": "lib" + }, + "files": [ + "lib/functions.php", + "lib/Internal/functions.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1148,78 +1382,87 @@ ], "authors": [ { - "name": "Nils Adermann", - "email": "naderman@naderman.de", - "homepage": "http://www.naderman.de" + "name": "Daniel Lowrey", + "email": "rdlowrey@php.net" }, { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" }, { - "name": "Rob Bast", - "email": "rob.bast@gmail.com", - "homepage": "http://robbast.nl" - } - ], - "description": "Semver library that offers utilities, version constraint parsing and validation.", - "keywords": [ - "semantic", - "semver", - "validation", - "versioning" + "name": "Bob Weinand", + "email": "bobwei9@hotmail.com" + }, + { + "name": "Niklas Keller", + "email": "me@kelunik.com" + } + ], + "description": "A non-blocking concurrency framework for PHP applications.", + "homepage": "http://amphp.org/amp", + "keywords": [ + "async", + "asynchronous", + "awaitable", + "concurrency", + "event", + "event-loop", + "future", + "non-blocking", + "promise" ], "support": { - "irc": "irc://irc.freenode.org/composer", - "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.2.6" + "irc": "irc://irc.freenode.org/amphp", + "issues": "https://github.com/amphp/amp/issues", + "source": "https://github.com/amphp/amp/tree/v2.6.1" }, "funding": [ { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", + "url": "https://github.com/amphp", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" } ], - "time": "2021-10-25T11:34:17+00:00" + "time": "2021-09-23T18:43:08+00:00" }, { - "name": "composer/xdebug-handler", - "version": "2.0.3", + "name": "amphp/byte-stream", + "version": "v1.8.1", "source": { "type": "git", - "url": "https://github.com/composer/xdebug-handler.git", - "reference": "6555461e76962fd0379c444c46fd558a0fcfb65e" + "url": "https://github.com/amphp/byte-stream.git", + "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6555461e76962fd0379c444c46fd558a0fcfb65e", - "reference": "6555461e76962fd0379c444c46fd558a0fcfb65e", + "url": "https://api.github.com/repos/amphp/byte-stream/zipball/acbd8002b3536485c997c4e019206b3f10ca15bd", + "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd", "shasum": "" }, "require": { - "composer/pcre": "^1", - "php": "^5.3.2 || ^7.0 || ^8.0", - "psr/log": "^1 || ^2 || ^3" + "amphp/amp": "^2", + "php": ">=7.1" }, "require-dev": { - "phpstan/phpstan": "^1.0", - "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0" + "amphp/php-cs-fixer-config": "dev-master", + "amphp/phpunit-util": "^1.4", + "friendsofphp/php-cs-fixer": "^2.3", + "jetbrains/phpstorm-stubs": "^2019.3", + "phpunit/phpunit": "^6 || ^7 || ^8", + "psalm/phar": "^3.11.4" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, "autoload": { "psr-4": { - "Composer\\XdebugHandler\\": "src" - } + "Amp\\ByteStream\\": "lib" + }, + "files": [ + "lib/functions.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1227,105 +1470,165 @@ ], "authors": [ { - "name": "John Stevenson", - "email": "john-stevenson@blueyonder.co.uk" + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" + }, + { + "name": "Niklas Keller", + "email": "me@kelunik.com" } ], - "description": "Restarts a process without Xdebug.", + "description": "A stream abstraction to make working with non-blocking I/O simple.", + "homepage": "http://amphp.org/byte-stream", "keywords": [ - "Xdebug", - "performance" + "amp", + "amphp", + "async", + "io", + "non-blocking", + "stream" ], "support": { - "irc": "irc://irc.freenode.org/composer", - "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/2.0.3" + "irc": "irc://irc.freenode.org/amphp", + "issues": "https://github.com/amphp/byte-stream/issues", + "source": "https://github.com/amphp/byte-stream/tree/v1.8.1" }, "funding": [ { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", + "url": "https://github.com/amphp", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" } ], - "time": "2021-12-08T13:07:32+00:00" + "time": "2021-03-30T17:13:30+00:00" }, { - "name": "dnoegel/php-xdg-base-dir", - "version": "v0.1.1", + "name": "behat/gherkin", + "version": "v4.9.0", "source": { "type": "git", - "url": "https://github.com/dnoegel/php-xdg-base-dir.git", - "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd" + "url": "https://github.com/Behat/Gherkin.git", + "reference": "0bc8d1e30e96183e4f36db9dc79caead300beff4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd", - "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd", + "url": "https://api.github.com/repos/Behat/Gherkin/zipball/0bc8d1e30e96183e4f36db9dc79caead300beff4", + "reference": "0bc8d1e30e96183e4f36db9dc79caead300beff4", "shasum": "" }, "require": { - "php": ">=5.3.2" + "php": "~7.2|~8.0" }, "require-dev": { - "phpunit/phpunit": "~7.0|~6.0|~5.0|~4.8.35" + "cucumber/cucumber": "dev-gherkin-22.0.0", + "phpunit/phpunit": "~8|~9", + "symfony/yaml": "~3|~4|~5" + }, + "suggest": { + "symfony/yaml": "If you want to parse features, represented in YAML files" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev" + } + }, "autoload": { - "psr-4": { - "XdgBaseDir\\": "src/" + "psr-0": { + "Behat\\Gherkin": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "description": "implementation of xdg base directory specification for php", + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + } + ], + "description": "Gherkin DSL parser for PHP", + "homepage": "http://behat.org/", + "keywords": [ + "BDD", + "Behat", + "Cucumber", + "DSL", + "gherkin", + "parser" + ], "support": { - "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues", - "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1" + "issues": "https://github.com/Behat/Gherkin/issues", + "source": "https://github.com/Behat/Gherkin/tree/v4.9.0" }, - "time": "2019-12-04T15:06:13+00:00" + "time": "2021-10-12T13:05:09+00:00" }, { - "name": "doctrine/annotations", - "version": "1.13.2", + "name": "codeception/codeception", + "version": "4.1.28", "source": { "type": "git", - "url": "https://github.com/doctrine/annotations.git", - "reference": "5b668aef16090008790395c02c893b1ba13f7e08" + "url": "https://github.com/Codeception/Codeception.git", + "reference": "e9bc22a3819f9d356068c0e372193ebcc9b06014" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/5b668aef16090008790395c02c893b1ba13f7e08", - "reference": "5b668aef16090008790395c02c893b1ba13f7e08", + "url": "https://api.github.com/repos/Codeception/Codeception/zipball/e9bc22a3819f9d356068c0e372193ebcc9b06014", + "reference": "e9bc22a3819f9d356068c0e372193ebcc9b06014", "shasum": "" }, "require": { - "doctrine/lexer": "1.*", - "ext-tokenizer": "*", - "php": "^7.1 || ^8.0", - "psr/cache": "^1 || ^2 || ^3" + "behat/gherkin": "^4.4.0", + "codeception/lib-asserts": "^1.0 | 2.0.*@dev", + "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.1.1 | ^9.0", + "codeception/stub": "^2.0 | ^3.0 | ^4.0", + "ext-curl": "*", + "ext-json": "*", + "ext-mbstring": "*", + "guzzlehttp/psr7": "^1.4 | ^2.0", + "php": ">=5.6.0 <9.0", + "symfony/console": ">=2.7 <6.0", + "symfony/css-selector": ">=2.7 <6.0", + "symfony/event-dispatcher": ">=2.7 <6.0", + "symfony/finder": ">=2.7 <6.0", + "symfony/yaml": ">=2.7 <6.0" }, "require-dev": { - "doctrine/cache": "^1.11 || ^2.0", - "doctrine/coding-standard": "^6.0 || ^8.1", - "phpstan/phpstan": "^0.12.20", - "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5", - "symfony/cache": "^4.4 || ^5.2" + "codeception/module-asserts": "^1.0 | 2.0.*@dev", + "codeception/module-cli": "^1.0 | 2.0.*@dev", + "codeception/module-db": "^1.0 | 2.0.*@dev", + "codeception/module-filesystem": "^1.0 | 2.0.*@dev", + "codeception/module-phpbrowser": "^1.0 | 2.0.*@dev", + "codeception/specify": "~0.3", + "codeception/util-universalframework": "*@dev", + "monolog/monolog": "~1.8", + "squizlabs/php_codesniffer": "~2.0", + "symfony/process": ">=2.7 <6.0", + "vlucas/phpdotenv": "^2.0 | ^3.0 | ^4.0 | ^5.0" + }, + "suggest": { + "codeception/specify": "BDD-style code blocks", + "codeception/verify": "BDD-style assertions", + "hoa/console": "For interactive console functionality", + "stecman/symfony-console-completion": "For BASH autocompletion", + "symfony/phpunit-bridge": "For phpunit-bridge support" }, + "bin": [ + "codecept" + ], "type": "library", + "extra": { + "branch-alias": [] + }, "autoload": { "psr-4": { - "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" - } + "Codeception\\": "src/Codeception", + "Codeception\\Extension\\": "ext" + }, + "files": [ + "functions.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1333,70 +1636,56 @@ ], "authors": [ { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" + "name": "Michael Bodnarchuk", + "email": "davert@mail.ua", + "homepage": "http://codegyre.com" } ], - "description": "Docblock Annotations Parser", - "homepage": "https://www.doctrine-project.org/projects/annotations.html", + "description": "BDD-style testing framework", + "homepage": "http://codeception.com/", "keywords": [ - "annotations", - "docblock", - "parser" - ], - "support": { - "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/1.13.2" + "BDD", + "TDD", + "acceptance testing", + "functional testing", + "unit testing" + ], + "support": { + "issues": "https://github.com/Codeception/Codeception/issues", + "source": "https://github.com/Codeception/Codeception/tree/4.1.28" }, - "time": "2021-08-05T19:00:23+00:00" + "funding": [ + { + "url": "https://opencollective.com/codeception", + "type": "open_collective" + } + ], + "time": "2022-01-05T16:41:25+00:00" }, { - "name": "doctrine/instantiator", - "version": "1.4.0", + "name": "codeception/lib-asserts", + "version": "1.13.2", "source": { "type": "git", - "url": "https://github.com/doctrine/instantiator.git", - "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b" + "url": "https://github.com/Codeception/lib-asserts.git", + "reference": "184231d5eab66bc69afd6b9429344d80c67a33b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b", - "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b", + "url": "https://api.github.com/repos/Codeception/lib-asserts/zipball/184231d5eab66bc69afd6b9429344d80c67a33b6", + "reference": "184231d5eab66bc69afd6b9429344d80c67a33b6", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" - }, - "require-dev": { - "doctrine/coding-standard": "^8.0", - "ext-pdo": "*", - "ext-phar": "*", - "phpbench/phpbench": "^0.13 || 1.0.0-alpha2", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-phpunit": "^0.12", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.0.3 | ^9.0", + "ext-dom": "*", + "php": ">=5.6.0 <9.0" }, "type": "library", "autoload": { - "psr-4": { - "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1404,69 +1693,63 @@ ], "authors": [ { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "homepage": "https://ocramius.github.io/" - } - ], - "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://www.doctrine-project.org/projects/instantiator.html", - "keywords": [ - "constructor", - "instantiate" - ], - "support": { - "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.4.0" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" + "name": "Michael Bodnarchuk", + "email": "davert@mail.ua", + "homepage": "http://codegyre.com" }, { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" + "name": "Gintautas Miselis" }, { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", - "type": "tidelift" + "name": "Gustavo Nieves", + "homepage": "https://medium.com/@ganieves" } ], - "time": "2020-11-10T18:47:58+00:00" + "description": "Assertion methods used by Codeception core and Asserts module", + "homepage": "https://codeception.com/", + "keywords": [ + "codeception" + ], + "support": { + "issues": "https://github.com/Codeception/lib-asserts/issues", + "source": "https://github.com/Codeception/lib-asserts/tree/1.13.2" + }, + "time": "2020-10-21T16:26:20+00:00" }, { - "name": "doctrine/lexer", - "version": "1.2.1", + "name": "codeception/lib-innerbrowser", + "version": "1.5.1", "source": { "type": "git", - "url": "https://github.com/doctrine/lexer.git", - "reference": "e864bbf5904cb8f5bb334f99209b48018522f042" + "url": "https://github.com/Codeception/lib-innerbrowser.git", + "reference": "31b4b56ad53c3464fcb2c0a14d55a51a201bd3c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042", - "reference": "e864bbf5904cb8f5bb334f99209b48018522f042", + "url": "https://api.github.com/repos/Codeception/lib-innerbrowser/zipball/31b4b56ad53c3464fcb2c0a14d55a51a201bd3c2", + "reference": "31b4b56ad53c3464fcb2c0a14d55a51a201bd3c2", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "codeception/codeception": "4.*@dev", + "ext-dom": "*", + "ext-json": "*", + "ext-mbstring": "*", + "php": ">=5.6.0 <9.0", + "symfony/browser-kit": ">=2.7 <6.0", + "symfony/dom-crawler": ">=2.7 <6.0" + }, + "conflict": { + "codeception/codeception": "<4.0" }, "require-dev": { - "doctrine/coding-standard": "^6.0", - "phpstan/phpstan": "^0.11.8", - "phpunit/phpunit": "^8.2" + "codeception/util-universalframework": "dev-master" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, "autoload": { - "psr-4": { - "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1474,209 +1757,203 @@ ], "authors": [ { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" + "name": "Michael Bodnarchuk", + "email": "davert@mail.ua", + "homepage": "http://codegyre.com" }, { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" + "name": "Gintautas Miselis" } ], - "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.", - "homepage": "https://www.doctrine-project.org/projects/lexer.html", + "description": "Parent library for all Codeception framework modules and PhpBrowser", + "homepage": "https://codeception.com/", "keywords": [ - "annotations", - "docblock", - "lexer", - "parser", - "php" + "codeception" ], "support": { - "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/1.2.1" + "issues": "https://github.com/Codeception/lib-innerbrowser/issues", + "source": "https://github.com/Codeception/lib-innerbrowser/tree/1.5.1" }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", - "type": "tidelift" - } - ], - "time": "2020-05-25T17:44:05+00:00" + "time": "2021-08-30T15:21:42+00:00" }, { - "name": "felixfbecker/advanced-json-rpc", - "version": "v3.2.1", + "name": "codeception/module-apc", + "version": "1.0.2", "source": { "type": "git", - "url": "https://github.com/felixfbecker/php-advanced-json-rpc.git", - "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447" + "url": "https://github.com/Codeception/module-apc.git", + "reference": "07fbd6dd12b9d3f4b738bcac8266eecefb470365" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/b5f37dbff9a8ad360ca341f3240dc1c168b45447", - "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447", + "url": "https://api.github.com/repos/Codeception/module-apc/zipball/07fbd6dd12b9d3f4b738bcac8266eecefb470365", + "reference": "07fbd6dd12b9d3f4b738bcac8266eecefb470365", "shasum": "" }, "require": { - "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", - "php": "^7.1 || ^8.0", - "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0" - }, - "require-dev": { - "phpunit/phpunit": "^7.0 || ^8.0" + "codeception/codeception": "^4.0", + "php": ">=5.6.0 <9.0" }, "type": "library", "autoload": { - "psr-4": { - "AdvancedJsonRpc\\": "lib/" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "ISC" + "MIT" ], "authors": [ { - "name": "Felix Becker", - "email": "felix.b@outlook.com" + "name": "Serghei Iakovlev" + }, + { + "name": "Gintautas Miselis" } ], - "description": "A more advanced JSONRPC implementation", + "description": "APC module for Codeception", + "homepage": "http://codeception.com/", + "keywords": [ + "apc", + "codeception" + ], "support": { - "issues": "https://github.com/felixfbecker/php-advanced-json-rpc/issues", - "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/v3.2.1" + "issues": "https://github.com/Codeception/module-apc/issues", + "source": "https://github.com/Codeception/module-apc/tree/1.0.2" }, - "time": "2021-06-11T22:34:44+00:00" + "time": "2020-10-26T06:16:02+00:00" }, { - "name": "felixfbecker/language-server-protocol", - "version": "1.5.1", + "name": "codeception/module-asserts", + "version": "1.3.1", "source": { "type": "git", - "url": "https://github.com/felixfbecker/php-language-server-protocol.git", - "reference": "9d846d1f5cf101deee7a61c8ba7caa0a975cd730" + "url": "https://github.com/Codeception/module-asserts.git", + "reference": "59374f2fef0cabb9e8ddb53277e85cdca74328de" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/9d846d1f5cf101deee7a61c8ba7caa0a975cd730", - "reference": "9d846d1f5cf101deee7a61c8ba7caa0a975cd730", + "url": "https://api.github.com/repos/Codeception/module-asserts/zipball/59374f2fef0cabb9e8ddb53277e85cdca74328de", + "reference": "59374f2fef0cabb9e8ddb53277e85cdca74328de", "shasum": "" }, "require": { - "php": ">=7.1" + "codeception/codeception": "*@dev", + "codeception/lib-asserts": "^1.13.1", + "php": ">=5.6.0 <9.0" }, - "require-dev": { - "phpstan/phpstan": "*", - "squizlabs/php_codesniffer": "^3.1", - "vimeo/psalm": "^4.0" + "conflict": { + "codeception/codeception": "<4.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, "autoload": { - "psr-4": { - "LanguageServerProtocol\\": "src/" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "ISC" + "MIT" ], "authors": [ { - "name": "Felix Becker", - "email": "felix.b@outlook.com" + "name": "Michael Bodnarchuk" + }, + { + "name": "Gintautas Miselis" + }, + { + "name": "Gustavo Nieves", + "homepage": "https://medium.com/@ganieves" } ], - "description": "PHP classes for the Language Server Protocol", + "description": "Codeception module containing various assertions", + "homepage": "https://codeception.com/", "keywords": [ - "language", - "microsoft", - "php", - "server" + "assertions", + "asserts", + "codeception" ], "support": { - "issues": "https://github.com/felixfbecker/php-language-server-protocol/issues", - "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/1.5.1" + "issues": "https://github.com/Codeception/module-asserts/issues", + "source": "https://github.com/Codeception/module-asserts/tree/1.3.1" }, - "time": "2021-02-22T14:02:09+00:00" + "time": "2020-10-21T16:48:15+00:00" }, { - "name": "friendsofphp/php-cs-fixer", - "version": "v3.4.0", + "name": "codeception/module-cli", + "version": "1.1.1", "source": { "type": "git", - "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "47177af1cfb9dab5d1cc4daf91b7179c2efe7fad" + "url": "https://github.com/Codeception/module-cli.git", + "reference": "1f841ad4a1d43e5d9e60a43c4cc9e5af8008024f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/47177af1cfb9dab5d1cc4daf91b7179c2efe7fad", - "reference": "47177af1cfb9dab5d1cc4daf91b7179c2efe7fad", + "url": "https://api.github.com/repos/Codeception/module-cli/zipball/1f841ad4a1d43e5d9e60a43c4cc9e5af8008024f", + "reference": "1f841ad4a1d43e5d9e60a43c4cc9e5af8008024f", "shasum": "" }, "require": { - "composer/semver": "^3.2", - "composer/xdebug-handler": "^2.0", - "doctrine/annotations": "^1.12", - "ext-json": "*", - "ext-tokenizer": "*", - "php": "^7.2.5 || ^8.0", - "php-cs-fixer/diff": "^2.0", - "symfony/console": "^4.4.20 || ^5.1.3 || ^6.0", - "symfony/event-dispatcher": "^4.4.20 || ^5.0 || ^6.0", - "symfony/filesystem": "^4.4.20 || ^5.0 || ^6.0", - "symfony/finder": "^4.4.20 || ^5.0 || ^6.0", - "symfony/options-resolver": "^4.4.20 || ^5.0 || ^6.0", - "symfony/polyfill-mbstring": "^1.23", - "symfony/polyfill-php80": "^1.23", - "symfony/polyfill-php81": "^1.23", - "symfony/process": "^4.4.20 || ^5.0 || ^6.0", - "symfony/stopwatch": "^4.4.20 || ^5.0 || ^6.0" + "codeception/codeception": "*@dev", + "php": ">=5.6.0 <9.0" }, - "require-dev": { - "justinrainbow/json-schema": "^5.2", - "keradus/cli-executor": "^1.5", - "mikey179/vfsstream": "^1.6.8", - "php-coveralls/php-coveralls": "^2.5.2", - "php-cs-fixer/accessible-object": "^1.1", - "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2", - "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1", - "phpspec/prophecy": "^1.15", - "phpspec/prophecy-phpunit": "^1.1 || ^2.0", - "phpunit/phpunit": "^8.5.21 || ^9.5", - "phpunitgoodpractices/polyfill": "^1.5", - "phpunitgoodpractices/traits": "^1.9.1", - "symfony/phpunit-bridge": "^5.2.4 || ^6.0", - "symfony/yaml": "^4.4.20 || ^5.0 || ^6.0" + "conflict": { + "codeception/codeception": "<4.0" }, - "suggest": { - "ext-dom": "For handling output formats in XML", - "ext-mbstring": "For handling non-UTF8 characters." + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] }, - "bin": [ - "php-cs-fixer" + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" ], - "type": "application", - "autoload": { - "psr-4": { - "PhpCsFixer\\": "src/" + "authors": [ + { + "name": "Michael Bodnarchuk" } + ], + "description": "Codeception module for testing basic shell commands and shell output", + "homepage": "http://codeception.com/", + "keywords": [ + "codeception" + ], + "support": { + "issues": "https://github.com/Codeception/module-cli/issues", + "source": "https://github.com/Codeception/module-cli/tree/1.1.1" + }, + "time": "2020-12-26T16:56:19+00:00" + }, + { + "name": "codeception/module-db", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/Codeception/module-db.git", + "reference": "8c8076cd05d4db95798acd7dba2a56578210982c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Codeception/module-db/zipball/8c8076cd05d4db95798acd7dba2a56578210982c", + "reference": "8c8076cd05d4db95798acd7dba2a56578210982c", + "shasum": "" + }, + "require": { + "codeception/codeception": "*@dev", + "php": ">=5.6.0 <9.0" + }, + "conflict": { + "codeception/codeception": "<4.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1684,76 +1961,110 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Michael Bodnarchuk" }, { - "name": "Dariusz Rumiński", - "email": "dariusz.ruminski@gmail.com" + "name": "Gintautas Miselis" } ], - "description": "A tool to automatically fix PHP code style", + "description": "DB module for Codeception", + "homepage": "http://codeception.com/", + "keywords": [ + "codeception", + "database-testing", + "db-testing" + ], "support": { - "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", - "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.4.0" + "issues": "https://github.com/Codeception/module-db/issues", + "source": "https://github.com/Codeception/module-db/tree/1.1.0" }, - "funding": [ + "time": "2020-12-20T13:37:07+00:00" + }, + { + "name": "codeception/module-filesystem", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/Codeception/module-filesystem.git", + "reference": "781be167fb1557bfc9b61e0a4eac60a32c534ec1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Codeception/module-filesystem/zipball/781be167fb1557bfc9b61e0a4eac60a32c534ec1", + "reference": "781be167fb1557bfc9b61e0a4eac60a32c534ec1", + "shasum": "" + }, + "require": { + "codeception/codeception": "^4.0", + "php": ">=5.6.0 <9.0", + "symfony/finder": ">=2.7 <6.0" + }, + "conflict": { + "codeception/codeception": "<4.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ { - "url": "https://github.com/keradus", - "type": "github" + "name": "Michael Bodnarchuk" + }, + { + "name": "Gintautas Miselis" } ], - "time": "2021-12-11T16:25:08+00:00" + "description": "Codeception module for testing local filesystem", + "homepage": "http://codeception.com/", + "keywords": [ + "codeception", + "filesystem" + ], + "support": { + "issues": "https://github.com/Codeception/module-filesystem/issues", + "source": "https://github.com/Codeception/module-filesystem/tree/1.0.3" + }, + "time": "2020-10-24T14:46:40+00:00" }, { - "name": "guzzlehttp/guzzle", - "version": "7.4.1", + "name": "codeception/module-phalcon5", + "version": "v1.0.1", "source": { "type": "git", - "url": "https://github.com/guzzle/guzzle.git", - "reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79" + "url": "https://github.com/Codeception/module-phalcon5.git", + "reference": "330564e8a8e5d2b16095bf434028b2b31a477a9a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ee0a041b1760e6a53d2a39c8c34115adc2af2c79", - "reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79", + "url": "https://api.github.com/repos/Codeception/module-phalcon5/zipball/330564e8a8e5d2b16095bf434028b2b31a477a9a", + "reference": "330564e8a8e5d2b16095bf434028b2b31a477a9a", "shasum": "" }, "require": { + "codeception/codeception": "^4.0", + "codeception/lib-innerbrowser": "^1.0", + "codeception/module-asserts": "^1.0", + "codeception/module-db": "^1.0", + "codeception/module-phpbrowser": "^1.0", "ext-json": "*", - "guzzlehttp/promises": "^1.5", - "guzzlehttp/psr7": "^1.8.3 || ^2.1", - "php": "^7.2.5 || ^8.0", - "psr/http-client": "^1.0", - "symfony/deprecation-contracts": "^2.2 || ^3.0" - }, - "provide": { - "psr/http-client-implementation": "1.0" + "php": ">=7.4.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.4.1", - "ext-curl": "*", - "php-http/client-integration-tests": "^3.0", - "phpunit/phpunit": "^8.5.5 || ^9.3.5", - "psr/log": "^1.1 || ^2.0 || ^3.0" - }, - "suggest": { - "ext-curl": "Required for CURL handler support", - "ext-intl": "Required for Internationalized Domain Name (IDN) support", - "psr/log": "Required for using the Log middleware" + "codeception/util-robohelpers": "dev-master", + "squizlabs/php_codesniffer": "^3.4", + "vimeo/psalm": "^3.6", + "vlucas/phpdotenv": "^4.1" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "7.4-dev" - } - }, "autoload": { - "psr-4": { - "GuzzleHttp\\": "src/" - }, - "files": [ - "src/functions_include.php" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -1762,105 +2073,115 @@ ], "authors": [ { - "name": "Graham Campbell", - "email": "hello@gjcampbell.co.uk", - "homepage": "https://github.com/GrahamCampbell" - }, - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "Jeremy Lindblom", - "email": "jeremeamia@gmail.com", - "homepage": "https://github.com/jeremeamia" - }, - { - "name": "George Mponos", - "email": "gmponos@gmail.com", - "homepage": "https://github.com/gmponos" - }, - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com", - "homepage": "https://github.com/Nyholm" - }, - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com", - "homepage": "https://github.com/sagikazarmark" + "name": "Phalcon Team", + "email": "team@phalcon.io", + "homepage": "https://phalcon.io/en/team" }, { - "name": "Tobias Schultze", - "email": "webmaster@tubo-world.de", - "homepage": "https://github.com/Tobion" + "name": "Codeception Team", + "email": "team@codeception.com", + "homepage": "https://codeception.com/" } ], - "description": "Guzzle is a PHP HTTP client library", + "description": "Codeception module for Phalcon 5 framework", + "homepage": "https://codeception.com/", "keywords": [ - "client", - "curl", - "framework", - "http", - "http client", - "psr-18", - "psr-7", - "rest", - "web service" + "codeception", + "phalcon", + "phalcon5" ], "support": { - "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.4.1" + "issues": "https://github.com/Codeception/module-phalcon5/issues", + "source": "https://github.com/Codeception/module-phalcon5/tree/v1.0.1" }, - "funding": [ - { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, + "time": "2021-12-16T13:03:56+00:00" + }, + { + "name": "codeception/module-phpbrowser", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/Codeception/module-phpbrowser.git", + "reference": "770a6be4160a5c0c08d100dd51bff35f6056bbf1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Codeception/module-phpbrowser/zipball/770a6be4160a5c0c08d100dd51bff35f6056bbf1", + "reference": "770a6be4160a5c0c08d100dd51bff35f6056bbf1", + "shasum": "" + }, + "require": { + "codeception/codeception": "^4.0", + "codeception/lib-innerbrowser": "^1.3", + "guzzlehttp/guzzle": "^6.3|^7.0", + "php": ">=5.6.0 <9.0" + }, + "conflict": { + "codeception/codeception": "<4.0" + }, + "require-dev": { + "codeception/module-rest": "^1.0" + }, + "suggest": { + "codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ { - "url": "https://github.com/Nyholm", - "type": "github" + "name": "Michael Bodnarchuk" }, { - "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle", - "type": "tidelift" + "name": "Gintautas Miselis" } ], - "time": "2021-12-06T18:43:05+00:00" + "description": "Codeception module for testing web application over HTTP", + "homepage": "http://codeception.com/", + "keywords": [ + "codeception", + "functional-testing", + "http" + ], + "support": { + "issues": "https://github.com/Codeception/module-phpbrowser/issues", + "source": "https://github.com/Codeception/module-phpbrowser/tree/1.0.2" + }, + "time": "2020-10-24T15:29:28+00:00" }, { - "name": "guzzlehttp/promises", - "version": "1.5.1", + "name": "codeception/module-redis", + "version": "1.3.0", "source": { "type": "git", - "url": "https://github.com/guzzle/promises.git", - "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da" + "url": "https://github.com/Codeception/module-redis.git", + "reference": "cc04c3de32114c68c4e3c552766606e762b23117" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da", - "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da", + "url": "https://api.github.com/repos/Codeception/module-redis/zipball/cc04c3de32114c68c4e3c552766606e762b23117", + "reference": "cc04c3de32114c68c4e3c552766606e762b23117", "shasum": "" }, "require": { - "php": ">=5.5" + "codeception/codeception": "^4.0", + "php": "^7.4 || ^8.0", + "predis/predis": "^1.0" }, "require-dev": { - "symfony/phpunit-bridge": "^4.4 || ^5.1" + "codeception/stub": "^3.7" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.5-dev" - } - }, "autoload": { - "psr-4": { - "GuzzleHttp\\Promise\\": "src/" - }, - "files": [ - "src/functions_include.php" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -1869,91 +2190,146 @@ ], "authors": [ { - "name": "Graham Campbell", - "email": "hello@gjcampbell.co.uk", - "homepage": "https://github.com/GrahamCampbell" - }, - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com", - "homepage": "https://github.com/Nyholm" + "name": "Michael Bodnarchuk" }, { - "name": "Tobias Schultze", - "email": "webmaster@tubo-world.de", - "homepage": "https://github.com/Tobion" + "name": "Dmitriy Maltsev" } ], - "description": "Guzzle promises library", + "description": "Redis module for Codeception", + "homepage": "https://codeception.com/", "keywords": [ - "promise" + "codeception", + "redis" ], "support": { - "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.1" + "issues": "https://github.com/Codeception/module-redis/issues", + "source": "https://github.com/Codeception/module-redis/tree/1.3.0" }, - "funding": [ - { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://github.com/Nyholm", - "type": "github" - }, + "time": "2021-11-30T03:16:07+00:00" + }, + { + "name": "codeception/phpunit-wrapper", + "version": "8.1.4", + "source": { + "type": "git", + "url": "https://github.com/Codeception/phpunit-wrapper.git", + "reference": "f41335f0b4dd17cf7bbc63e87943b3ae72a8bbc3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/f41335f0b4dd17cf7bbc63e87943b3ae72a8bbc3", + "reference": "f41335f0b4dd17cf7bbc63e87943b3ae72a8bbc3", + "shasum": "" + }, + "require": { + "php": ">=7.2", + "phpunit/php-code-coverage": "^7.0", + "phpunit/phpunit": "^8.0", + "sebastian/comparator": "^3.0", + "sebastian/diff": "^3.0" + }, + "require-dev": { + "codeception/specify": "*", + "vlucas/phpdotenv": "^3.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Codeception\\PHPUnit\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ { - "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises", - "type": "tidelift" + "name": "Davert", + "email": "davert.php@resend.cc" + } + ], + "description": "PHPUnit classes used by Codeception", + "support": { + "issues": "https://github.com/Codeception/phpunit-wrapper/issues", + "source": "https://github.com/Codeception/phpunit-wrapper/tree/8.1.4" + }, + "time": "2020-12-28T14:00:08+00:00" + }, + { + "name": "codeception/stub", + "version": "4.0.1", + "source": { + "type": "git", + "url": "https://github.com/Codeception/Stub.git", + "reference": "ce0a9e418c775ca8b737d50c2b4ac1132f3990d8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Codeception/Stub/zipball/ce0a9e418c775ca8b737d50c2b4ac1132f3990d8", + "reference": "ce0a9e418c775ca8b737d50c2b4ac1132f3990d8", + "shasum": "" + }, + "require": { + "php": "^7.4 | ^8.0", + "phpunit/phpunit": "^8.4 | ^9.0" + }, + "require-dev": { + "consolidation/robo": "^3.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Codeception\\": "src/" } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" ], - "time": "2021-10-22T20:56:57+00:00" + "description": "Flexible Stub wrapper for PHPUnit's Mock Builder", + "support": { + "issues": "https://github.com/Codeception/Stub/issues", + "source": "https://github.com/Codeception/Stub/tree/4.0.1" + }, + "time": "2022-01-08T09:35:36+00:00" }, { - "name": "guzzlehttp/psr7", - "version": "2.1.0", + "name": "composer/package-versions-deprecated", + "version": "1.11.99.4", "source": { "type": "git", - "url": "https://github.com/guzzle/psr7.git", - "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72" + "url": "https://github.com/composer/package-versions-deprecated.git", + "reference": "b174585d1fe49ceed21928a945138948cb394600" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/089edd38f5b8abba6cb01567c2a8aaa47cec4c72", - "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72", + "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b174585d1fe49ceed21928a945138948cb394600", + "reference": "b174585d1fe49ceed21928a945138948cb394600", "shasum": "" }, "require": { - "php": "^7.2.5 || ^8.0", - "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", - "ralouphie/getallheaders": "^3.0" + "composer-plugin-api": "^1.1.0 || ^2.0", + "php": "^7 || ^8" }, - "provide": { - "psr/http-factory-implementation": "1.0", - "psr/http-message-implementation": "1.0" + "replace": { + "ocramius/package-versions": "1.11.99" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.4.1", - "http-interop/http-factory-tests": "^0.9", - "phpunit/phpunit": "^8.5.8 || ^9.3.10" - }, - "suggest": { - "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" + "composer/composer": "^1.9.3 || ^2.0@dev", + "ext-zip": "^1.13", + "phpunit/phpunit": "^6.5 || ^7" }, - "type": "library", + "type": "composer-plugin", "extra": { + "class": "PackageVersions\\Installer", "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "1.x-dev" } }, "autoload": { "psr-4": { - "GuzzleHttp\\Psr7\\": "src/" + "PackageVersions\\": "src/PackageVersions" } }, "notification-url": "https://packagist.org/downloads/", @@ -1962,97 +2338,66 @@ ], "authors": [ { - "name": "Graham Campbell", - "email": "hello@gjcampbell.co.uk", - "homepage": "https://github.com/GrahamCampbell" - }, - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "George Mponos", - "email": "gmponos@gmail.com", - "homepage": "https://github.com/gmponos" - }, - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com", - "homepage": "https://github.com/Nyholm" - }, - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com", - "homepage": "https://github.com/sagikazarmark" - }, - { - "name": "Tobias Schultze", - "email": "webmaster@tubo-world.de", - "homepage": "https://github.com/Tobion" + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" }, { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com", - "homepage": "https://sagikazarmark.hu" + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be" } ], - "description": "PSR-7 message implementation that also provides common utility methods", - "keywords": [ - "http", - "message", - "psr-7", - "request", - "response", - "stream", - "uri", - "url" - ], + "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", "support": { - "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.1.0" + "issues": "https://github.com/composer/package-versions-deprecated/issues", + "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.4" }, "funding": [ { - "url": "https://github.com/GrahamCampbell", - "type": "github" + "url": "https://packagist.com", + "type": "custom" }, { - "url": "https://github.com/Nyholm", + "url": "https://github.com/composer", "type": "github" }, { - "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7", + "url": "https://tidelift.com/funding/github/packagist/composer/composer", "type": "tidelift" } ], - "time": "2021-10-06T17:43:30+00:00" + "time": "2021-09-13T08:41:34+00:00" }, { - "name": "mustache/mustache", - "version": "v2.14.0", + "name": "composer/pcre", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/bobthecow/mustache.php.git", - "reference": "4e2724dd40ae9499a55e7db7df82665be0ab7e34" + "url": "https://github.com/composer/pcre.git", + "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/4e2724dd40ae9499a55e7db7df82665be0ab7e34", - "reference": "4e2724dd40ae9499a55e7db7df82665be0ab7e34", + "url": "https://api.github.com/repos/composer/pcre/zipball/3d322d715c43a1ac36c7fe215fa59336265500f2", + "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2", "shasum": "" }, "require": { - "php": ">=5.2.4" + "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "~1.11", - "phpunit/phpunit": "~3.7|~4.0|~5.0" + "phpstan/phpstan": "^1", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^4.2 || ^5" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, "autoload": { - "psr-0": { - "Mustache": "src/" + "psr-4": { + "Composer\\Pcre\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -2061,497 +2406,600 @@ ], "authors": [ { - "name": "Justin Hileman", - "email": "justin@justinhileman.info", - "homepage": "http://justinhileman.com" + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" } ], - "description": "A Mustache implementation in PHP.", - "homepage": "https://github.com/bobthecow/mustache.php", + "description": "PCRE wrapping library that offers type-safe preg_* replacements.", "keywords": [ - "mustache", - "templating" + "PCRE", + "preg", + "regex", + "regular expression" ], "support": { - "issues": "https://github.com/bobthecow/mustache.php/issues", - "source": "https://github.com/bobthecow/mustache.php/tree/v2.14.0" + "issues": "https://github.com/composer/pcre/issues", + "source": "https://github.com/composer/pcre/tree/1.0.0" }, - "time": "2021-12-14T14:42:17+00:00" + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2021-12-06T15:17:27+00:00" }, { - "name": "myclabs/deep-copy", - "version": "1.10.2", + "name": "composer/semver", + "version": "3.2.7", "source": { "type": "git", - "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220" + "url": "https://github.com/composer/semver.git", + "reference": "deac27056b57e46faf136fae7b449eeaa71661ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220", - "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220", + "url": "https://api.github.com/repos/composer/semver/zipball/deac27056b57e46faf136fae7b449eeaa71661ee", + "reference": "deac27056b57e46faf136fae7b449eeaa71661ee", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" - }, - "replace": { - "myclabs/deep-copy": "self.version" + "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "doctrine/collections": "^1.0", - "doctrine/common": "^2.6", - "phpunit/phpunit": "^7.1" + "phpstan/phpstan": "^0.12.54", + "symfony/phpunit-bridge": "^4.2 || ^5" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, "autoload": { "psr-4": { - "DeepCopy\\": "src/DeepCopy/" - }, - "files": [ - "src/DeepCopy/deep_copy.php" - ] + "Composer\\Semver\\": "src" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "description": "Create deep copies (clones) of your objects", + "authors": [ + { + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + }, + { + "name": "Rob Bast", + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" + } + ], + "description": "Semver library that offers utilities, version constraint parsing and validation.", "keywords": [ - "clone", - "copy", - "duplicate", - "object", - "object graph" + "semantic", + "semver", + "validation", + "versioning" ], "support": { - "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2" + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/semver/issues", + "source": "https://github.com/composer/semver/tree/3.2.7" }, "funding": [ { - "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", "type": "tidelift" } ], - "time": "2020-11-13T09:40:50+00:00" + "time": "2022-01-04T09:57:54+00:00" }, { - "name": "netresearch/jsonmapper", - "version": "v4.0.0", + "name": "composer/xdebug-handler", + "version": "3.0.1", "source": { "type": "git", - "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d" + "url": "https://github.com/composer/xdebug-handler.git", + "reference": "12f1b79476638a5615ed00ea6adbb269cec96fd8" }, "dist": { - "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d", - "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d", + "type": "zip", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/12f1b79476638a5615ed00ea6adbb269cec96fd8", + "reference": "12f1b79476638a5615ed00ea6adbb269cec96fd8", "shasum": "" }, "require": { - "ext-json": "*", - "ext-pcre": "*", - "ext-reflection": "*", - "ext-spl": "*", - "php": ">=7.1" + "composer/pcre": "^1", + "php": "^7.2.5 || ^8.0", + "psr/log": "^1 || ^2 || ^3" }, "require-dev": { - "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0", - "squizlabs/php_codesniffer": "~3.5" + "phpstan/phpstan": "^1.0", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^6.0" }, "type": "library", "autoload": { - "psr-0": { - "JsonMapper": "src/" + "psr-4": { + "Composer\\XdebugHandler\\": "src" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "OSL-3.0" + "MIT" ], "authors": [ { - "name": "Christian Weiske", - "email": "cweiske@cweiske.de", - "homepage": "http://github.com/cweiske/jsonmapper/", - "role": "Developer" + "name": "John Stevenson", + "email": "john-stevenson@blueyonder.co.uk" } ], - "description": "Map nested JSON structures onto PHP classes", + "description": "Restarts a process without Xdebug.", + "keywords": [ + "Xdebug", + "performance" + ], "support": { - "email": "cweiske@cweiske.de", - "issues": "https://github.com/cweiske/jsonmapper/issues", - "source": "https://github.com/cweiske/jsonmapper/tree/v4.0.0" + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/xdebug-handler/issues", + "source": "https://github.com/composer/xdebug-handler/tree/3.0.1" }, - "time": "2020-12-01T19:48:11+00:00" + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2022-01-04T18:29:42+00:00" }, { - "name": "nikic/php-parser", - "version": "v4.13.2", + "name": "dnoegel/php-xdg-base-dir", + "version": "v0.1.1", "source": { "type": "git", - "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "210577fe3cf7badcc5814d99455df46564f3c077" + "url": "https://github.com/dnoegel/php-xdg-base-dir.git", + "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077", - "reference": "210577fe3cf7badcc5814d99455df46564f3c077", + "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd", + "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd", "shasum": "" }, "require": { - "ext-tokenizer": "*", - "php": ">=7.0" + "php": ">=5.3.2" }, "require-dev": { - "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "~7.0|~6.0|~5.0|~4.8.35" }, - "bin": [ - "bin/php-parse" - ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.9-dev" - } - }, "autoload": { "psr-4": { - "PhpParser\\": "lib/PhpParser" + "XdgBaseDir\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Nikita Popov" - } - ], - "description": "A PHP parser written in PHP", - "keywords": [ - "parser", - "php" + "MIT" ], + "description": "implementation of xdg base directory specification for php", "support": { - "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2" + "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues", + "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1" }, - "time": "2021-11-30T19:35:32+00:00" + "time": "2019-12-04T15:06:13+00:00" }, { - "name": "openlss/lib-array2xml", - "version": "1.0.0", + "name": "doctrine/annotations", + "version": "1.13.2", "source": { "type": "git", - "url": "https://github.com/nullivex/lib-array2xml.git", - "reference": "a91f18a8dfc69ffabe5f9b068bc39bb202c81d90" + "url": "https://github.com/doctrine/annotations.git", + "reference": "5b668aef16090008790395c02c893b1ba13f7e08" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nullivex/lib-array2xml/zipball/a91f18a8dfc69ffabe5f9b068bc39bb202c81d90", - "reference": "a91f18a8dfc69ffabe5f9b068bc39bb202c81d90", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/5b668aef16090008790395c02c893b1ba13f7e08", + "reference": "5b668aef16090008790395c02c893b1ba13f7e08", "shasum": "" }, "require": { - "php": ">=5.3.2" + "doctrine/lexer": "1.*", + "ext-tokenizer": "*", + "php": "^7.1 || ^8.0", + "psr/cache": "^1 || ^2 || ^3" + }, + "require-dev": { + "doctrine/cache": "^1.11 || ^2.0", + "doctrine/coding-standard": "^6.0 || ^8.1", + "phpstan/phpstan": "^0.12.20", + "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5", + "symfony/cache": "^4.4 || ^5.2" }, "type": "library", "autoload": { - "psr-0": { - "LSS": "" + "psr-4": { + "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "Apache-2.0" + "MIT" ], "authors": [ { - "name": "Bryan Tong", - "email": "bryan@nullivex.com", - "homepage": "https://www.nullivex.com" + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" }, { - "name": "Tony Butler", - "email": "spudz76@gmail.com", - "homepage": "https://www.nullivex.com" + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" } ], - "description": "Array2XML conversion library credit to lalit.org", - "homepage": "https://www.nullivex.com", + "description": "Docblock Annotations Parser", + "homepage": "https://www.doctrine-project.org/projects/annotations.html", "keywords": [ - "array", - "array conversion", - "xml", - "xml conversion" + "annotations", + "docblock", + "parser" ], "support": { - "issues": "https://github.com/nullivex/lib-array2xml/issues", - "source": "https://github.com/nullivex/lib-array2xml/tree/master" + "issues": "https://github.com/doctrine/annotations/issues", + "source": "https://github.com/doctrine/annotations/tree/1.13.2" }, - "time": "2019-03-29T20:06:56+00:00" + "time": "2021-08-05T19:00:23+00:00" }, { - "name": "phalcon/ide-stubs", - "version": "v4.1.0", + "name": "doctrine/instantiator", + "version": "1.4.0", "source": { "type": "git", - "url": "https://github.com/phalcon/ide-stubs.git", - "reference": "77384e4f42542f11b065b2a860b9bca2ea20ad5a" + "url": "https://github.com/doctrine/instantiator.git", + "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phalcon/ide-stubs/zipball/77384e4f42542f11b065b2a860b9bca2ea20ad5a", - "reference": "77384e4f42542f11b065b2a860b9bca2ea20ad5a", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b", + "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b", "shasum": "" }, "require": { - "php": ">=7.2.0" + "php": "^7.1 || ^8.0" }, "require-dev": { - "squizlabs/php_codesniffer": "3.*", - "vimeo/psalm": "^3.4" + "doctrine/coding-standard": "^8.0", + "ext-pdo": "*", + "ext-phar": "*", + "phpbench/phpbench": "^0.13 || 1.0.0-alpha2", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" + } + }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Phalcon Team", - "email": "team@phalcon.io", - "homepage": "https://phalcon.io/en-us/team" - }, - { - "name": "Contributors", - "homepage": "https://github.com/phalcon/ide-stubs/graphs/contributors" + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "https://ocramius.github.io/" } ], - "description": "The most complete Phalcon Framework IDE stubs library which enables autocompletion in modern IDEs.", - "homepage": "https://phalcon.io", + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://www.doctrine-project.org/projects/instantiator.html", "keywords": [ - "Devtools", - "Eclipse", - "autocomplete", - "ide", - "netbeans", - "phalcon", - "phpstorm", - "stub", - "stubs" + "constructor", + "instantiate" ], "support": { - "forum": "https://forum.phalcon.io/", - "issues": "https://github.com/phalcon/ide-stubs/issues", - "source": "https://github.com/phalcon/ide-stubs" + "issues": "https://github.com/doctrine/instantiator/issues", + "source": "https://github.com/doctrine/instantiator/tree/1.4.0" }, "funding": [ { - "url": "https://github.com/phalcon", - "type": "github" + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" }, { - "url": "https://opencollective.com/phalcon", - "type": "open_collective" + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", + "type": "tidelift" } ], - "time": "2020-11-13T10:58:11+00:00" + "time": "2020-11-10T18:47:58+00:00" }, { - "name": "phar-io/manifest", - "version": "2.0.3", + "name": "doctrine/lexer", + "version": "1.2.2", "source": { "type": "git", - "url": "https://github.com/phar-io/manifest.git", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53" + "url": "https://github.com/doctrine/lexer.git", + "reference": "9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c", + "reference": "9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c", "shasum": "" }, - "require": { - "ext-dom": "*", - "ext-phar": "*", - "ext-xmlwriter": "*", - "phar-io/version": "^3.0.1", - "php": "^7.2 || ^8.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } + "require": { + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "doctrine/coding-standard": "^9.0", + "phpstan/phpstan": "1.3", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "vimeo/psalm": "^4.11" }, + "type": "library", "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" }, { - "name": "Sebastian Heuer", - "email": "sebastian@phpeople.de", - "role": "Developer" + "name": "Roman Borschel", + "email": "roman@code-factory.org" }, { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "Developer" + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" } ], - "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", + "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.", + "homepage": "https://www.doctrine-project.org/projects/lexer.html", + "keywords": [ + "annotations", + "docblock", + "lexer", + "parser", + "php" + ], "support": { - "issues": "https://github.com/phar-io/manifest/issues", - "source": "https://github.com/phar-io/manifest/tree/2.0.3" + "issues": "https://github.com/doctrine/lexer/issues", + "source": "https://github.com/doctrine/lexer/tree/1.2.2" }, - "time": "2021-07-20T11:28:43+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", + "type": "tidelift" + } + ], + "time": "2022-01-12T08:27:12+00:00" }, { - "name": "phar-io/version", - "version": "3.1.0", + "name": "felixfbecker/advanced-json-rpc", + "version": "v3.2.1", "source": { "type": "git", - "url": "https://github.com/phar-io/version.git", - "reference": "bae7c545bef187884426f042434e561ab1ddb182" + "url": "https://github.com/felixfbecker/php-advanced-json-rpc.git", + "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/version/zipball/bae7c545bef187884426f042434e561ab1ddb182", - "reference": "bae7c545bef187884426f042434e561ab1ddb182", + "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/b5f37dbff9a8ad360ca341f3240dc1c168b45447", + "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", + "php": "^7.1 || ^8.0", + "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0" + }, + "require-dev": { + "phpunit/phpunit": "^7.0 || ^8.0" }, "type": "library", "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "AdvancedJsonRpc\\": "lib/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "ISC" ], "authors": [ { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" - }, - { - "name": "Sebastian Heuer", - "email": "sebastian@phpeople.de", - "role": "Developer" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "Developer" + "name": "Felix Becker", + "email": "felix.b@outlook.com" } ], - "description": "Library for handling version information and constraints", + "description": "A more advanced JSONRPC implementation", "support": { - "issues": "https://github.com/phar-io/version/issues", - "source": "https://github.com/phar-io/version/tree/3.1.0" + "issues": "https://github.com/felixfbecker/php-advanced-json-rpc/issues", + "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/v3.2.1" }, - "time": "2021-02-23T14:00:09+00:00" + "time": "2021-06-11T22:34:44+00:00" }, { - "name": "php-cs-fixer/diff", - "version": "v2.0.2", + "name": "felixfbecker/language-server-protocol", + "version": "1.5.1", "source": { "type": "git", - "url": "https://github.com/PHP-CS-Fixer/diff.git", - "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3" + "url": "https://github.com/felixfbecker/php-language-server-protocol.git", + "reference": "9d846d1f5cf101deee7a61c8ba7caa0a975cd730" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/29dc0d507e838c4580d018bd8b5cb412474f7ec3", - "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3", + "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/9d846d1f5cf101deee7a61c8ba7caa0a975cd730", + "reference": "9d846d1f5cf101deee7a61c8ba7caa0a975cd730", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0 || ^8.0" + "php": ">=7.1" }, "require-dev": { - "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0", - "symfony/process": "^3.3" + "phpstan/phpstan": "*", + "squizlabs/php_codesniffer": "^3.1", + "vimeo/psalm": "^4.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "LanguageServerProtocol\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "ISC" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" + "name": "Felix Becker", + "email": "felix.b@outlook.com" } ], - "description": "sebastian/diff v3 backport support for PHP 5.6+", - "homepage": "https://github.com/PHP-CS-Fixer", + "description": "PHP classes for the Language Server Protocol", "keywords": [ - "diff" + "language", + "microsoft", + "php", + "server" ], "support": { - "issues": "https://github.com/PHP-CS-Fixer/diff/issues", - "source": "https://github.com/PHP-CS-Fixer/diff/tree/v2.0.2" + "issues": "https://github.com/felixfbecker/php-language-server-protocol/issues", + "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/1.5.1" }, - "time": "2020-10-14T08:32:19+00:00" + "time": "2021-02-22T14:02:09+00:00" }, { - "name": "phpdocumentor/reflection-common", - "version": "2.2.0", + "name": "friendsofphp/php-cs-fixer", + "version": "v3.5.0", "source": { "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b" + "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", + "reference": "333f15e07c866e33e2765e84ba1e0b88e6a3af3b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b", - "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/333f15e07c866e33e2765e84ba1e0b88e6a3af3b", + "reference": "333f15e07c866e33e2765e84ba1e0b88e6a3af3b", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "composer/semver": "^3.2", + "composer/xdebug-handler": "^3.0", + "doctrine/annotations": "^1.13", + "ext-json": "*", + "ext-tokenizer": "*", + "php": "^7.4 || ^8.0", + "php-cs-fixer/diff": "^2.0", + "symfony/console": "^5.4 || ^6.0", + "symfony/event-dispatcher": "^5.4 || ^6.0", + "symfony/filesystem": "^5.4 || ^6.0", + "symfony/finder": "^5.4 || ^6.0", + "symfony/options-resolver": "^5.4 || ^6.0", + "symfony/polyfill-mbstring": "^1.23", + "symfony/polyfill-php80": "^1.23", + "symfony/polyfill-php81": "^1.23", + "symfony/process": "^5.4 || ^6.0", + "symfony/stopwatch": "^5.4 || ^6.0" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-2.x": "2.x-dev" - } + "require-dev": { + "justinrainbow/json-schema": "^5.2", + "keradus/cli-executor": "^1.5", + "mikey179/vfsstream": "^1.6.10", + "php-coveralls/php-coveralls": "^2.5.2", + "php-cs-fixer/accessible-object": "^1.1", + "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2", + "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1", + "phpspec/prophecy": "^1.15", + "phpspec/prophecy-phpunit": "^2.0", + "phpunit/phpunit": "^9.5", + "phpunitgoodpractices/polyfill": "^1.5", + "phpunitgoodpractices/traits": "^1.9.1", + "symfony/phpunit-bridge": "^6.0", + "symfony/yaml": "^5.4 || ^6.0" + }, + "suggest": { + "ext-dom": "For handling output formats in XML", + "ext-mbstring": "For handling non-UTF8 characters." }, + "bin": [ + "php-cs-fixer" + ], + "type": "application", "autoload": { "psr-4": { - "phpDocumentor\\Reflection\\": "src/" + "PhpCsFixer\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2560,59 +3008,52 @@ ], "authors": [ { - "name": "Jaap van Otterdijk", - "email": "opensource@ijaap.nl" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Dariusz Rumiński", + "email": "dariusz.ruminski@gmail.com" } ], - "description": "Common reflection classes used by phpdocumentor to reflect the code structure", - "homepage": "http://www.phpdoc.org", - "keywords": [ - "FQSEN", - "phpDocumentor", - "phpdoc", - "reflection", - "static analysis" - ], + "description": "A tool to automatically fix PHP code style", "support": { - "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues", - "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x" + "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", + "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.5.0" }, - "time": "2020-06-27T09:03:43+00:00" + "funding": [ + { + "url": "https://github.com/keradus", + "type": "github" + } + ], + "time": "2022-01-14T00:29:20+00:00" }, { - "name": "phpdocumentor/reflection-docblock", - "version": "5.3.0", + "name": "graham-campbell/result-type", + "version": "v1.0.4", "source": { "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" + "url": "https://github.com/GrahamCampbell/Result-Type.git", + "reference": "0690bde05318336c7221785f2a932467f98b64ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", + "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/0690bde05318336c7221785f2a932467f98b64ca", + "reference": "0690bde05318336c7221785f2a932467f98b64ca", "shasum": "" }, "require": { - "ext-filter": "*", - "php": "^7.2 || ^8.0", - "phpdocumentor/reflection-common": "^2.2", - "phpdocumentor/type-resolver": "^1.3", - "webmozart/assert": "^1.9.1" - }, - "require-dev": { - "mockery/mockery": "~1.3.2", - "psalm/phar": "^4.8" + "php": "^7.0 || ^8.0", + "phpoption/phpoption": "^1.8" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.x-dev" - } + "require-dev": { + "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8" }, + "type": "library", "autoload": { "psr-4": { - "phpDocumentor\\Reflection\\": "src" + "GrahamCampbell\\ResultType\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2621,53 +3062,85 @@ ], "authors": [ { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - }, - { - "name": "Jaap van Otterdijk", - "email": "account@ijaap.nl" + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" } ], - "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", + "description": "An Implementation Of The Result Type", + "keywords": [ + "Graham Campbell", + "GrahamCampbell", + "Result Type", + "Result-Type", + "result" + ], "support": { - "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" + "issues": "https://github.com/GrahamCampbell/Result-Type/issues", + "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.0.4" }, - "time": "2021-10-19T17:43:47+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/graham-campbell/result-type", + "type": "tidelift" + } + ], + "time": "2021-11-21T21:41:47+00:00" }, { - "name": "phpdocumentor/type-resolver", - "version": "1.5.1", + "name": "guzzlehttp/guzzle", + "version": "7.4.1", "source": { "type": "git", - "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae" + "url": "https://github.com/guzzle/guzzle.git", + "reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/a12f7e301eb7258bb68acd89d4aefa05c2906cae", - "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ee0a041b1760e6a53d2a39c8c34115adc2af2c79", + "reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0", - "phpdocumentor/reflection-common": "^2.0" + "ext-json": "*", + "guzzlehttp/promises": "^1.5", + "guzzlehttp/psr7": "^1.8.3 || ^2.1", + "php": "^7.2.5 || ^8.0", + "psr/http-client": "^1.0", + "symfony/deprecation-contracts": "^2.2 || ^3.0" + }, + "provide": { + "psr/http-client-implementation": "1.0" }, "require-dev": { - "ext-tokenizer": "*", - "psalm/phar": "^4.8" + "bamarni/composer-bin-plugin": "^1.4.1", + "ext-curl": "*", + "php-http/client-integration-tests": "^3.0", + "phpunit/phpunit": "^8.5.5 || ^9.3.5", + "psr/log": "^1.1 || ^2.0 || ^3.0" + }, + "suggest": { + "ext-curl": "Required for CURL handler support", + "ext-intl": "Required for Internationalized Domain Name (IDN) support", + "psr/log": "Required for using the Log middleware" }, "type": "library", "extra": { "branch-alias": { - "dev-1.x": "1.x-dev" + "dev-master": "7.4-dev" } }, "autoload": { "psr-4": { - "phpDocumentor\\Reflection\\": "src" - } + "GuzzleHttp\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2675,52 +3148,106 @@ ], "authors": [ { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Jeremy Lindblom", + "email": "jeremeamia@gmail.com", + "homepage": "https://github.com/jeremeamia" + }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" } ], - "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", + "description": "Guzzle is a PHP HTTP client library", + "keywords": [ + "client", + "curl", + "framework", + "http", + "http client", + "psr-18", + "psr-7", + "rest", + "web service" + ], "support": { - "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.5.1" + "issues": "https://github.com/guzzle/guzzle/issues", + "source": "https://github.com/guzzle/guzzle/tree/7.4.1" }, - "time": "2021-10-02T14:08:47+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle", + "type": "tidelift" + } + ], + "time": "2021-12-06T18:43:05+00:00" }, { - "name": "phpspec/prophecy", - "version": "v1.15.0", + "name": "guzzlehttp/promises", + "version": "1.5.1", "source": { "type": "git", - "url": "https://github.com/phpspec/prophecy.git", - "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13" + "url": "https://github.com/guzzle/promises.git", + "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13", - "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13", + "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da", + "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.2", - "php": "^7.2 || ~8.0, <8.2", - "phpdocumentor/reflection-docblock": "^5.2", - "sebastian/comparator": "^3.0 || ^4.0", - "sebastian/recursion-context": "^3.0 || ^4.0" + "php": ">=5.5" }, "require-dev": { - "phpspec/phpspec": "^6.0 || ^7.0", - "phpunit/phpunit": "^8.0 || ^9.0" + "symfony/phpunit-bridge": "^4.4 || ^5.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.x-dev" + "dev-master": "1.5-dev" } }, "autoload": { "psr-4": { - "Prophecy\\": "src/Prophecy" - } + "GuzzleHttp\\Promise\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2728,299 +3255,356 @@ ], "authors": [ { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" }, { - "name": "Marcello Duarte", - "email": "marcello.duarte@gmail.com" + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" } ], - "description": "Highly opinionated mocking framework for PHP 5.3+", - "homepage": "https://github.com/phpspec/prophecy", + "description": "Guzzle promises library", "keywords": [ - "Double", - "Dummy", - "fake", - "mock", - "spy", - "stub" + "promise" ], "support": { - "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.15.0" + "issues": "https://github.com/guzzle/promises/issues", + "source": "https://github.com/guzzle/promises/tree/1.5.1" }, - "time": "2021-12-08T12:19:24+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises", + "type": "tidelift" + } + ], + "time": "2021-10-22T20:56:57+00:00" }, { - "name": "phpunit/php-code-coverage", - "version": "7.0.15", + "name": "guzzlehttp/psr7", + "version": "2.1.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "819f92bba8b001d4363065928088de22f25a3a48" + "url": "https://github.com/guzzle/psr7.git", + "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/819f92bba8b001d4363065928088de22f25a3a48", - "reference": "819f92bba8b001d4363065928088de22f25a3a48", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/089edd38f5b8abba6cb01567c2a8aaa47cec4c72", + "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72", "shasum": "" }, "require": { - "ext-dom": "*", - "ext-xmlwriter": "*", - "php": ">=7.2", - "phpunit/php-file-iterator": "^2.0.2", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^3.1.3 || ^4.0", - "sebastian/code-unit-reverse-lookup": "^1.0.1", - "sebastian/environment": "^4.2.2", - "sebastian/version": "^2.0.1", - "theseer/tokenizer": "^1.1.3" + "php": "^7.2.5 || ^8.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.0", + "ralouphie/getallheaders": "^3.0" + }, + "provide": { + "psr/http-factory-implementation": "1.0", + "psr/http-message-implementation": "1.0" }, "require-dev": { - "phpunit/phpunit": "^8.2.2" + "bamarni/composer-bin-plugin": "^1.4.1", + "http-interop/http-factory-tests": "^0.9", + "phpunit/phpunit": "^8.5.8 || ^9.3.10" }, "suggest": { - "ext-xdebug": "^2.7.2" + "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "7.0-dev" + "dev-master": "2.1-dev" } }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "GuzzleHttp\\Psr7\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://sagikazarmark.hu" } ], - "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", - "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "description": "PSR-7 message implementation that also provides common utility methods", "keywords": [ - "coverage", - "testing", - "xunit" + "http", + "message", + "psr-7", + "request", + "response", + "stream", + "uri", + "url" ], "support": { - "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/7.0.15" + "issues": "https://github.com/guzzle/psr7/issues", + "source": "https://github.com/guzzle/psr7/tree/2.1.0" }, "funding": [ { - "url": "https://github.com/sebastianbergmann", + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7", + "type": "tidelift" } ], - "time": "2021-07-26T12:20:09+00:00" + "time": "2021-10-06T17:43:30+00:00" }, { - "name": "phpunit/php-file-iterator", - "version": "2.0.5", + "name": "mustache/mustache", + "version": "v2.14.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5" + "url": "https://github.com/bobthecow/mustache.php.git", + "reference": "4e2724dd40ae9499a55e7db7df82665be0ab7e34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5", - "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5", + "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/4e2724dd40ae9499a55e7db7df82665be0ab7e34", + "reference": "4e2724dd40ae9499a55e7db7df82665be0ab7e34", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=5.2.4" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "friendsofphp/php-cs-fixer": "~1.11", + "phpunit/phpunit": "~3.7|~4.0|~5.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, "autoload": { - "classmap": [ - "src/" - ] + "psr-0": { + "Mustache": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "name": "Justin Hileman", + "email": "justin@justinhileman.info", + "homepage": "http://justinhileman.com" } ], - "description": "FilterIterator implementation that filters files based on a list of suffixes.", - "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "description": "A Mustache implementation in PHP.", + "homepage": "https://github.com/bobthecow/mustache.php", "keywords": [ - "filesystem", - "iterator" + "mustache", + "templating" ], "support": { - "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.5" + "issues": "https://github.com/bobthecow/mustache.php/issues", + "source": "https://github.com/bobthecow/mustache.php/tree/v2.14.0" }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2021-12-02T12:42:26+00:00" + "time": "2021-12-14T14:42:17+00:00" }, { - "name": "phpunit/php-text-template", - "version": "1.2.1", + "name": "myclabs/deep-copy", + "version": "1.10.2", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" + "url": "https://github.com/myclabs/DeepCopy.git", + "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220", + "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "doctrine/collections": "^1.0", + "doctrine/common": "^2.6", + "phpunit/phpunit": "^7.1" }, "type": "library", "autoload": { - "classmap": [ - "src/" + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + }, + "files": [ + "src/DeepCopy/deep_copy.php" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } + "MIT" ], - "description": "Simple template engine.", - "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "description": "Create deep copies (clones) of your objects", "keywords": [ - "template" + "clone", + "copy", + "duplicate", + "object", + "object graph" ], "support": { - "issues": "https://github.com/sebastianbergmann/php-text-template/issues", - "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1" + "issues": "https://github.com/myclabs/DeepCopy/issues", + "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2" }, - "time": "2015-06-21T13:50:34+00:00" + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", + "type": "tidelift" + } + ], + "time": "2020-11-13T09:40:50+00:00" }, { - "name": "phpunit/php-timer", - "version": "2.1.3", + "name": "netresearch/jsonmapper", + "version": "v4.0.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662" + "url": "https://github.com/cweiske/jsonmapper.git", + "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/2454ae1765516d20c4ffe103d85a58a9a3bd5662", - "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d", + "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d", "shasum": "" }, "require": { + "ext-json": "*", + "ext-pcre": "*", + "ext-reflection": "*", + "ext-spl": "*", "php": ">=7.1" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0", + "squizlabs/php_codesniffer": "~3.5" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.1-dev" - } - }, "autoload": { - "classmap": [ - "src/" - ] + "psr-0": { + "JsonMapper": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "OSL-3.0" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "name": "Christian Weiske", + "email": "cweiske@cweiske.de", + "homepage": "http://github.com/cweiske/jsonmapper/", + "role": "Developer" } ], - "description": "Utility class for timing", - "homepage": "https://github.com/sebastianbergmann/php-timer/", - "keywords": [ - "timer" - ], + "description": "Map nested JSON structures onto PHP classes", "support": { - "issues": "https://github.com/sebastianbergmann/php-timer/issues", - "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.3" + "email": "cweiske@cweiske.de", + "issues": "https://github.com/cweiske/jsonmapper/issues", + "source": "https://github.com/cweiske/jsonmapper/tree/v4.0.0" }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T08:20:02+00:00" + "time": "2020-12-01T19:48:11+00:00" }, { - "name": "phpunit/php-token-stream", - "version": "4.0.4", + "name": "nikic/php-parser", + "version": "v4.13.2", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3" + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "210577fe3cf7badcc5814d99455df46564f3c077" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/a853a0e183b9db7eed023d7933a858fa1c8d25a3", - "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077", + "reference": "210577fe3cf7badcc5814d99455df46564f3c077", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": "^7.3 || ^8.0" + "php": ">=7.0" }, "require-dev": { - "phpunit/phpunit": "^9.0" + "ircmaxell/php-yacc": "^0.0.7", + "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" }, + "bin": [ + "bin/php-parse" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.9-dev" } }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3028,365 +3612,329 @@ ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "name": "Nikita Popov" } ], - "description": "Wrapper around PHP's tokenizer extension.", - "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "description": "A PHP parser written in PHP", "keywords": [ - "tokenizer" + "parser", + "php" ], "support": { - "issues": "https://github.com/sebastianbergmann/php-token-stream/issues", - "source": "https://github.com/sebastianbergmann/php-token-stream/tree/master" + "issues": "https://github.com/nikic/PHP-Parser/issues", + "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2" }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "abandoned": true, - "time": "2020-08-04T08:28:15+00:00" + "time": "2021-11-30T19:35:32+00:00" }, { - "name": "phpunit/phpunit", - "version": "8.5.22", + "name": "openlss/lib-array2xml", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "ddd05b9d844260353895a3b950a9258126c11503" + "url": "https://github.com/nullivex/lib-array2xml.git", + "reference": "a91f18a8dfc69ffabe5f9b068bc39bb202c81d90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ddd05b9d844260353895a3b950a9258126c11503", - "reference": "ddd05b9d844260353895a3b950a9258126c11503", + "url": "https://api.github.com/repos/nullivex/lib-array2xml/zipball/a91f18a8dfc69ffabe5f9b068bc39bb202c81d90", + "reference": "a91f18a8dfc69ffabe5f9b068bc39bb202c81d90", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.3.1", - "ext-dom": "*", - "ext-json": "*", - "ext-libxml": "*", - "ext-mbstring": "*", - "ext-xml": "*", - "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.10.0", - "phar-io/manifest": "^2.0.3", - "phar-io/version": "^3.0.2", - "php": ">=7.2", - "phpspec/prophecy": "^1.10.3", - "phpunit/php-code-coverage": "^7.0.12", - "phpunit/php-file-iterator": "^2.0.4", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-timer": "^2.1.2", - "sebastian/comparator": "^3.0.2", - "sebastian/diff": "^3.0.2", - "sebastian/environment": "^4.2.3", - "sebastian/exporter": "^3.1.2", - "sebastian/global-state": "^3.0.0", - "sebastian/object-enumerator": "^3.0.3", - "sebastian/resource-operations": "^2.0.1", - "sebastian/type": "^1.1.3", - "sebastian/version": "^2.0.1" - }, - "require-dev": { - "ext-pdo": "*" - }, - "suggest": { - "ext-soap": "*", - "ext-xdebug": "*", - "phpunit/php-invoker": "^2.0.0" + "php": ">=5.3.2" }, - "bin": [ - "phpunit" - ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "8.5-dev" - } - }, "autoload": { - "classmap": [ - "src/" - ] + "psr-0": { + "LSS": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "Apache-2.0" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "name": "Bryan Tong", + "email": "bryan@nullivex.com", + "homepage": "https://www.nullivex.com" + }, + { + "name": "Tony Butler", + "email": "spudz76@gmail.com", + "homepage": "https://www.nullivex.com" } ], - "description": "The PHP Unit Testing framework.", - "homepage": "https://phpunit.de/", + "description": "Array2XML conversion library credit to lalit.org", + "homepage": "https://www.nullivex.com", "keywords": [ - "phpunit", - "testing", - "xunit" + "array", + "array conversion", + "xml", + "xml conversion" ], "support": { - "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.22" + "issues": "https://github.com/nullivex/lib-array2xml/issues", + "source": "https://github.com/nullivex/lib-array2xml/tree/master" }, - "funding": [ - { - "url": "https://phpunit.de/sponsors.html", - "type": "custom" - }, - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2021-12-25T06:58:09+00:00" + "time": "2019-03-29T20:06:56+00:00" }, { - "name": "predis/predis", - "version": "v1.1.9", + "name": "phalcon/ide-stubs", + "version": "v4.1.0", "source": { "type": "git", - "url": "https://github.com/predis/predis.git", - "reference": "c50c3393bb9f47fa012d0cdfb727a266b0818259" + "url": "https://github.com/phalcon/ide-stubs.git", + "reference": "77384e4f42542f11b065b2a860b9bca2ea20ad5a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/predis/predis/zipball/c50c3393bb9f47fa012d0cdfb727a266b0818259", - "reference": "c50c3393bb9f47fa012d0cdfb727a266b0818259", + "url": "https://api.github.com/repos/phalcon/ide-stubs/zipball/77384e4f42542f11b065b2a860b9bca2ea20ad5a", + "reference": "77384e4f42542f11b065b2a860b9bca2ea20ad5a", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=7.2.0" }, "require-dev": { - "phpunit/phpunit": "~4.8" - }, - "suggest": { - "ext-curl": "Allows access to Webdis when paired with phpiredis", - "ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol" + "squizlabs/php_codesniffer": "3.*", + "vimeo/psalm": "^3.4" }, "type": "library", - "autoload": { - "psr-4": { - "Predis\\": "src/" - } - }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Daniele Alessandri", - "email": "suppakilla@gmail.com", - "homepage": "http://clorophilla.net", - "role": "Creator & Maintainer" + "name": "Phalcon Team", + "email": "team@phalcon.io", + "homepage": "https://phalcon.io/en-us/team" }, { - "name": "Till Krüss", - "homepage": "https://till.im", - "role": "Maintainer" + "name": "Contributors", + "homepage": "https://github.com/phalcon/ide-stubs/graphs/contributors" } ], - "description": "Flexible and feature-complete Redis client for PHP and HHVM", - "homepage": "http://github.com/predis/predis", + "description": "The most complete Phalcon Framework IDE stubs library which enables autocompletion in modern IDEs.", + "homepage": "https://phalcon.io", "keywords": [ - "nosql", - "predis", - "redis" + "Devtools", + "Eclipse", + "autocomplete", + "ide", + "netbeans", + "phalcon", + "phpstorm", + "stub", + "stubs" ], "support": { - "issues": "https://github.com/predis/predis/issues", - "source": "https://github.com/predis/predis/tree/v1.1.9" + "forum": "https://forum.phalcon.io/", + "issues": "https://github.com/phalcon/ide-stubs/issues", + "source": "https://github.com/phalcon/ide-stubs" }, "funding": [ { - "url": "https://github.com/sponsors/tillkruss", + "url": "https://github.com/phalcon", "type": "github" + }, + { + "url": "https://opencollective.com/phalcon", + "type": "open_collective" } ], - "time": "2021-10-05T19:02:38+00:00" + "time": "2020-11-13T10:58:11+00:00" }, { - "name": "psr/cache", - "version": "1.0.1", + "name": "phar-io/manifest", + "version": "2.0.3", "source": { "type": "git", - "url": "https://github.com/php-fig/cache.git", - "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8" + "url": "https://github.com/phar-io/manifest.git", + "reference": "97803eca37d319dfa7826cc2437fc020857acb53" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8", - "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", + "reference": "97803eca37d319dfa7826cc2437fc020857acb53", "shasum": "" }, "require": { - "php": ">=5.3.0" + "ext-dom": "*", + "ext-phar": "*", + "ext-xmlwriter": "*", + "phar-io/version": "^3.0.1", + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { - "psr-4": { - "Psr\\Cache\\": "src/" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" } ], - "description": "Common interface for caching libraries", - "keywords": [ - "cache", - "psr", - "psr-6" - ], + "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", "support": { - "source": "https://github.com/php-fig/cache/tree/master" + "issues": "https://github.com/phar-io/manifest/issues", + "source": "https://github.com/phar-io/manifest/tree/2.0.3" }, - "time": "2016-08-06T20:24:11+00:00" + "time": "2021-07-20T11:28:43+00:00" }, { - "name": "psr/container", - "version": "1.1.2", + "name": "phar-io/version", + "version": "3.1.0", "source": { "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" + "url": "https://github.com/phar-io/version.git", + "reference": "bae7c545bef187884426f042434e561ab1ddb182" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", + "url": "https://api.github.com/repos/phar-io/version/zipball/bae7c545bef187884426f042434e561ab1ddb182", + "reference": "bae7c545bef187884426f042434e561ab1ddb182", "shasum": "" }, "require": { - "php": ">=7.4.0" + "php": "^7.2 || ^8.0" }, "type": "library", "autoload": { - "psr-4": { - "Psr\\Container\\": "src/" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" } ], - "description": "Common Container Interface (PHP FIG PSR-11)", - "homepage": "https://github.com/php-fig/container", - "keywords": [ - "PSR-11", - "container", - "container-interface", - "container-interop", - "psr" - ], + "description": "Library for handling version information and constraints", "support": { - "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.2" + "issues": "https://github.com/phar-io/version/issues", + "source": "https://github.com/phar-io/version/tree/3.1.0" }, - "time": "2021-11-05T16:50:12+00:00" + "time": "2021-02-23T14:00:09+00:00" }, { - "name": "psr/event-dispatcher", - "version": "1.0.0", + "name": "php-cs-fixer/diff", + "version": "v2.0.2", "source": { "type": "git", - "url": "https://github.com/php-fig/event-dispatcher.git", - "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" + "url": "https://github.com/PHP-CS-Fixer/diff.git", + "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", - "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", + "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/29dc0d507e838c4580d018bd8b5cb412474f7ec3", + "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3", "shasum": "" }, "require": { - "php": ">=7.2.0" + "php": "^5.6 || ^7.0 || ^8.0" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } + "require-dev": { + "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0", + "symfony/process": "^3.3" }, + "type": "library", "autoload": { - "psr-4": { - "Psr\\EventDispatcher\\": "src/" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" } ], - "description": "Standard interfaces for event handling.", + "description": "sebastian/diff v3 backport support for PHP 5.6+", + "homepage": "https://github.com/PHP-CS-Fixer", "keywords": [ - "events", - "psr", - "psr-14" + "diff" ], "support": { - "issues": "https://github.com/php-fig/event-dispatcher/issues", - "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" + "issues": "https://github.com/PHP-CS-Fixer/diff/issues", + "source": "https://github.com/PHP-CS-Fixer/diff/tree/v2.0.2" }, - "time": "2019-01-08T18:20:26+00:00" + "time": "2020-10-14T08:32:19+00:00" }, { - "name": "psr/http-client", - "version": "1.0.1", + "name": "phpdocumentor/reflection-common", + "version": "2.2.0", "source": { "type": "git", - "url": "https://github.com/php-fig/http-client.git", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621" + "url": "https://github.com/phpDocumentor/ReflectionCommon.git", + "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b", + "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b", "shasum": "" }, "require": { - "php": "^7.0 || ^8.0", - "psr/http-message": "^1.0" + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-2.x": "2.x-dev" } }, "autoload": { "psr-4": { - "Psr\\Http\\Client\\": "src/" + "phpDocumentor\\Reflection\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -3395,50 +3943,59 @@ ], "authors": [ { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "name": "Jaap van Otterdijk", + "email": "opensource@ijaap.nl" } ], - "description": "Common interface for HTTP clients", - "homepage": "https://github.com/php-fig/http-client", + "description": "Common reflection classes used by phpdocumentor to reflect the code structure", + "homepage": "http://www.phpdoc.org", "keywords": [ - "http", - "http-client", - "psr", - "psr-18" + "FQSEN", + "phpDocumentor", + "phpdoc", + "reflection", + "static analysis" ], "support": { - "source": "https://github.com/php-fig/http-client/tree/master" + "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues", + "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x" }, - "time": "2020-06-29T06:28:15+00:00" + "time": "2020-06-27T09:03:43+00:00" }, { - "name": "psr/http-factory", - "version": "1.0.1", + "name": "phpdocumentor/reflection-docblock", + "version": "5.3.0", "source": { "type": "git", - "url": "https://github.com/php-fig/http-factory.git", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be" + "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", + "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", + "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", "shasum": "" }, "require": { - "php": ">=7.0.0", - "psr/http-message": "^1.0" + "ext-filter": "*", + "php": "^7.2 || ^8.0", + "phpdocumentor/reflection-common": "^2.2", + "phpdocumentor/type-resolver": "^1.3", + "webmozart/assert": "^1.9.1" + }, + "require-dev": { + "mockery/mockery": "~1.3.2", + "psalm/phar": "^4.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "5.x-dev" } }, "autoload": { "psr-4": { - "Psr\\Http\\Message\\": "src/" + "phpDocumentor\\Reflection\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -3447,52 +4004,52 @@ ], "authors": [ { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + }, + { + "name": "Jaap van Otterdijk", + "email": "account@ijaap.nl" } ], - "description": "Common interfaces for PSR-7 HTTP message factories", - "keywords": [ - "factory", - "http", - "message", - "psr", - "psr-17", - "psr-7", - "request", - "response" - ], + "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { - "source": "https://github.com/php-fig/http-factory/tree/master" + "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" }, - "time": "2019-04-30T12:38:16+00:00" + "time": "2021-10-19T17:43:47+00:00" }, { - "name": "psr/http-message", - "version": "1.0.1", + "name": "phpdocumentor/type-resolver", + "version": "1.6.0", "source": { "type": "git", - "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + "url": "https://github.com/phpDocumentor/TypeResolver.git", + "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706", + "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.2 || ^8.0", + "phpdocumentor/reflection-common": "^2.0" + }, + "require-dev": { + "ext-tokenizer": "*", + "psalm/phar": "^4.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-1.x": "1.x-dev" } }, "autoload": { "psr-4": { - "Psr\\Http\\Message\\": "src/" + "phpDocumentor\\Reflection\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -3501,101 +4058,123 @@ ], "authors": [ { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "name": "Mike van Riel", + "email": "me@mikevanriel.com" } ], - "description": "Common interface for HTTP messages", - "homepage": "https://github.com/php-fig/http-message", - "keywords": [ - "http", - "http-message", - "psr", - "psr-7", - "request", - "response" - ], + "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { - "source": "https://github.com/php-fig/http-message/tree/master" + "issues": "https://github.com/phpDocumentor/TypeResolver/issues", + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.0" }, - "time": "2016-08-06T14:39:51+00:00" + "time": "2022-01-04T19:58:01+00:00" }, { - "name": "psr/log", - "version": "1.1.4", + "name": "phpoption/phpoption", + "version": "1.8.1", "source": { "type": "git", - "url": "https://github.com/php-fig/log.git", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11" + "url": "https://github.com/schmittjoh/php-option.git", + "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15", + "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.0 || ^8.0" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.4.1", + "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "1.8-dev" } }, "autoload": { "psr-4": { - "Psr\\Log\\": "Psr/Log/" + "PhpOption\\": "src/PhpOption/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "Apache-2.0" ], "authors": [ { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh" + }, + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" } - ], - "description": "Common interface for logging libraries", - "homepage": "https://github.com/php-fig/log", + ], + "description": "Option Type for PHP", "keywords": [ - "log", - "psr", - "psr-3" + "language", + "option", + "php", + "type" ], "support": { - "source": "https://github.com/php-fig/log/tree/1.1.4" + "issues": "https://github.com/schmittjoh/php-option/issues", + "source": "https://github.com/schmittjoh/php-option/tree/1.8.1" }, - "time": "2021-05-03T11:20:27+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption", + "type": "tidelift" + } + ], + "time": "2021-12-04T23:24:31+00:00" }, { - "name": "ralouphie/getallheaders", - "version": "3.0.3", + "name": "phpspec/prophecy", + "version": "v1.15.0", "source": { "type": "git", - "url": "https://github.com/ralouphie/getallheaders.git", - "reference": "120b605dfeb996808c31b6477290a714d356e822" + "url": "https://github.com/phpspec/prophecy.git", + "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", - "reference": "120b605dfeb996808c31b6477290a714d356e822", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13", + "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13", "shasum": "" }, "require": { - "php": ">=5.6" + "doctrine/instantiator": "^1.2", + "php": "^7.2 || ~8.0, <8.2", + "phpdocumentor/reflection-docblock": "^5.2", + "sebastian/comparator": "^3.0 || ^4.0", + "sebastian/recursion-context": "^3.0 || ^4.0" }, "require-dev": { - "php-coveralls/php-coveralls": "^2.1", - "phpunit/phpunit": "^5 || ^6.5" + "phpspec/phpspec": "^6.0 || ^7.0", + "phpunit/phpunit": "^8.0 || ^9.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, "autoload": { - "files": [ - "src/getallheaders.php" - ] + "psr-4": { + "Prophecy\\": "src/Prophecy" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3603,41 +4182,67 @@ ], "authors": [ { - "name": "Ralph Khattar", - "email": "ralph.khattar@gmail.com" + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + }, + { + "name": "Marcello Duarte", + "email": "marcello.duarte@gmail.com" } ], - "description": "A polyfill for getallheaders.", + "description": "Highly opinionated mocking framework for PHP 5.3+", + "homepage": "https://github.com/phpspec/prophecy", + "keywords": [ + "Double", + "Dummy", + "fake", + "mock", + "spy", + "stub" + ], "support": { - "issues": "https://github.com/ralouphie/getallheaders/issues", - "source": "https://github.com/ralouphie/getallheaders/tree/develop" + "issues": "https://github.com/phpspec/prophecy/issues", + "source": "https://github.com/phpspec/prophecy/tree/v1.15.0" }, - "time": "2019-03-08T08:55:37+00:00" + "time": "2021-12-08T12:19:24+00:00" }, { - "name": "sebastian/code-unit-reverse-lookup", - "version": "1.0.2", + "name": "phpunit/php-code-coverage", + "version": "7.0.15", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619" + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "819f92bba8b001d4363065928088de22f25a3a48" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/819f92bba8b001d4363065928088de22f25a3a48", + "reference": "819f92bba8b001d4363065928088de22f25a3a48", "shasum": "" }, "require": { - "php": ">=5.6" + "ext-dom": "*", + "ext-xmlwriter": "*", + "php": ">=7.2", + "phpunit/php-file-iterator": "^2.0.2", + "phpunit/php-text-template": "^1.2.1", + "phpunit/php-token-stream": "^3.1.3 || ^4.0", + "sebastian/code-unit-reverse-lookup": "^1.0.1", + "sebastian/environment": "^4.2.2", + "sebastian/version": "^2.0.1", + "theseer/tokenizer": "^1.1.3" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^8.2.2" + }, + "suggest": { + "ext-xdebug": "^2.7.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "7.0-dev" } }, "autoload": { @@ -3652,14 +4257,20 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "description": "Looks up which function or method a line of code belongs to", - "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ], "support": { - "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", - "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2" + "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/7.0.15" }, "funding": [ { @@ -3667,26 +4278,24 @@ "type": "github" } ], - "time": "2020-11-30T08:15:22+00:00" + "time": "2021-07-26T12:20:09+00:00" }, { - "name": "sebastian/comparator", - "version": "3.0.3", + "name": "phpunit/php-file-iterator", + "version": "2.0.5", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "1071dfcef776a57013124ff35e1fc41ccd294758" + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1071dfcef776a57013124ff35e1fc41ccd294758", - "reference": "1071dfcef776a57013124ff35e1fc41ccd294758", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5", + "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5", "shasum": "" }, "require": { - "php": ">=7.1", - "sebastian/diff": "^3.0", - "sebastian/exporter": "^3.1" + "php": ">=7.1" }, "require-dev": { "phpunit/phpunit": "^8.5" @@ -3694,7 +4303,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -3709,31 +4318,19 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Volker Dusch", - "email": "github@wallbash.com" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@2bepublished.at" + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "description": "Provides the functionality to compare PHP values for equality", - "homepage": "https://github.com/sebastianbergmann/comparator", + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", "keywords": [ - "comparator", - "compare", - "equality" + "filesystem", + "iterator" ], "support": { - "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.3" + "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.5" }, "funding": [ { @@ -3741,35 +4338,26 @@ "type": "github" } ], - "time": "2020-11-30T08:04:30+00:00" + "time": "2021-12-02T12:42:26+00:00" }, { - "name": "sebastian/diff", - "version": "3.0.3", + "name": "phpunit/php-text-template", + "version": "1.2.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211" + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/14f72dd46eaf2f2293cbe79c93cc0bc43161a211", - "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", "shasum": "" }, "require": { - "php": ">=7.1" - }, - "require-dev": { - "phpunit/phpunit": "^7.5 || ^8.0", - "symfony/process": "^2 || ^3.3 || ^4" + "php": ">=5.3.3" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, "autoload": { "classmap": [ "src/" @@ -3782,60 +4370,45 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "description": "Diff implementation", - "homepage": "https://github.com/sebastianbergmann/diff", + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", "keywords": [ - "diff", - "udiff", - "unidiff", - "unified diff" + "template" ], "support": { - "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/3.0.3" + "issues": "https://github.com/sebastianbergmann/php-text-template/issues", + "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1" }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T07:59:04+00:00" + "time": "2015-06-21T13:50:34+00:00" }, { - "name": "sebastian/environment", - "version": "4.2.4", + "name": "phpunit/php-timer", + "version": "2.1.3", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0" + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", - "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/2454ae1765516d20c4ffe103d85a58a9a3bd5662", + "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662", "shasum": "" }, "require": { "php": ">=7.1" }, "require-dev": { - "phpunit/phpunit": "^7.5" - }, - "suggest": { - "ext-posix": "*" + "phpunit/phpunit": "^8.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "2.1-dev" } }, "autoload": { @@ -3850,19 +4423,18 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "description": "Provides functionality to handle HHVM/PHP environments", - "homepage": "http://www.github.com/sebastianbergmann/environment", + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", "keywords": [ - "Xdebug", - "environment", - "hhvm" + "timer" ], "support": { - "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/4.2.4" + "issues": "https://github.com/sebastianbergmann/php-timer/issues", + "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.3" }, "funding": [ { @@ -3870,34 +4442,33 @@ "type": "github" } ], - "time": "2020-11-30T07:53:42+00:00" + "time": "2020-11-30T08:20:02+00:00" }, { - "name": "sebastian/exporter", - "version": "3.1.4", + "name": "phpunit/php-token-stream", + "version": "4.0.4", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "0c32ea2e40dbf59de29f3b49bf375176ce7dd8db" + "url": "https://github.com/sebastianbergmann/php-token-stream.git", + "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/0c32ea2e40dbf59de29f3b49bf375176ce7dd8db", - "reference": "0c32ea2e40dbf59de29f3b49bf375176ce7dd8db", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/a853a0e183b9db7eed023d7933a858fa1c8d25a3", + "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3", "shasum": "" }, "require": { - "php": ">=7.0", - "sebastian/recursion-context": "^3.0" + "ext-tokenizer": "*", + "php": "^7.3 || ^8.0" }, "require-dev": { - "ext-mbstring": "*", - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1.x-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -3913,33 +4484,16 @@ { "name": "Sebastian Bergmann", "email": "sebastian@phpunit.de" - }, - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Volker Dusch", - "email": "github@wallbash.com" - }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" } ], - "description": "Provides the functionality to export PHP variables for visualization", - "homepage": "http://www.github.com/sebastianbergmann/exporter", + "description": "Wrapper around PHP's tokenizer extension.", + "homepage": "https://github.com/sebastianbergmann/php-token-stream/", "keywords": [ - "export", - "exporter" + "tokenizer" ], "support": { - "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.4" + "issues": "https://github.com/sebastianbergmann/php-token-stream/issues", + "source": "https://github.com/sebastianbergmann/php-token-stream/tree/master" }, "funding": [ { @@ -3947,38 +4501,65 @@ "type": "github" } ], - "time": "2021-11-11T13:51:24+00:00" + "abandoned": true, + "time": "2020-08-04T08:28:15+00:00" }, { - "name": "sebastian/global-state", - "version": "3.0.1", + "name": "phpunit/phpunit", + "version": "8.5.22", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "474fb9edb7ab891665d3bfc6317f42a0a150454b" + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "ddd05b9d844260353895a3b950a9258126c11503" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/474fb9edb7ab891665d3bfc6317f42a0a150454b", - "reference": "474fb9edb7ab891665d3bfc6317f42a0a150454b", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ddd05b9d844260353895a3b950a9258126c11503", + "reference": "ddd05b9d844260353895a3b950a9258126c11503", "shasum": "" }, "require": { + "doctrine/instantiator": "^1.3.1", + "ext-dom": "*", + "ext-json": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-xml": "*", + "ext-xmlwriter": "*", + "myclabs/deep-copy": "^1.10.0", + "phar-io/manifest": "^2.0.3", + "phar-io/version": "^3.0.2", "php": ">=7.2", - "sebastian/object-reflector": "^1.1.1", - "sebastian/recursion-context": "^3.0" + "phpspec/prophecy": "^1.10.3", + "phpunit/php-code-coverage": "^7.0.12", + "phpunit/php-file-iterator": "^2.0.4", + "phpunit/php-text-template": "^1.2.1", + "phpunit/php-timer": "^2.1.2", + "sebastian/comparator": "^3.0.2", + "sebastian/diff": "^3.0.2", + "sebastian/environment": "^4.2.3", + "sebastian/exporter": "^3.1.2", + "sebastian/global-state": "^3.0.0", + "sebastian/object-enumerator": "^3.0.3", + "sebastian/resource-operations": "^2.0.1", + "sebastian/type": "^1.1.3", + "sebastian/version": "^2.0.1" }, "require-dev": { - "ext-dom": "*", - "phpunit/phpunit": "^8.0" + "ext-pdo": "*" }, "suggest": { - "ext-uopz": "*" + "ext-soap": "*", + "ext-xdebug": "*", + "phpunit/php-invoker": "^2.0.0" }, + "bin": [ + "phpunit" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "8.5-dev" } }, "autoload": { @@ -3993,1350 +4574,1172 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "description": "Snapshotting of global state", - "homepage": "http://www.github.com/sebastianbergmann/global-state", + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", "keywords": [ - "global state" + "phpunit", + "testing", + "xunit" ], "support": { - "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/3.0.1" + "issues": "https://github.com/sebastianbergmann/phpunit/issues", + "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.22" }, "funding": [ + { + "url": "https://phpunit.de/sponsors.html", + "type": "custom" + }, { "url": "https://github.com/sebastianbergmann", "type": "github" } ], - "time": "2020-11-30T07:43:24+00:00" + "time": "2021-12-25T06:58:09+00:00" }, { - "name": "sebastian/object-enumerator", - "version": "3.0.4", + "name": "predis/predis", + "version": "v1.1.10", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2" + "url": "https://github.com/predis/predis.git", + "reference": "a2fb02d738bedadcffdbb07efa3a5e7bd57f8d6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", - "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", + "url": "https://api.github.com/repos/predis/predis/zipball/a2fb02d738bedadcffdbb07efa3a5e7bd57f8d6e", + "reference": "a2fb02d738bedadcffdbb07efa3a5e7bd57f8d6e", "shasum": "" }, "require": { - "php": ">=7.0", - "sebastian/object-reflector": "^1.1.1", - "sebastian/recursion-context": "^3.0" + "php": ">=5.3.9" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "~4.8" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0.x-dev" - } + "suggest": { + "ext-curl": "Allows access to Webdis when paired with phpiredis", + "ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol" }, + "type": "library", "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "Predis\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "name": "Daniele Alessandri", + "email": "suppakilla@gmail.com", + "homepage": "http://clorophilla.net", + "role": "Creator & Maintainer" + }, + { + "name": "Till Krüss", + "homepage": "https://till.im", + "role": "Maintainer" } ], - "description": "Traverses array structures and object graphs to enumerate all referenced objects", - "homepage": "https://github.com/sebastianbergmann/object-enumerator/", + "description": "Flexible and feature-complete Redis client for PHP and HHVM", + "homepage": "http://github.com/predis/predis", + "keywords": [ + "nosql", + "predis", + "redis" + ], "support": { - "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", - "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4" + "issues": "https://github.com/predis/predis/issues", + "source": "https://github.com/predis/predis/tree/v1.1.10" }, "funding": [ { - "url": "https://github.com/sebastianbergmann", + "url": "https://github.com/sponsors/tillkruss", "type": "github" } ], - "time": "2020-11-30T07:40:27+00:00" + "time": "2022-01-05T17:46:08+00:00" }, { - "name": "sebastian/object-reflector", - "version": "1.1.2", + "name": "psr/cache", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d" + "url": "https://github.com/php-fig/cache.git", + "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", - "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", + "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8", + "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8", "shasum": "" }, "require": { - "php": ">=7.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.0" + "php": ">=5.3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "Psr\\Cache\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" } ], - "description": "Allows reflection of object attributes, including inherited and non-public ones", - "homepage": "https://github.com/sebastianbergmann/object-reflector/", + "description": "Common interface for caching libraries", + "keywords": [ + "cache", + "psr", + "psr-6" + ], "support": { - "issues": "https://github.com/sebastianbergmann/object-reflector/issues", - "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2" + "source": "https://github.com/php-fig/cache/tree/master" }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T07:37:18+00:00" + "time": "2016-08-06T20:24:11+00:00" }, { - "name": "sebastian/recursion-context", - "version": "3.0.1", + "name": "psr/http-client", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb" + "url": "https://github.com/php-fig/http-client.git", + "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb", - "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", "shasum": "" }, "require": { - "php": ">=7.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.0" + "php": "^7.0 || ^8.0", + "psr/http-message": "^1.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "Psr\\Http\\Client\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net" + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" } ], - "description": "Provides functionality to recursively process PHP variables", - "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "description": "Common interface for HTTP clients", + "homepage": "https://github.com/php-fig/http-client", + "keywords": [ + "http", + "http-client", + "psr", + "psr-18" + ], "support": { - "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1" + "source": "https://github.com/php-fig/http-client/tree/master" }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T07:34:24+00:00" + "time": "2020-06-29T06:28:15+00:00" }, { - "name": "sebastian/resource-operations", - "version": "2.0.2", + "name": "psr/http-factory", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3" + "url": "https://github.com/php-fig/http-factory.git", + "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/31d35ca87926450c44eae7e2611d45a7a65ea8b3", - "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.0.0", + "psr/http-message": "^1.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" } ], - "description": "Provides a list of PHP built-in functions that operate on resources", - "homepage": "https://www.github.com/sebastianbergmann/resource-operations", + "description": "Common interfaces for PSR-7 HTTP message factories", + "keywords": [ + "factory", + "http", + "message", + "psr", + "psr-17", + "psr-7", + "request", + "response" + ], "support": { - "issues": "https://github.com/sebastianbergmann/resource-operations/issues", - "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.2" + "source": "https://github.com/php-fig/http-factory/tree/master" }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T07:30:19+00:00" + "time": "2019-04-30T12:38:16+00:00" }, { - "name": "sebastian/type", - "version": "1.1.4", + "name": "psr/http-message", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/type.git", - "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4" + "url": "https://github.com/php-fig/http-message.git", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/0150cfbc4495ed2df3872fb31b26781e4e077eb4", - "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", "shasum": "" }, "require": { - "php": ">=7.2" - }, - "require-dev": { - "phpunit/phpunit": "^8.2" + "php": ">=5.3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" } ], - "description": "Collection of value objects that represent the types of the PHP type system", - "homepage": "https://github.com/sebastianbergmann/type", + "description": "Common interface for HTTP messages", + "homepage": "https://github.com/php-fig/http-message", + "keywords": [ + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" + ], "support": { - "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/1.1.4" + "source": "https://github.com/php-fig/http-message/tree/master" }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T07:25:11+00:00" + "time": "2016-08-06T14:39:51+00:00" }, { - "name": "sebastian/version", - "version": "2.0.1", + "name": "ralouphie/getallheaders", + "version": "3.0.3", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/version.git", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" + "url": "https://github.com/ralouphie/getallheaders.git", + "reference": "120b605dfeb996808c31b6477290a714d356e822" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", + "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", + "reference": "120b605dfeb996808c31b6477290a714d356e822", "shasum": "" }, "require": { "php": ">=5.6" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } + "require-dev": { + "php-coveralls/php-coveralls": "^2.1", + "phpunit/phpunit": "^5 || ^6.5" }, + "type": "library", "autoload": { - "classmap": [ - "src/" + "files": [ + "src/getallheaders.php" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "name": "Ralph Khattar", + "email": "ralph.khattar@gmail.com" } ], - "description": "Library that helps with managing the version number of Git-hosted PHP projects", - "homepage": "https://github.com/sebastianbergmann/version", + "description": "A polyfill for getallheaders.", "support": { - "issues": "https://github.com/sebastianbergmann/version/issues", - "source": "https://github.com/sebastianbergmann/version/tree/master" + "issues": "https://github.com/ralouphie/getallheaders/issues", + "source": "https://github.com/ralouphie/getallheaders/tree/develop" }, - "time": "2016-10-03T07:35:21+00:00" + "time": "2019-03-08T08:55:37+00:00" }, { - "name": "squizlabs/php_codesniffer", - "version": "3.6.2", + "name": "sebastian/code-unit-reverse-lookup", + "version": "1.0.2", "source": { "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a" + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a", - "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619", + "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619", "shasum": "" }, "require": { - "ext-simplexml": "*", - "ext-tokenizer": "*", - "ext-xmlwriter": "*", - "php": ">=5.4.0" + "php": ">=5.6" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" + "phpunit/phpunit": "^8.5" }, - "bin": [ - "bin/phpcs", - "bin/phpcbf" - ], "type": "library", "extra": { "branch-alias": { - "dev-master": "3.x-dev" + "dev-master": "1.0.x-dev" } }, + "autoload": { + "classmap": [ + "src/" + ] + }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], "authors": [ { - "name": "Greg Sherwood", - "role": "lead" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" } ], - "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", - "keywords": [ - "phpcs", - "standards" - ], + "description": "Looks up which function or method a line of code belongs to", + "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", "support": { - "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", - "source": "https://github.com/squizlabs/PHP_CodeSniffer", - "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" + "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", + "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2" }, - "time": "2021-12-12T21:44:58+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-11-30T08:15:22+00:00" }, { - "name": "symfony/browser-kit", - "version": "v5.4.2", + "name": "sebastian/comparator", + "version": "3.0.3", "source": { "type": "git", - "url": "https://github.com/symfony/browser-kit.git", - "reference": "1fb93b0aab42392aa0a742db205173b49afaf80f" + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "1071dfcef776a57013124ff35e1fc41ccd294758" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/1fb93b0aab42392aa0a742db205173b49afaf80f", - "reference": "1fb93b0aab42392aa0a742db205173b49afaf80f", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1071dfcef776a57013124ff35e1fc41ccd294758", + "reference": "1071dfcef776a57013124ff35e1fc41ccd294758", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/dom-crawler": "^4.4|^5.0|^6.0", - "symfony/polyfill-php80": "^1.16" + "php": ">=7.1", + "sebastian/diff": "^3.0", + "sebastian/exporter": "^3.1" }, "require-dev": { - "symfony/css-selector": "^4.4|^5.0|^6.0", - "symfony/http-client": "^4.4|^5.0|^6.0", - "symfony/mime": "^4.4|^5.0|^6.0", - "symfony/process": "^4.4|^5.0|^6.0" - }, - "suggest": { - "symfony/process": "" + "phpunit/phpunit": "^8.5" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, "autoload": { - "psr-4": { - "Symfony\\Component\\BrowserKit\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" }, { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" } ], - "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", - "homepage": "https://symfony.com", + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "https://github.com/sebastianbergmann/comparator", + "keywords": [ + "comparator", + "compare", + "equality" + ], "support": { - "source": "https://github.com/symfony/browser-kit/tree/v5.4.2" + "issues": "https://github.com/sebastianbergmann/comparator/issues", + "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.3" }, "funding": [ { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", + "url": "https://github.com/sebastianbergmann", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" } ], - "time": "2021-12-16T21:58:21+00:00" + "time": "2020-11-30T08:04:30+00:00" }, { - "name": "symfony/console", - "version": "v5.4.2", + "name": "sebastian/diff", + "version": "3.0.3", "source": { "type": "git", - "url": "https://github.com/symfony/console.git", - "reference": "a2c6b7ced2eb7799a35375fb9022519282b5405e" + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/a2c6b7ced2eb7799a35375fb9022519282b5405e", - "reference": "a2c6b7ced2eb7799a35375fb9022519282b5405e", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/14f72dd46eaf2f2293cbe79c93cc0bc43161a211", + "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php73": "^1.9", - "symfony/polyfill-php80": "^1.16", - "symfony/service-contracts": "^1.1|^2|^3", - "symfony/string": "^5.1|^6.0" - }, - "conflict": { - "psr/log": ">=3", - "symfony/dependency-injection": "<4.4", - "symfony/dotenv": "<5.1", - "symfony/event-dispatcher": "<4.4", - "symfony/lock": "<4.4", - "symfony/process": "<4.4" - }, - "provide": { - "psr/log-implementation": "1.0|2.0" + "php": ">=7.1" }, "require-dev": { - "psr/log": "^1|^2", - "symfony/config": "^4.4|^5.0|^6.0", - "symfony/dependency-injection": "^4.4|^5.0|^6.0", - "symfony/event-dispatcher": "^4.4|^5.0|^6.0", - "symfony/lock": "^4.4|^5.0|^6.0", - "symfony/process": "^4.4|^5.0|^6.0", - "symfony/var-dumper": "^4.4|^5.0|^6.0" - }, - "suggest": { - "psr/log": "For using the console logger", - "symfony/event-dispatcher": "", - "symfony/lock": "", - "symfony/process": "" + "phpunit/phpunit": "^7.5 || ^8.0", + "symfony/process": "^2 || ^3.3 || ^4" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, "autoload": { - "psr-4": { - "Symfony\\Component\\Console\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" }, { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" } ], - "description": "Eases the creation of beautiful and testable command line interfaces", - "homepage": "https://symfony.com", + "description": "Diff implementation", + "homepage": "https://github.com/sebastianbergmann/diff", "keywords": [ - "cli", - "command line", - "console", - "terminal" + "diff", + "udiff", + "unidiff", + "unified diff" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.2" + "issues": "https://github.com/sebastianbergmann/diff/issues", + "source": "https://github.com/sebastianbergmann/diff/tree/3.0.3" }, "funding": [ { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", + "url": "https://github.com/sebastianbergmann", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" } ], - "time": "2021-12-20T16:11:12+00:00" + "time": "2020-11-30T07:59:04+00:00" }, { - "name": "symfony/css-selector", - "version": "v5.4.2", + "name": "sebastian/environment", + "version": "4.2.4", "source": { "type": "git", - "url": "https://github.com/symfony/css-selector.git", - "reference": "cfcbee910e159df402603502fe387e8b677c22fd" + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/cfcbee910e159df402603502fe387e8b677c22fd", - "reference": "cfcbee910e159df402603502fe387e8b677c22fd", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", + "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/polyfill-php80": "^1.16" + "php": ">=7.1" + }, + "require-dev": { + "phpunit/phpunit": "^7.5" + }, + "suggest": { + "ext-posix": "*" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.2-dev" + } + }, "autoload": { - "psr-4": { - "Symfony\\Component\\CssSelector\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Jean-François Simon", - "email": "jeanfrancois.simon@sensiolabs.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" } ], - "description": "Converts CSS selectors to XPath expressions", - "homepage": "https://symfony.com", + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "http://www.github.com/sebastianbergmann/environment", + "keywords": [ + "Xdebug", + "environment", + "hhvm" + ], "support": { - "source": "https://github.com/symfony/css-selector/tree/v5.4.2" + "issues": "https://github.com/sebastianbergmann/environment/issues", + "source": "https://github.com/sebastianbergmann/environment/tree/4.2.4" }, "funding": [ { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", + "url": "https://github.com/sebastianbergmann", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" } ], - "time": "2021-12-16T21:58:21+00:00" + "time": "2020-11-30T07:53:42+00:00" }, { - "name": "symfony/deprecation-contracts", - "version": "v2.5.0", + "name": "sebastian/exporter", + "version": "3.1.4", "source": { "type": "git", - "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8" + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "0c32ea2e40dbf59de29f3b49bf375176ce7dd8db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8", - "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/0c32ea2e40dbf59de29f3b49bf375176ce7dd8db", + "reference": "0c32ea2e40dbf59de29f3b49bf375176ce7dd8db", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.0", + "sebastian/recursion-context": "^3.0" + }, + "require-dev": { + "ext-mbstring": "*", + "phpunit/phpunit": "^8.5" }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "2.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" + "branch-alias": { + "dev-master": "3.1.x-dev" } }, "autoload": { - "files": [ - "function.php" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" }, { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" } ], - "description": "A generic function and convention to trigger deprecation notices", - "homepage": "https://symfony.com", + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "http://www.github.com/sebastianbergmann/exporter", + "keywords": [ + "export", + "exporter" + ], "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0" + "issues": "https://github.com/sebastianbergmann/exporter/issues", + "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.4" }, "funding": [ { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", + "url": "https://github.com/sebastianbergmann", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" } ], - "time": "2021-07-12T14:48:14+00:00" + "time": "2021-11-11T13:51:24+00:00" }, { - "name": "symfony/dom-crawler", - "version": "v5.4.2", + "name": "sebastian/global-state", + "version": "3.0.1", "source": { "type": "git", - "url": "https://github.com/symfony/dom-crawler.git", - "reference": "bb3bc3699779fc6d9646270789026a7e2cec7ec7" + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "474fb9edb7ab891665d3bfc6317f42a0a150454b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/bb3bc3699779fc6d9646270789026a7e2cec7ec7", - "reference": "bb3bc3699779fc6d9646270789026a7e2cec7ec7", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/474fb9edb7ab891665d3bfc6317f42a0a150454b", + "reference": "474fb9edb7ab891665d3bfc6317f42a0a150454b", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "^1.16" - }, - "conflict": { - "masterminds/html5": "<2.6" + "php": ">=7.2", + "sebastian/object-reflector": "^1.1.1", + "sebastian/recursion-context": "^3.0" }, "require-dev": { - "masterminds/html5": "^2.6", - "symfony/css-selector": "^4.4|^5.0|^6.0" + "ext-dom": "*", + "phpunit/phpunit": "^8.0" }, "suggest": { - "symfony/css-selector": "" + "ext-uopz": "*" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, "autoload": { - "psr-4": { - "Symfony\\Component\\DomCrawler\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" } ], - "description": "Eases DOM navigation for HTML and XML documents", - "homepage": "https://symfony.com", + "description": "Snapshotting of global state", + "homepage": "http://www.github.com/sebastianbergmann/global-state", + "keywords": [ + "global state" + ], "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v5.4.2" + "issues": "https://github.com/sebastianbergmann/global-state/issues", + "source": "https://github.com/sebastianbergmann/global-state/tree/3.0.1" }, "funding": [ { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", + "url": "https://github.com/sebastianbergmann", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" } ], - "time": "2021-12-28T17:15:56+00:00" + "time": "2020-11-30T07:43:24+00:00" }, { - "name": "symfony/event-dispatcher", - "version": "v5.4.0", + "name": "sebastian/object-enumerator", + "version": "3.0.4", "source": { "type": "git", - "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "27d39ae126352b9fa3be5e196ccf4617897be3eb" + "url": "https://github.com/sebastianbergmann/object-enumerator.git", + "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/27d39ae126352b9fa3be5e196ccf4617897be3eb", - "reference": "27d39ae126352b9fa3be5e196ccf4617897be3eb", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", + "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/event-dispatcher-contracts": "^2|^3", - "symfony/polyfill-php80": "^1.16" - }, - "conflict": { - "symfony/dependency-injection": "<4.4" - }, - "provide": { - "psr/event-dispatcher-implementation": "1.0", - "symfony/event-dispatcher-implementation": "2.0" + "php": ">=7.0", + "sebastian/object-reflector": "^1.1.1", + "sebastian/recursion-context": "^3.0" }, "require-dev": { - "psr/log": "^1|^2|^3", - "symfony/config": "^4.4|^5.0|^6.0", - "symfony/dependency-injection": "^4.4|^5.0|^6.0", - "symfony/error-handler": "^4.4|^5.0|^6.0", - "symfony/expression-language": "^4.4|^5.0|^6.0", - "symfony/http-foundation": "^4.4|^5.0|^6.0", - "symfony/service-contracts": "^1.1|^2|^3", - "symfony/stopwatch": "^4.4|^5.0|^6.0" - }, - "suggest": { - "symfony/dependency-injection": "", - "symfony/http-kernel": "" + "phpunit/phpunit": "^6.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, "autoload": { - "psr-4": { - "Symfony\\Component\\EventDispatcher\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" } ], - "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", - "homepage": "https://symfony.com", + "description": "Traverses array structures and object graphs to enumerate all referenced objects", + "homepage": "https://github.com/sebastianbergmann/object-enumerator/", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.0" + "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", + "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4" }, "funding": [ { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", + "url": "https://github.com/sebastianbergmann", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" } ], - "time": "2021-11-23T10:19:22+00:00" + "time": "2020-11-30T07:40:27+00:00" }, { - "name": "symfony/event-dispatcher-contracts", - "version": "v2.5.0", + "name": "sebastian/object-reflector", + "version": "1.1.2", "source": { "type": "git", - "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a" + "url": "https://github.com/sebastianbergmann/object-reflector.git", + "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/66bea3b09be61613cd3b4043a65a8ec48cfa6d2a", - "reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", + "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", "shasum": "" }, "require": { - "php": ">=7.2.5", - "psr/event-dispatcher": "^1" + "php": ">=7.0" }, - "suggest": { - "symfony/event-dispatcher-implementation": "" + "require-dev": { + "phpunit/phpunit": "^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" + "dev-master": "1.1-dev" } }, "autoload": { - "psr-4": { - "Symfony\\Contracts\\EventDispatcher\\": "" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Generic abstractions related to dispatching event", - "homepage": "https://symfony.com", - "keywords": [ - "abstractions", - "contracts", - "decoupling", - "interfaces", - "interoperability", - "standards" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } ], + "description": "Allows reflection of object attributes, including inherited and non-public ones", + "homepage": "https://github.com/sebastianbergmann/object-reflector/", "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.0" + "issues": "https://github.com/sebastianbergmann/object-reflector/issues", + "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2" }, "funding": [ { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", + "url": "https://github.com/sebastianbergmann", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" } ], - "time": "2021-07-12T14:48:14+00:00" + "time": "2020-11-30T07:37:18+00:00" }, { - "name": "symfony/filesystem", - "version": "v5.4.0", + "name": "sebastian/recursion-context", + "version": "3.0.1", "source": { "type": "git", - "url": "https://github.com/symfony/filesystem.git", - "reference": "731f917dc31edcffec2c6a777f3698c33bea8f01" + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/731f917dc31edcffec2c6a777f3698c33bea8f01", - "reference": "731f917dc31edcffec2c6a777f3698c33bea8f01", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb", + "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-mbstring": "~1.8", - "symfony/polyfill-php80": "^1.16" + "php": ">=7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, "autoload": { - "psr-4": { - "Symfony\\Component\\Filesystem\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" }, { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" } ], - "description": "Provides basic utilities for the filesystem", - "homepage": "https://symfony.com", + "description": "Provides functionality to recursively process PHP variables", + "homepage": "http://www.github.com/sebastianbergmann/recursion-context", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.0" + "issues": "https://github.com/sebastianbergmann/recursion-context/issues", + "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1" }, "funding": [ { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", + "url": "https://github.com/sebastianbergmann", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" } ], - "time": "2021-10-28T13:39:27+00:00" + "time": "2020-11-30T07:34:24+00:00" }, { - "name": "symfony/finder", - "version": "v5.4.2", + "name": "sebastian/resource-operations", + "version": "2.0.2", "source": { "type": "git", - "url": "https://github.com/symfony/finder.git", - "reference": "e77046c252be48c48a40816187ed527703c8f76c" + "url": "https://github.com/sebastianbergmann/resource-operations.git", + "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/e77046c252be48c48a40816187ed527703c8f76c", - "reference": "e77046c252be48c48a40816187ed527703c8f76c", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/31d35ca87926450c44eae7e2611d45a7a65ea8b3", + "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/polyfill-php80": "^1.16" + "php": ">=7.1" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, "autoload": { - "psr-4": { - "Symfony\\Component\\Finder\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" } ], - "description": "Finds files and directories via an intuitive fluent interface", - "homepage": "https://symfony.com", + "description": "Provides a list of PHP built-in functions that operate on resources", + "homepage": "https://www.github.com/sebastianbergmann/resource-operations", "support": { - "source": "https://github.com/symfony/finder/tree/v5.4.2" + "issues": "https://github.com/sebastianbergmann/resource-operations/issues", + "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.2" }, "funding": [ { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", + "url": "https://github.com/sebastianbergmann", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" } ], - "time": "2021-12-15T11:06:13+00:00" + "time": "2020-11-30T07:30:19+00:00" }, { - "name": "symfony/options-resolver", - "version": "v5.4.0", + "name": "sebastian/type", + "version": "1.1.4", "source": { "type": "git", - "url": "https://github.com/symfony/options-resolver.git", - "reference": "b0fb78576487af19c500aaddb269fd36701d4847" + "url": "https://github.com/sebastianbergmann/type.git", + "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/b0fb78576487af19c500aaddb269fd36701d4847", - "reference": "b0fb78576487af19c500aaddb269fd36701d4847", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/0150cfbc4495ed2df3872fb31b26781e4e077eb4", + "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/polyfill-php73": "~1.0", - "symfony/polyfill-php80": "^1.16" + "php": ">=7.2" + }, + "require-dev": { + "phpunit/phpunit": "^8.2" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, "autoload": { - "psr-4": { - "Symfony\\Component\\OptionsResolver\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "description": "Provides an improved replacement for the array_replace PHP function", - "homepage": "https://symfony.com", - "keywords": [ - "config", - "configuration", - "options" - ], + "description": "Collection of value objects that represent the types of the PHP type system", + "homepage": "https://github.com/sebastianbergmann/type", "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.4.0" + "issues": "https://github.com/sebastianbergmann/type/issues", + "source": "https://github.com/sebastianbergmann/type/tree/1.1.4" }, "funding": [ { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", + "url": "https://github.com/sebastianbergmann", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" } ], - "time": "2021-11-23T10:19:22+00:00" + "time": "2020-11-30T07:25:11+00:00" }, { - "name": "symfony/polyfill-ctype", - "version": "v1.23.0", + "name": "sebastian/version", + "version": "2.0.1", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce" + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce", - "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", "shasum": "" }, "require": { - "php": ">=7.1" - }, - "suggest": { - "ext-ctype": "For best performance" + "php": ">=5.6" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "dev-master": "2.0.x-dev" } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Ctype\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Gert de Pagter", - "email": "BackEndTea@gmail.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for ctype functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "ctype", - "polyfill", - "portable" - ], - "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0" + "classmap": [ + "src/" + ] }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "time": "2021-02-19T12:13:01+00:00" + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "support": { + "issues": "https://github.com/sebastianbergmann/version/issues", + "source": "https://github.com/sebastianbergmann/version/tree/master" + }, + "time": "2016-10-03T07:35:21+00:00" }, { - "name": "symfony/polyfill-intl-grapheme", - "version": "v1.23.1", + "name": "squizlabs/php_codesniffer", + "version": "3.6.2", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "16880ba9c5ebe3642d1995ab866db29270b36535" + "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/16880ba9c5ebe3642d1995ab866db29270b36535", - "reference": "16880ba9c5ebe3642d1995ab866db29270b36535", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a", + "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a", "shasum": "" }, "require": { - "php": ">=7.1" + "ext-simplexml": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": ">=5.4.0" }, - "suggest": { - "ext-intl": "For best performance" + "require-dev": { + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" }, + "bin": [ + "bin/phpcs", + "bin/phpcbf" + ], "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "dev-master": "3.x-dev" } }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Grapheme\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Greg Sherwood", + "role": "lead" } ], - "description": "Symfony polyfill for intl's grapheme_* functions", - "homepage": "https://symfony.com", + "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", "keywords": [ - "compatibility", - "grapheme", - "intl", - "polyfill", - "portable", - "shim" + "phpcs", + "standards" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.1" + "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", + "source": "https://github.com/squizlabs/PHP_CodeSniffer", + "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2021-05-27T12:26:48+00:00" + "time": "2021-12-12T21:44:58+00:00" }, { - "name": "symfony/polyfill-intl-normalizer", - "version": "v1.23.0", + "name": "symfony/browser-kit", + "version": "v5.4.2", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8" + "url": "https://github.com/symfony/browser-kit.git", + "reference": "1fb93b0aab42392aa0a742db205173b49afaf80f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/1fb93b0aab42392aa0a742db205173b49afaf80f", + "reference": "1fb93b0aab42392aa0a742db205173b49afaf80f", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2.5", + "symfony/dom-crawler": "^4.4|^5.0|^6.0", + "symfony/polyfill-php80": "^1.16" + }, + "require-dev": { + "symfony/css-selector": "^4.4|^5.0|^6.0", + "symfony/http-client": "^4.4|^5.0|^6.0", + "symfony/mime": "^4.4|^5.0|^6.0", + "symfony/process": "^4.4|^5.0|^6.0" }, "suggest": { - "ext-intl": "For best performance" + "symfony/process": "" }, "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.23-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, "autoload": { "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + "Symfony\\Component\\BrowserKit\\": "" }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -5345,26 +5748,18 @@ ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill for intl's Normalizer class and related functions", + "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "intl", - "normalizer", - "polyfill", - "portable", - "shim" - ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0" + "source": "https://github.com/symfony/browser-kit/tree/v5.4.2" }, "funding": [ { @@ -5380,44 +5775,33 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2021-12-16T21:58:21+00:00" }, { - "name": "symfony/polyfill-mbstring", - "version": "v1.23.1", + "name": "symfony/css-selector", + "version": "v5.4.2", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6" + "url": "https://github.com/symfony/css-selector.git", + "reference": "cfcbee910e159df402603502fe387e8b677c22fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6", - "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/cfcbee910e159df402603502fe387e8b677c22fd", + "reference": "cfcbee910e159df402603502fe387e8b677c22fd", "shasum": "" }, "require": { - "php": ">=7.1" - }, - "suggest": { - "ext-mbstring": "For best performance" + "php": ">=7.2.5", + "symfony/polyfill-php80": "^1.16" }, "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.23-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, "autoload": { "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" + "Symfony\\Component\\CssSelector\\": "" }, - "files": [ - "bootstrap.php" + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -5426,25 +5810,22 @@ ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Jean-François Simon", + "email": "jeanfrancois.simon@sensiolabs.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill for the Mbstring extension", + "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "mbstring", - "polyfill", - "portable", - "shim" - ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1" + "source": "https://github.com/symfony/css-selector/tree/v5.4.2" }, "funding": [ { @@ -5460,44 +5841,46 @@ "type": "tidelift" } ], - "time": "2021-05-27T12:26:48+00:00" + "time": "2021-12-16T21:58:21+00:00" }, { - "name": "symfony/polyfill-php73", - "version": "v1.23.0", + "name": "symfony/dom-crawler", + "version": "v5.4.2", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010" + "url": "https://github.com/symfony/dom-crawler.git", + "reference": "bb3bc3699779fc6d9646270789026a7e2cec7ec7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010", - "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/bb3bc3699779fc6d9646270789026a7e2cec7ec7", + "reference": "bb3bc3699779fc6d9646270789026a7e2cec7ec7", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php80": "^1.16" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.23-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } + "conflict": { + "masterminds/html5": "<2.6" + }, + "require-dev": { + "masterminds/html5": "^2.6", + "symfony/css-selector": "^4.4|^5.0|^6.0" }, + "suggest": { + "symfony/css-selector": "" + }, + "type": "library", "autoload": { "psr-4": { - "Symfony\\Polyfill\\Php73\\": "" + "Symfony\\Component\\DomCrawler\\": "" }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -5506,24 +5889,18 @@ ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", + "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.23.0" + "source": "https://github.com/symfony/dom-crawler/tree/v5.4.2" }, "funding": [ { @@ -5539,44 +5916,35 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2021-12-28T17:15:56+00:00" }, { - "name": "symfony/polyfill-php80", - "version": "v1.23.1", + "name": "symfony/filesystem", + "version": "v5.4.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be" + "url": "https://github.com/symfony/filesystem.git", + "reference": "731f917dc31edcffec2c6a777f3698c33bea8f01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be", - "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/731f917dc31edcffec2c6a777f3698c33bea8f01", + "reference": "731f917dc31edcffec2c6a777f3698c33bea8f01", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2.5", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.8", + "symfony/polyfill-php80": "^1.16" }, "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.23-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, "autoload": { "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" + "Symfony\\Component\\Filesystem\\": "" }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -5585,28 +5953,18 @@ ], "authors": [ { - "name": "Ion Bazan", - "email": "ion.bazan@gmail.com" - }, - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1" + "source": "https://github.com/symfony/filesystem/tree/v5.4.0" }, "funding": [ { @@ -5622,44 +5980,34 @@ "type": "tidelift" } ], - "time": "2021-07-28T13:41:28+00:00" + "time": "2021-10-28T13:39:27+00:00" }, { - "name": "symfony/polyfill-php81", - "version": "v1.23.0", + "name": "symfony/finder", + "version": "v5.4.2", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "e66119f3de95efc359483f810c4c3e6436279436" + "url": "https://github.com/symfony/finder.git", + "reference": "e77046c252be48c48a40816187ed527703c8f76c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/e66119f3de95efc359483f810c4c3e6436279436", - "reference": "e66119f3de95efc359483f810c4c3e6436279436", + "url": "https://api.github.com/repos/symfony/finder/zipball/e77046c252be48c48a40816187ed527703c8f76c", + "reference": "e77046c252be48c48a40816187ed527703c8f76c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-php80": "^1.16" }, "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.23-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, "autoload": { "psr-4": { - "Symfony\\Polyfill\\Php81\\": "" + "Symfony\\Component\\Finder\\": "" }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -5668,24 +6016,18 @@ ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", + "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.23.0" + "source": "https://github.com/symfony/finder/tree/v5.4.2" }, "funding": [ { @@ -5701,30 +6043,32 @@ "type": "tidelift" } ], - "time": "2021-05-21T13:25:03+00:00" + "time": "2021-12-15T11:06:13+00:00" }, { - "name": "symfony/process", - "version": "v5.4.2", + "name": "symfony/options-resolver", + "version": "v5.4.0", "source": { "type": "git", - "url": "https://github.com/symfony/process.git", - "reference": "2b3ba8722c4aaf3e88011be5e7f48710088fb5e4" + "url": "https://github.com/symfony/options-resolver.git", + "reference": "b0fb78576487af19c500aaddb269fd36701d4847" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/2b3ba8722c4aaf3e88011be5e7f48710088fb5e4", - "reference": "2b3ba8722c4aaf3e88011be5e7f48710088fb5e4", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/b0fb78576487af19c500aaddb269fd36701d4847", + "reference": "b0fb78576487af19c500aaddb269fd36701d4847", "shasum": "" }, "require": { "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-php73": "~1.0", "symfony/polyfill-php80": "^1.16" }, "type": "library", "autoload": { "psr-4": { - "Symfony\\Component\\Process\\": "" + "Symfony\\Component\\OptionsResolver\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -5744,10 +6088,15 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Executes commands in sub-processes", + "description": "Provides an improved replacement for the array_replace PHP function", "homepage": "https://symfony.com", + "keywords": [ + "config", + "configuration", + "options" + ], "support": { - "source": "https://github.com/symfony/process/tree/v5.4.2" + "source": "https://github.com/symfony/options-resolver/tree/v5.4.0" }, "funding": [ { @@ -5763,47 +6112,45 @@ "type": "tidelift" } ], - "time": "2021-12-27T21:01:00+00:00" + "time": "2021-11-23T10:19:22+00:00" }, { - "name": "symfony/service-contracts", - "version": "v2.5.0", + "name": "symfony/polyfill-php81", + "version": "v1.24.0", "source": { "type": "git", - "url": "https://github.com/symfony/service-contracts.git", - "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc" + "url": "https://github.com/symfony/polyfill-php81.git", + "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc", - "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/5de4ba2d41b15f9bd0e19b2ab9674135813ec98f", + "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f", "shasum": "" }, "require": { - "php": ">=7.2.5", - "psr/container": "^1.1", - "symfony/deprecation-contracts": "^2.1" - }, - "conflict": { - "ext-psr": "<1.1|>=2" - }, - "suggest": { - "symfony/service-implementation": "" + "php": ">=7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" + "dev-main": "1.23-dev" }, "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { "psr-4": { - "Symfony\\Contracts\\Service\\": "" - } + "Symfony\\Polyfill\\Php81\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5819,18 +6166,16 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Generic abstractions related to writing services", + "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", "homepage": "https://symfony.com", "keywords": [ - "abstractions", - "contracts", - "decoupling", - "interfaces", - "interoperability", - "standards" + "compatibility", + "polyfill", + "portable", + "shim" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.24.0" }, "funding": [ { @@ -5846,30 +6191,30 @@ "type": "tidelift" } ], - "time": "2021-11-04T16:48:04+00:00" + "time": "2021-09-13T13:58:11+00:00" }, { - "name": "symfony/stopwatch", - "version": "v5.4.0", + "name": "symfony/process", + "version": "v5.4.2", "source": { "type": "git", - "url": "https://github.com/symfony/stopwatch.git", - "reference": "208ef96122bfed82a8f3a61458a07113a08bdcfe" + "url": "https://github.com/symfony/process.git", + "reference": "2b3ba8722c4aaf3e88011be5e7f48710088fb5e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/208ef96122bfed82a8f3a61458a07113a08bdcfe", - "reference": "208ef96122bfed82a8f3a61458a07113a08bdcfe", + "url": "https://api.github.com/repos/symfony/process/zipball/2b3ba8722c4aaf3e88011be5e7f48710088fb5e4", + "reference": "2b3ba8722c4aaf3e88011be5e7f48710088fb5e4", "shasum": "" }, "require": { "php": ">=7.2.5", - "symfony/service-contracts": "^1|^2|^3" + "symfony/polyfill-php80": "^1.16" }, "type": "library", "autoload": { "psr-4": { - "Symfony\\Component\\Stopwatch\\": "" + "Symfony\\Component\\Process\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -5889,10 +6234,10 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Provides a way to profile code", + "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v5.4.0" + "source": "https://github.com/symfony/process/tree/v5.4.2" }, "funding": [ { @@ -5908,47 +6253,31 @@ "type": "tidelift" } ], - "time": "2021-11-23T10:19:22+00:00" + "time": "2021-12-27T21:01:00+00:00" }, { - "name": "symfony/string", - "version": "v5.4.2", + "name": "symfony/stopwatch", + "version": "v5.4.0", "source": { "type": "git", - "url": "https://github.com/symfony/string.git", - "reference": "e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d" + "url": "https://github.com/symfony/stopwatch.git", + "reference": "208ef96122bfed82a8f3a61458a07113a08bdcfe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d", - "reference": "e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/208ef96122bfed82a8f3a61458a07113a08bdcfe", + "reference": "208ef96122bfed82a8f3a61458a07113a08bdcfe", "shasum": "" }, "require": { "php": ">=7.2.5", - "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-intl-grapheme": "~1.0", - "symfony/polyfill-intl-normalizer": "~1.0", - "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "~1.15" - }, - "conflict": { - "symfony/translation-contracts": ">=3.0" - }, - "require-dev": { - "symfony/error-handler": "^4.4|^5.0|^6.0", - "symfony/http-client": "^4.4|^5.0|^6.0", - "symfony/translation-contracts": "^1.1|^2", - "symfony/var-exporter": "^4.4|^5.0|^6.0" + "symfony/service-contracts": "^1|^2|^3" }, "type": "library", "autoload": { "psr-4": { - "Symfony\\Component\\String\\": "" + "Symfony\\Component\\Stopwatch\\": "" }, - "files": [ - "Resources/functions.php" - ], "exclude-from-classmap": [ "/Tests/" ] @@ -5959,26 +6288,18 @@ ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way", + "description": "Provides a way to profile code", "homepage": "https://symfony.com", - "keywords": [ - "grapheme", - "i18n", - "string", - "unicode", - "utf-8", - "utf8" - ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.2" + "source": "https://github.com/symfony/stopwatch/tree/v5.4.0" }, "funding": [ { @@ -5994,7 +6315,7 @@ "type": "tidelift" } ], - "time": "2021-12-16T21:52:00+00:00" + "time": "2021-11-23T10:19:22+00:00" }, { "name": "symfony/yaml", @@ -6201,16 +6522,16 @@ }, { "name": "vimeo/psalm", - "version": "4.16.1", + "version": "4.18.1", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "aa7e400908833b10c0333861f86cd48c510b60eb" + "reference": "dda05fa913f4dc6eb3386f2f7ce5a45d37a71bcb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/aa7e400908833b10c0333861f86cd48c510b60eb", - "reference": "aa7e400908833b10c0333861f86cd48c510b60eb", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/dda05fa913f4dc6eb3386f2f7ce5a45d37a71bcb", + "reference": "dda05fa913f4dc6eb3386f2f7ce5a45d37a71bcb", "shasum": "" }, "require": { @@ -6218,7 +6539,7 @@ "amphp/byte-stream": "^1.5", "composer/package-versions-deprecated": "^1.8.0", "composer/semver": "^1.4 || ^2.0 || ^3.0", - "composer/xdebug-handler": "^1.1 || ^2.0", + "composer/xdebug-handler": "^1.1 || ^2.0 || ^3.0", "dnoegel/php-xdg-base-dir": "^0.1.1", "ext-ctype": "*", "ext-dom": "*", @@ -6301,41 +6622,45 @@ ], "support": { "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/4.16.1" + "source": "https://github.com/vimeo/psalm/tree/4.18.1" }, - "time": "2021-12-26T08:17:05+00:00" + "time": "2022-01-08T21:21:26+00:00" }, { "name": "vlucas/phpdotenv", - "version": "v2.6.9", + "version": "v5.4.1", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "2e93cc98e2e8e869f8d9cfa61bb3a99ba4fc4141" + "reference": "264dce589e7ce37a7ba99cb901eed8249fbec92f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2e93cc98e2e8e869f8d9cfa61bb3a99ba4fc4141", - "reference": "2e93cc98e2e8e869f8d9cfa61bb3a99ba4fc4141", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/264dce589e7ce37a7ba99cb901eed8249fbec92f", + "reference": "264dce589e7ce37a7ba99cb901eed8249fbec92f", "shasum": "" }, "require": { - "php": "^5.3.9 || ^7.0 || ^8.0", - "symfony/polyfill-ctype": "^1.17" + "ext-pcre": "*", + "graham-campbell/result-type": "^1.0.2", + "php": "^7.1.3 || ^8.0", + "phpoption/phpoption": "^1.8", + "symfony/polyfill-ctype": "^1.23", + "symfony/polyfill-mbstring": "^1.23.1", + "symfony/polyfill-php80": "^1.23.1" }, "require-dev": { + "bamarni/composer-bin-plugin": "^1.4.1", "ext-filter": "*", - "ext-pcre": "*", - "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.21" + "phpunit/phpunit": "^7.5.20 || ^8.5.21 || ^9.5.10" }, "suggest": { - "ext-filter": "Required to use the boolean validator.", - "ext-pcre": "Required to use most of the library." + "ext-filter": "Required to use the boolean validator." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "5.4-dev" } }, "autoload": { @@ -6367,7 +6692,7 @@ ], "support": { "issues": "https://github.com/vlucas/phpdotenv/issues", - "source": "https://github.com/vlucas/phpdotenv/tree/v2.6.9" + "source": "https://github.com/vlucas/phpdotenv/tree/v5.4.1" }, "funding": [ { @@ -6379,7 +6704,7 @@ "type": "tidelift" } ], - "time": "2021-12-12T22:59:22+00:00" + "time": "2021-12-12T23:22:04+00:00" }, { "name": "webmozart/assert", @@ -6493,7 +6818,9 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "phalcon/zephir": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { @@ -6517,5 +6844,5 @@ "ext-sqlite3": "*", "ext-xml": "*" }, - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.2.0" } From 3d2fc9e566e177c27c2d494b5a114f4407ef9fa6 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 15 Jan 2022 15:04:45 +0000 Subject: [PATCH 23/91] #15598 - Bump max supported version to `8.1.99` in package.xml --- package.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.xml b/package.xml index 49902359cc6..71faa8af5a1 100644 --- a/package.xml +++ b/package.xml @@ -54,7 +54,7 @@ 7.4.1 - 8.0.99 + 8.1.99 1.10 From 8ff4e622fb710cb65b1b46cb7797a0076741a24b Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 15 Jan 2022 15:07:16 +0000 Subject: [PATCH 24/91] #15598 - Change workflow template for stubs validation --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 612d38f7723..bbceb9cf75c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -60,7 +60,7 @@ jobs: # Generates stubs and validates with PSALM stubs: needs: setup_workflow - uses: zephir-lang/templates/.github/workflows/phalcon-stubs.yml@main + uses: zephir-lang/templates/.github/workflows/phalcon-stubs-zephir-composer.yml@main with: extensions: ${{ needs.setup_workflow.outputs.zephir_extensions }} From bd5b05a33ac1c1a8d2a2659e3bf5e0d892481cab Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 15 Jan 2022 15:14:44 +0000 Subject: [PATCH 25/91] #15598 - Add PHP 8.1 to integration test's matrix workflow --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bbceb9cf75c..b48379fd6be 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -271,7 +271,7 @@ jobs: strategy: fail-fast: false matrix: - php: [ '7.4', '8.0' ] + php: [ '7.4', '8.0', '8.1' ] steps: - uses: actions/checkout@v2 From df5ff79a0e7d94c5ae798a2f59f4e400c6720264 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 15 Jan 2022 15:19:12 +0000 Subject: [PATCH 26/91] #15598 - Change call of env variable 'DATA_MYSQL_NAME' --- tests/_data/fixtures/models/InvoicesSchema.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/_data/fixtures/models/InvoicesSchema.php b/tests/_data/fixtures/models/InvoicesSchema.php index 17b0d383885..fcdc05ac5b8 100644 --- a/tests/_data/fixtures/models/InvoicesSchema.php +++ b/tests/_data/fixtures/models/InvoicesSchema.php @@ -27,6 +27,6 @@ class InvoicesSchema extends Model public function initialize() { $this->setSource('co_invoices'); - $this->setSchema($_ENV['DATA_MYSQL_NAME']); + $this->setSchema(env('DATA_MYSQL_NAME')); } } From d91928c0e0f55efbabb2db2d117f66972a4a8fa0 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 15 Jan 2022 16:12:56 +0000 Subject: [PATCH 27/91] #15598 - Bump PSR_VERSION version to `1.2.0` --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b48379fd6be..e1333b1eba9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,7 +22,7 @@ env: PHALCON_VERSION: 5.0.0beta3 ZEPHIR_PARSER_VERSION: 1.4.2 ZEPHIR_VERSION: 0.15.2 - PSR_VERSION: 1.1.0 + PSR_VERSION: 1.2.0 # For tests LANG: en_US.UTF-8 From 34c4af966fdb0a03a4a15149b037d0f9bcd5b2da Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 15 Jan 2022 20:15:54 +0000 Subject: [PATCH 28/91] #15598 - Update `env()` function --- tests/_config/functions.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/_config/functions.php b/tests/_config/functions.php index 6a67554d9d6..c11f9e90061 100644 --- a/tests/_config/functions.php +++ b/tests/_config/functions.php @@ -207,6 +207,10 @@ function env(string $key, $default = null) return constant($key); } + if (getenv($key) !== false) { + return getenv($key); + } + return $_ENV[$key] ?? $default; } } From a59c3fc7908c69620f7cfda2ef359036cd74d1d3 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 22 Jan 2022 21:16:13 +0000 Subject: [PATCH 29/91] #15598 - Change value of `Enum::FETCH_DEFAULT` --- phalcon/Db/Enum.zep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phalcon/Db/Enum.zep b/phalcon/Db/Enum.zep index 8c89fa99164..bfaed5209d8 100644 --- a/phalcon/Db/Enum.zep +++ b/phalcon/Db/Enum.zep @@ -32,5 +32,5 @@ class Enum const FETCH_PROPS_LATE = \Pdo::FETCH_PROPS_LATE; const FETCH_SERIALIZE = \Pdo::FETCH_SERIALIZE; const FETCH_UNIQUE = \Pdo::FETCH_UNIQUE; - const FETCH_DEFAULT = \Pdo::FETCH_DEFAULT; + const FETCH_DEFAULT = 0; // TODO: Use \Pdo::FETCH_DEFAULT after min PHP version is 8.0.7; } From 2fd50885557d5ebda79ae98be3faac18ad6cba12 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 22 Jan 2022 22:52:00 +0000 Subject: [PATCH 30/91] #15598 - Temporary use Zephir's specific branch --- composer.json | 2 +- composer.lock | 63 +++++++++++++++++++++++++-------------------------- 2 files changed, 32 insertions(+), 33 deletions(-) diff --git a/composer.json b/composer.json index 42b4ea04fd2..ba2e6582413 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ ], "require": { "php": ">=7.4", - "phalcon/zephir": "dev-development" + "phalcon/zephir": "dev-#2341-dynamic-arg-info" }, "require-dev": { "ext-apcu": "*", diff --git a/composer.lock b/composer.lock index 15a87551ca0..9bf946ae03d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0c5d52f42387cd2305e3e92a31ca0ced", + "content-hash": "f14ae4c8cd3c6b46cf394b6d9f423550", "packages": [ { "name": "monolog/monolog", @@ -107,16 +107,16 @@ }, { "name": "phalcon/zephir", - "version": "dev-development", + "version": "dev-#2341-dynamic-arg-info", "source": { "type": "git", "url": "https://github.com/zephir-lang/zephir.git", - "reference": "8472676e012aca7cee076b88bdf8c2334e58f9d6" + "reference": "0555963ae7c06a66992645f4384ca8362dcc4b8b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zephir-lang/zephir/zipball/8472676e012aca7cee076b88bdf8c2334e58f9d6", - "reference": "8472676e012aca7cee076b88bdf8c2334e58f9d6", + "url": "https://api.github.com/repos/zephir-lang/zephir/zipball/0555963ae7c06a66992645f4384ca8362dcc4b8b", + "reference": "0555963ae7c06a66992645f4384ca8362dcc4b8b", "shasum": "" }, "require": { @@ -140,7 +140,6 @@ "phpunit/phpunit": "^9.5", "psr/log": "1.1.*" }, - "default-branch": true, "bin": [ "zephir" ], @@ -192,7 +191,7 @@ "type": "github" } ], - "time": "2022-01-15T14:42:28+00:00" + "time": "2022-01-22T22:44:56+00:00" }, { "name": "psr/container", @@ -2296,16 +2295,16 @@ }, { "name": "composer/package-versions-deprecated", - "version": "1.11.99.4", + "version": "1.11.99.5", "source": { "type": "git", "url": "https://github.com/composer/package-versions-deprecated.git", - "reference": "b174585d1fe49ceed21928a945138948cb394600" + "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b174585d1fe49ceed21928a945138948cb394600", - "reference": "b174585d1fe49ceed21928a945138948cb394600", + "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b4f54f74ef3453349c24a845d22392cd31e65f1d", + "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d", "shasum": "" }, "require": { @@ -2349,7 +2348,7 @@ "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", "support": { "issues": "https://github.com/composer/package-versions-deprecated/issues", - "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.4" + "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.5" }, "funding": [ { @@ -2365,27 +2364,27 @@ "type": "tidelift" } ], - "time": "2021-09-13T08:41:34+00:00" + "time": "2022-01-17T14:14:24+00:00" }, { "name": "composer/pcre", - "version": "1.0.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2" + "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/3d322d715c43a1ac36c7fe215fa59336265500f2", - "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2", + "url": "https://api.github.com/repos/composer/pcre/zipball/67a32d7d6f9f560b726ab25a061b38ff3a80c560", + "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560", "shasum": "" }, "require": { "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^1", + "phpstan/phpstan": "^1.3", "phpstan/phpstan-strict-rules": "^1.1", "symfony/phpunit-bridge": "^4.2 || ^5" }, @@ -2420,7 +2419,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/1.0.0" + "source": "https://github.com/composer/pcre/tree/1.0.1" }, "funding": [ { @@ -2436,7 +2435,7 @@ "type": "tidelift" } ], - "time": "2021-12-06T15:17:27+00:00" + "time": "2022-01-21T20:24:37+00:00" }, { "name": "composer/semver", @@ -3416,16 +3415,16 @@ }, { "name": "mustache/mustache", - "version": "v2.14.0", + "version": "v2.14.1", "source": { "type": "git", "url": "https://github.com/bobthecow/mustache.php.git", - "reference": "4e2724dd40ae9499a55e7db7df82665be0ab7e34" + "reference": "579ffa5c96e1d292c060b3dd62811ff01ad8c24e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/4e2724dd40ae9499a55e7db7df82665be0ab7e34", - "reference": "4e2724dd40ae9499a55e7db7df82665be0ab7e34", + "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/579ffa5c96e1d292c060b3dd62811ff01ad8c24e", + "reference": "579ffa5c96e1d292c060b3dd62811ff01ad8c24e", "shasum": "" }, "require": { @@ -3460,9 +3459,9 @@ ], "support": { "issues": "https://github.com/bobthecow/mustache.php/issues", - "source": "https://github.com/bobthecow/mustache.php/tree/v2.14.0" + "source": "https://github.com/bobthecow/mustache.php/tree/v2.14.1" }, - "time": "2021-12-14T14:42:17+00:00" + "time": "2022-01-21T06:08:36+00:00" }, { "name": "myclabs/deep-copy", @@ -4506,16 +4505,16 @@ }, { "name": "phpunit/phpunit", - "version": "8.5.22", + "version": "8.5.23", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "ddd05b9d844260353895a3b950a9258126c11503" + "reference": "efb20ff3623b9d09bf190a68fdfe574538a8d496" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ddd05b9d844260353895a3b950a9258126c11503", - "reference": "ddd05b9d844260353895a3b950a9258126c11503", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/efb20ff3623b9d09bf190a68fdfe574538a8d496", + "reference": "efb20ff3623b9d09bf190a68fdfe574538a8d496", "shasum": "" }, "require": { @@ -4587,7 +4586,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.22" + "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.23" }, "funding": [ { @@ -4599,7 +4598,7 @@ "type": "github" } ], - "time": "2021-12-25T06:58:09+00:00" + "time": "2022-01-21T05:50:34+00:00" }, { "name": "predis/predis", From 00ff3496a601bec7ce5c30c734b9041726f7f9a3 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 23 Jan 2022 16:05:49 +0000 Subject: [PATCH 31/91] #15598 - Update composer dependencies --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 9bf946ae03d..eb53cb1fd76 100644 --- a/composer.lock +++ b/composer.lock @@ -111,12 +111,12 @@ "source": { "type": "git", "url": "https://github.com/zephir-lang/zephir.git", - "reference": "0555963ae7c06a66992645f4384ca8362dcc4b8b" + "reference": "7ba67e101cb48ffc0e6f7778d7e48d730dd24388" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zephir-lang/zephir/zipball/0555963ae7c06a66992645f4384ca8362dcc4b8b", - "reference": "0555963ae7c06a66992645f4384ca8362dcc4b8b", + "url": "https://api.github.com/repos/zephir-lang/zephir/zipball/7ba67e101cb48ffc0e6f7778d7e48d730dd24388", + "reference": "7ba67e101cb48ffc0e6f7778d7e48d730dd24388", "shasum": "" }, "require": { @@ -191,7 +191,7 @@ "type": "github" } ], - "time": "2022-01-22T22:44:56+00:00" + "time": "2022-01-23T15:55:44+00:00" }, { "name": "psr/container", From 5ea5b1b5d47e1d0cceaeae87628a4e84a4a1b811 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 23 Jan 2022 16:51:04 +0000 Subject: [PATCH 32/91] #15598 - Update composer dependencies --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index eb53cb1fd76..82752005cc4 100644 --- a/composer.lock +++ b/composer.lock @@ -111,12 +111,12 @@ "source": { "type": "git", "url": "https://github.com/zephir-lang/zephir.git", - "reference": "7ba67e101cb48ffc0e6f7778d7e48d730dd24388" + "reference": "dfae4180b6adf3747eed997c48693067e061c003" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zephir-lang/zephir/zipball/7ba67e101cb48ffc0e6f7778d7e48d730dd24388", - "reference": "7ba67e101cb48ffc0e6f7778d7e48d730dd24388", + "url": "https://api.github.com/repos/zephir-lang/zephir/zipball/dfae4180b6adf3747eed997c48693067e061c003", + "reference": "dfae4180b6adf3747eed997c48693067e061c003", "shasum": "" }, "require": { @@ -191,7 +191,7 @@ "type": "github" } ], - "time": "2022-01-23T15:55:44+00:00" + "time": "2022-01-23T16:26:21+00:00" }, { "name": "psr/container", From 5c223cd4a5ed09160bfa2b4c05c91be3058a683a Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 23 Jan 2022 17:55:55 +0000 Subject: [PATCH 33/91] #15598 - Update composer dependencies --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 82752005cc4..cd781326007 100644 --- a/composer.lock +++ b/composer.lock @@ -111,12 +111,12 @@ "source": { "type": "git", "url": "https://github.com/zephir-lang/zephir.git", - "reference": "dfae4180b6adf3747eed997c48693067e061c003" + "reference": "17d7722de30629bf379d35cfe5c8b8bd56cfa789" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zephir-lang/zephir/zipball/dfae4180b6adf3747eed997c48693067e061c003", - "reference": "dfae4180b6adf3747eed997c48693067e061c003", + "url": "https://api.github.com/repos/zephir-lang/zephir/zipball/17d7722de30629bf379d35cfe5c8b8bd56cfa789", + "reference": "17d7722de30629bf379d35cfe5c8b8bd56cfa789", "shasum": "" }, "require": { @@ -191,7 +191,7 @@ "type": "github" } ], - "time": "2022-01-23T16:26:21+00:00" + "time": "2022-01-23T17:51:43+00:00" }, { "name": "psr/container", From 22ef31cb4cadc16fa6334e42583029978b5f79af Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 23 Jan 2022 18:08:29 +0000 Subject: [PATCH 34/91] #15598 - Update composer dependencies --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index cd781326007..18104528b16 100644 --- a/composer.lock +++ b/composer.lock @@ -111,12 +111,12 @@ "source": { "type": "git", "url": "https://github.com/zephir-lang/zephir.git", - "reference": "17d7722de30629bf379d35cfe5c8b8bd56cfa789" + "reference": "b080d7579fc8c64c728065c79b695dddc5316c6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zephir-lang/zephir/zipball/17d7722de30629bf379d35cfe5c8b8bd56cfa789", - "reference": "17d7722de30629bf379d35cfe5c8b8bd56cfa789", + "url": "https://api.github.com/repos/zephir-lang/zephir/zipball/b080d7579fc8c64c728065c79b695dddc5316c6b", + "reference": "b080d7579fc8c64c728065c79b695dddc5316c6b", "shasum": "" }, "require": { @@ -191,7 +191,7 @@ "type": "github" } ], - "time": "2022-01-23T17:51:43+00:00" + "time": "2022-01-23T18:05:28+00:00" }, { "name": "psr/container", From 1a06fb1136b93e1c025aa7dca119b985d2bdb375 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 23 Jan 2022 18:50:09 +0000 Subject: [PATCH 35/91] #15598 - Update composer dependencies --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 18104528b16..6f056281b99 100644 --- a/composer.lock +++ b/composer.lock @@ -111,12 +111,12 @@ "source": { "type": "git", "url": "https://github.com/zephir-lang/zephir.git", - "reference": "b080d7579fc8c64c728065c79b695dddc5316c6b" + "reference": "d514b08589177dff04bcb93ce2401c196d7e3871" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zephir-lang/zephir/zipball/b080d7579fc8c64c728065c79b695dddc5316c6b", - "reference": "b080d7579fc8c64c728065c79b695dddc5316c6b", + "url": "https://api.github.com/repos/zephir-lang/zephir/zipball/d514b08589177dff04bcb93ce2401c196d7e3871", + "reference": "d514b08589177dff04bcb93ce2401c196d7e3871", "shasum": "" }, "require": { @@ -191,7 +191,7 @@ "type": "github" } ], - "time": "2022-01-23T18:05:28+00:00" + "time": "2022-01-23T18:38:19+00:00" }, { "name": "psr/container", From d6d9b9713bbfa1fa79a93f06a90ab98dd9b91609 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Mon, 24 Jan 2022 21:25:12 +0000 Subject: [PATCH 36/91] #15598 - Mass rename prefix of PSR to `ExtPsr` --- phalcon/Cache/Cache.zep | 2 +- phalcon/Cache/CacheFactory.zep | 2 +- phalcon/Container/Container.zep | 2 +- phalcon/DataMapper/Pdo/Profiler/MemoryLogger.zep | 2 +- phalcon/DataMapper/Pdo/Profiler/Profiler.zep | 4 ++-- phalcon/DataMapper/Pdo/Profiler/ProfilerInterface.zep | 2 +- phalcon/Html/Link/EvolvableLink.zep | 2 +- phalcon/Html/Link/EvolvableLinkProvider.zep | 4 ++-- phalcon/Html/Link/Link.zep | 2 +- phalcon/Html/Link/LinkProvider.zep | 4 ++-- phalcon/Html/Link/Serializer/Header.zep | 2 +- phalcon/Http/Message/AbstractMessage.zep | 4 ++-- phalcon/Http/Message/AbstractRequest.zep | 2 +- phalcon/Http/Message/Request.zep | 6 +++--- phalcon/Http/Message/RequestFactory.zep | 6 +++--- phalcon/Http/Message/Response.zep | 2 +- phalcon/Http/Message/ResponseFactory.zep | 4 ++-- phalcon/Http/Message/ServerRequest.zep | 8 ++++---- phalcon/Http/Message/ServerRequestFactory.zep | 8 ++++---- phalcon/Http/Message/Stream.zep | 2 +- phalcon/Http/Message/StreamFactory.zep | 4 ++-- phalcon/Http/Message/UploadedFile.zep | 4 ++-- phalcon/Http/Message/UploadedFileFactory.zep | 6 +++--- phalcon/Http/Message/Uri.zep | 2 +- phalcon/Http/Message/UriFactory.zep | 4 ++-- phalcon/Http/Server/AbstractMiddleware.zep | 8 ++++---- phalcon/Http/Server/AbstractRequestHandler.zep | 6 +++--- phalcon/Logger/Logger.zep | 4 ++-- phalcon/Mvc/Model/Query.zep | 2 +- phalcon/Mvc/Model/Resultset.zep | 2 +- phalcon/Mvc/Model/Resultset/Complex.zep | 2 +- phalcon/Mvc/Model/Resultset/Simple.zep | 2 +- phalcon/Mvc/Model/ResultsetInterface.zep | 2 +- 33 files changed, 59 insertions(+), 59 deletions(-) diff --git a/phalcon/Cache/Cache.zep b/phalcon/Cache/Cache.zep index 2dfaee6f037..ad390916ab1 100644 --- a/phalcon/Cache/Cache.zep +++ b/phalcon/Cache/Cache.zep @@ -13,7 +13,7 @@ namespace Phalcon\Cache; use DateInterval; use Phalcon\Cache\Adapter\AdapterInterface; use Phalcon\Cache\Exception\InvalidArgumentException; -use Psr\SimpleCache\CacheInterface; +use PsrExt\SimpleCache\CacheInterface; use Traversable; /** diff --git a/phalcon/Cache/CacheFactory.zep b/phalcon/Cache/CacheFactory.zep index 2288df68efe..7e08894b229 100644 --- a/phalcon/Cache/CacheFactory.zep +++ b/phalcon/Cache/CacheFactory.zep @@ -15,7 +15,7 @@ use Phalcon\Cache\Cache; use Phalcon\Cache\Exception\Exception; use Phalcon\Config\ConfigInterface; use Phalcon\Factory\AbstractConfigFactory; -use Psr\SimpleCache\CacheInterface; +use PsrExt\SimpleCache\CacheInterface; /** * Creates a new Cache class diff --git a/phalcon/Container/Container.zep b/phalcon/Container/Container.zep index c058a727c51..0fbeab3d0c5 100644 --- a/phalcon/Container/Container.zep +++ b/phalcon/Container/Container.zep @@ -10,7 +10,7 @@ namespace Phalcon\Container; -use Psr\Container\ContainerInterface; +use PsrExt\Container\ContainerInterface; use Phalcon\Di\DiInterface; /** diff --git a/phalcon/DataMapper/Pdo/Profiler/MemoryLogger.zep b/phalcon/DataMapper/Pdo/Profiler/MemoryLogger.zep index d9adbfafe22..605f57dd57a 100644 --- a/phalcon/DataMapper/Pdo/Profiler/MemoryLogger.zep +++ b/phalcon/DataMapper/Pdo/Profiler/MemoryLogger.zep @@ -15,7 +15,7 @@ namespace Phalcon\DataMapper\Pdo\Profiler; -use Psr\Log\AbstractLogger; +use PsrExt\Log\AbstractLogger; /** * A naive memory-based logger. diff --git a/phalcon/DataMapper/Pdo/Profiler/Profiler.zep b/phalcon/DataMapper/Pdo/Profiler/Profiler.zep index b0b478f3139..b7afbf81f7e 100644 --- a/phalcon/DataMapper/Pdo/Profiler/Profiler.zep +++ b/phalcon/DataMapper/Pdo/Profiler/Profiler.zep @@ -17,8 +17,8 @@ namespace Phalcon\DataMapper\Pdo\Profiler; use InvalidArgumentException; // @todo this will also be removed when traits are available use Phalcon\DataMapper\Pdo\Exception\Exception; -use Psr\Log\LoggerInterface; -use Psr\Log\LogLevel; +use PsrExt\Log\LoggerInterface; +use PsrExt\Log\LogLevel; /** * Sends query profiles to a logger. diff --git a/phalcon/DataMapper/Pdo/Profiler/ProfilerInterface.zep b/phalcon/DataMapper/Pdo/Profiler/ProfilerInterface.zep index c71ae1b4cda..c855d5fda93 100644 --- a/phalcon/DataMapper/Pdo/Profiler/ProfilerInterface.zep +++ b/phalcon/DataMapper/Pdo/Profiler/ProfilerInterface.zep @@ -15,7 +15,7 @@ namespace Phalcon\DataMapper\Pdo\Profiler; -use Psr\Log\LoggerInterface; +use PsrExt\Log\LoggerInterface; /** * Interface to send query profiles to a logger. diff --git a/phalcon/Html/Link/EvolvableLink.zep b/phalcon/Html/Link/EvolvableLink.zep index ac231e08862..3358255d4fd 100644 --- a/phalcon/Html/Link/EvolvableLink.zep +++ b/phalcon/Html/Link/EvolvableLink.zep @@ -10,7 +10,7 @@ namespace Phalcon\Html\Link; -use Psr\Link\EvolvableLinkInterface; +use PsrExt\Link\EvolvableLinkInterface; /** * Class Phalcon\Http\Link\EvolvableLink diff --git a/phalcon/Html/Link/EvolvableLinkProvider.zep b/phalcon/Html/Link/EvolvableLinkProvider.zep index 81add25dbf0..01db326ec6f 100644 --- a/phalcon/Html/Link/EvolvableLinkProvider.zep +++ b/phalcon/Html/Link/EvolvableLinkProvider.zep @@ -10,8 +10,8 @@ namespace Phalcon\Html\Link; -use Psr\Link\EvolvableLinkProviderInterface; -use Psr\Link\LinkInterface; +use PsrExt\Link\EvolvableLinkProviderInterface; +use PsrExt\Link\LinkInterface; /** * Class Phalcon\Http\Link\LinkProvider diff --git a/phalcon/Html/Link/Link.zep b/phalcon/Html/Link/Link.zep index cb2f497e79b..a84601b4fde 100644 --- a/phalcon/Html/Link/Link.zep +++ b/phalcon/Html/Link/Link.zep @@ -12,7 +12,7 @@ namespace Phalcon\Html\Link; use Phalcon\Support\Collection; use Phalcon\Support\Collection\CollectionInterface; -use Psr\Link\LinkInterface; +use PsrExt\Link\LinkInterface; /** * Class Phalcon\Http\Link\Link diff --git a/phalcon/Html/Link/LinkProvider.zep b/phalcon/Html/Link/LinkProvider.zep index 584b5a3e600..a3175b39d57 100644 --- a/phalcon/Html/Link/LinkProvider.zep +++ b/phalcon/Html/Link/LinkProvider.zep @@ -10,8 +10,8 @@ namespace Phalcon\Html\Link; -use Psr\Link\LinkInterface; -use Psr\Link\LinkProviderInterface; +use PsrExt\Link\LinkInterface; +use PsrExt\Link\LinkProviderInterface; /** * @property LinkInterface[] links diff --git a/phalcon/Html/Link/Serializer/Header.zep b/phalcon/Html/Link/Serializer/Header.zep index 9cb1a611fd4..f21a3301ed6 100644 --- a/phalcon/Html/Link/Serializer/Header.zep +++ b/phalcon/Html/Link/Serializer/Header.zep @@ -10,7 +10,7 @@ namespace Phalcon\Html\Link\Serializer; -use Psr\Link\EvolvableLinkInterface; +use PsrExt\Link\EvolvableLinkInterface; /** * Class Phalcon\Http\Link\Serializer\Header diff --git a/phalcon/Http/Message/AbstractMessage.zep b/phalcon/Http/Message/AbstractMessage.zep index 5793596d047..1c2ea4725f7 100644 --- a/phalcon/Http/Message/AbstractMessage.zep +++ b/phalcon/Http/Message/AbstractMessage.zep @@ -17,8 +17,8 @@ namespace Phalcon\Http\Message; use Phalcon\Support\Collection; use Phalcon\Support\Collection\CollectionInterface; use Phalcon\Http\Message\Exception\InvalidArgumentException; -use Psr\Http\Message\StreamInterface; -use Psr\Http\Message\UriInterface; +use PsrExt\Http\Message\StreamInterface; +use PsrExt\Http\Message\UriInterface; /** * Message methods diff --git a/phalcon/Http/Message/AbstractRequest.zep b/phalcon/Http/Message/AbstractRequest.zep index 3bf9f831111..36dd2dc8647 100644 --- a/phalcon/Http/Message/AbstractRequest.zep +++ b/phalcon/Http/Message/AbstractRequest.zep @@ -15,7 +15,7 @@ namespace Phalcon\Http\Message; use Phalcon\Http\Message\Exception\InvalidArgumentException; -use Psr\Http\Message\UriInterface; +use PsrExt\Http\Message\UriInterface; /** * Request methods diff --git a/phalcon/Http/Message/Request.zep b/phalcon/Http/Message/Request.zep index 0713c85cda0..e6bd432c797 100644 --- a/phalcon/Http/Message/Request.zep +++ b/phalcon/Http/Message/Request.zep @@ -16,9 +16,9 @@ namespace Phalcon\Http\Message; use Phalcon\Http\Message\Stream\Input; use Phalcon\Http\Message\AbstractRequest; -use Psr\Http\Message\RequestInterface; -use Psr\Http\Message\StreamInterface; -use Psr\Http\Message\UriInterface; +use PsrExt\Http\Message\RequestInterface; +use PsrExt\Http\Message\StreamInterface; +use PsrExt\Http\Message\UriInterface; /** * PSR-7 Request diff --git a/phalcon/Http/Message/RequestFactory.zep b/phalcon/Http/Message/RequestFactory.zep index 04d9ea2f891..73c2ca57566 100644 --- a/phalcon/Http/Message/RequestFactory.zep +++ b/phalcon/Http/Message/RequestFactory.zep @@ -14,9 +14,9 @@ namespace Phalcon\Http\Message; -use Psr\Http\Message\RequestInterface; -use Psr\Http\Message\RequestFactoryInterface; -use Psr\Http\Message\UriInterface; +use PsrExt\Http\Message\RequestInterface; +use PsrExt\Http\Message\RequestFactoryInterface; +use PsrExt\Http\Message\UriInterface; /** * PSR-17 RequestFactory diff --git a/phalcon/Http/Message/Response.zep b/phalcon/Http/Message/Response.zep index bfba95189f8..318b6b89d33 100644 --- a/phalcon/Http/Message/Response.zep +++ b/phalcon/Http/Message/Response.zep @@ -16,7 +16,7 @@ namespace Phalcon\Http\Message; use Phalcon\Http\Message\AbstractMessage; use Phalcon\Http\Message\Exception\InvalidArgumentException; -use Psr\Http\Message\ResponseInterface; +use PsrExt\Http\Message\ResponseInterface; /** * PSR-7 Response diff --git a/phalcon/Http/Message/ResponseFactory.zep b/phalcon/Http/Message/ResponseFactory.zep index a7e8370ca84..0660e74b3a8 100644 --- a/phalcon/Http/Message/ResponseFactory.zep +++ b/phalcon/Http/Message/ResponseFactory.zep @@ -14,8 +14,8 @@ namespace Phalcon\Http\Message; -use Psr\Http\Message\ResponseInterface; -use Psr\Http\Message\ResponseFactoryInterface; +use PsrExt\Http\Message\ResponseInterface; +use PsrExt\Http\Message\ResponseFactoryInterface; /** * PSR-17 ResponseFactory diff --git a/phalcon/Http/Message/ServerRequest.zep b/phalcon/Http/Message/ServerRequest.zep index c617e7446ae..775507e7680 100644 --- a/phalcon/Http/Message/ServerRequest.zep +++ b/phalcon/Http/Message/ServerRequest.zep @@ -18,10 +18,10 @@ use Phalcon\Support\Collection; use Phalcon\Support\Collection\CollectionInterface; use Phalcon\Http\Message\Exception\InvalidArgumentException; use Phalcon\Http\Message\Stream\Input; -use Psr\Http\Message\ServerRequestInterface; -use Psr\Http\Message\StreamInterface; -use Psr\Http\Message\UploadedFileInterface; -use Psr\Http\Message\UriInterface; +use PsrExt\Http\Message\ServerRequestInterface; +use PsrExt\Http\Message\StreamInterface; +use PsrExt\Http\Message\UploadedFileInterface; +use PsrExt\Http\Message\UriInterface; /** * PSR-7 ServerRequest diff --git a/phalcon/Http/Message/ServerRequestFactory.zep b/phalcon/Http/Message/ServerRequestFactory.zep index f850a0a0f3f..c3b967d4a61 100644 --- a/phalcon/Http/Message/ServerRequestFactory.zep +++ b/phalcon/Http/Message/ServerRequestFactory.zep @@ -17,10 +17,10 @@ namespace Phalcon\Http\Message; use Phalcon\Support\Collection; use Phalcon\Support\Collection\CollectionInterface; use Phalcon\Http\Message\Exception\InvalidArgumentException; -use Psr\Http\Message\ServerRequestFactoryInterface; -use Psr\Http\Message\ServerRequestInterface; -use Psr\Http\Message\UriInterface; -use Psr\Http\Message\UploadedFileInterface; +use PsrExt\Http\Message\ServerRequestFactoryInterface; +use PsrExt\Http\Message\ServerRequestInterface; +use PsrExt\Http\Message\UriInterface; +use PsrExt\Http\Message\UploadedFileInterface; /** * PSR-17 ServerRequestFactory diff --git a/phalcon/Http/Message/Stream.zep b/phalcon/Http/Message/Stream.zep index 7e856b081e9..433ce12633d 100644 --- a/phalcon/Http/Message/Stream.zep +++ b/phalcon/Http/Message/Stream.zep @@ -15,7 +15,7 @@ namespace Phalcon\Http\Message; use Exception; -use Psr\Http\Message\StreamInterface; +use PsrExt\Http\Message\StreamInterface; use RuntimeException; /** diff --git a/phalcon/Http/Message/StreamFactory.zep b/phalcon/Http/Message/StreamFactory.zep index 7f7894bd5d6..3e014c27ad0 100644 --- a/phalcon/Http/Message/StreamFactory.zep +++ b/phalcon/Http/Message/StreamFactory.zep @@ -15,8 +15,8 @@ namespace Phalcon\Http\Message; use Phalcon\Http\Message\Exception\InvalidArgumentException; -use Psr\Http\Message\StreamFactoryInterface; -use Psr\Http\Message\StreamInterface; +use PsrExt\Http\Message\StreamFactoryInterface; +use PsrExt\Http\Message\StreamInterface; /** * PSR-17 StreamFactory diff --git a/phalcon/Http/Message/UploadedFile.zep b/phalcon/Http/Message/UploadedFile.zep index 054d60367a4..fc84b0cdc80 100644 --- a/phalcon/Http/Message/UploadedFile.zep +++ b/phalcon/Http/Message/UploadedFile.zep @@ -15,8 +15,8 @@ namespace Phalcon\Http\Message; use Phalcon\Http\Message\Exception\InvalidArgumentException; -use Psr\Http\Message\StreamInterface; -use Psr\Http\Message\UploadedFileInterface; +use PsrExt\Http\Message\StreamInterface; +use PsrExt\Http\Message\UploadedFileInterface; use RuntimeException; /** diff --git a/phalcon/Http/Message/UploadedFileFactory.zep b/phalcon/Http/Message/UploadedFileFactory.zep index 62804bb17a8..5bcae6de3e3 100644 --- a/phalcon/Http/Message/UploadedFileFactory.zep +++ b/phalcon/Http/Message/UploadedFileFactory.zep @@ -14,9 +14,9 @@ namespace Phalcon\Http\Message; -use Psr\Http\Message\StreamInterface; -use Psr\Http\Message\UploadedFileInterface; -use Psr\Http\Message\UploadedFileFactoryInterface; +use PsrExt\Http\Message\StreamInterface; +use PsrExt\Http\Message\UploadedFileInterface; +use PsrExt\Http\Message\UploadedFileFactoryInterface; /** * PSR-17 UploadedFileFactory diff --git a/phalcon/Http/Message/Uri.zep b/phalcon/Http/Message/Uri.zep index 04043c92471..d59cc4cffb8 100644 --- a/phalcon/Http/Message/Uri.zep +++ b/phalcon/Http/Message/Uri.zep @@ -15,7 +15,7 @@ namespace Phalcon\Http\Message; use Phalcon\Http\Message\Exception\InvalidArgumentException; -use Psr\Http\Message\UriInterface; +use PsrExt\Http\Message\UriInterface; /** * PSR-7 Uri diff --git a/phalcon/Http/Message/UriFactory.zep b/phalcon/Http/Message/UriFactory.zep index 04389cf684b..5f71b3fe497 100644 --- a/phalcon/Http/Message/UriFactory.zep +++ b/phalcon/Http/Message/UriFactory.zep @@ -14,8 +14,8 @@ namespace Phalcon\Http\Message; -use Psr\Http\Message\UriFactoryInterface; -use Psr\Http\Message\UriInterface; +use PsrExt\Http\Message\UriFactoryInterface; +use PsrExt\Http\Message\UriInterface; /** * PSR-17 UriFactory diff --git a/phalcon/Http/Server/AbstractMiddleware.zep b/phalcon/Http/Server/AbstractMiddleware.zep index 2cb7bc9b3b4..56a360760c8 100644 --- a/phalcon/Http/Server/AbstractMiddleware.zep +++ b/phalcon/Http/Server/AbstractMiddleware.zep @@ -10,10 +10,10 @@ namespace Phalcon\Http\Server; -use Psr\Http\Message\ResponseInterface; -use Psr\Http\Message\ServerRequestInterface; -use Psr\Http\Server\MiddlewareInterface; -use Psr\Http\Server\RequestHandlerInterface; +use PsrExt\Http\Message\ResponseInterface; +use PsrExt\Http\Message\ServerRequestInterface; +use PsrExt\Http\Server\MiddlewareInterface; +use PsrExt\Http\Server\RequestHandlerInterface; /** * Participant in processing a server request and response. diff --git a/phalcon/Http/Server/AbstractRequestHandler.zep b/phalcon/Http/Server/AbstractRequestHandler.zep index a19f8f41eaf..63d8c30d052 100644 --- a/phalcon/Http/Server/AbstractRequestHandler.zep +++ b/phalcon/Http/Server/AbstractRequestHandler.zep @@ -10,9 +10,9 @@ namespace Phalcon\Http\Server; -use Psr\Http\Message\ResponseInterface; -use Psr\Http\Message\ServerRequestInterface; -use Psr\Http\Server\RequestHandlerInterface; +use PsrExt\Http\Message\ResponseInterface; +use PsrExt\Http\Message\ServerRequestInterface; +use PsrExt\Http\Server\RequestHandlerInterface; /** * Handles a server request and produces a response. diff --git a/phalcon/Logger/Logger.zep b/phalcon/Logger/Logger.zep index e2bf113c9ac..191febc32f2 100644 --- a/phalcon/Logger/Logger.zep +++ b/phalcon/Logger/Logger.zep @@ -15,8 +15,8 @@ use DateTimeZone; use Exception; use Phalcon\Logger\Adapter\AdapterInterface; use Phalcon\Logger\Exception as LoggerException; -use Psr\Log\InvalidArgumentException; -use Psr\Log\LoggerInterface; +use PsrExt\Log\InvalidArgumentException; +use PsrExt\Log\LoggerInterface; /** * Phalcon Logger. diff --git a/phalcon/Mvc/Model/Query.zep b/phalcon/Mvc/Model/Query.zep index b67ee506166..d08acaf739c 100644 --- a/phalcon/Mvc/Model/Query.zep +++ b/phalcon/Mvc/Model/Query.zep @@ -24,7 +24,7 @@ use Phalcon\Mvc\Model\Resultset\Simple; use Phalcon\Di\InjectionAwareInterface; use Phalcon\Db\DialectInterface; use Phalcon\Mvc\Model\Query\Lang; -use Psr\SimpleCache\CacheInterface; +use PsrExt\SimpleCache\CacheInterface; /** * Phalcon\Mvc\Model\Query diff --git a/phalcon/Mvc/Model/Resultset.zep b/phalcon/Mvc/Model/Resultset.zep index b8b2c7eb8a0..125a97a95ba 100644 --- a/phalcon/Mvc/Model/Resultset.zep +++ b/phalcon/Mvc/Model/Resultset.zep @@ -20,7 +20,7 @@ use Phalcon\Messages\MessageInterface; use Phalcon\Mvc\Model; use Phalcon\Mvc\ModelInterface; use Phalcon\Storage\Serializer\SerializerInterface; -use Psr\SimpleCache\CacheInterface; +use PsrExt\SimpleCache\CacheInterface; use SeekableIterator; use Serializable; diff --git a/phalcon/Mvc/Model/Resultset/Complex.zep b/phalcon/Mvc/Model/Resultset/Complex.zep index 7fe4b034849..e0bced3d5f6 100644 --- a/phalcon/Mvc/Model/Resultset/Complex.zep +++ b/phalcon/Mvc/Model/Resultset/Complex.zep @@ -20,7 +20,7 @@ use Phalcon\Mvc\Model\ResultsetInterface; use Phalcon\Mvc\Model\Row; use Phalcon\Mvc\ModelInterface; use Phalcon\Storage\Serializer\SerializerInterface; -use Psr\SimpleCache\CacheInterface; +use PsrExt\SimpleCache\CacheInterface; use stdClass; /** diff --git a/phalcon/Mvc/Model/Resultset/Simple.zep b/phalcon/Mvc/Model/Resultset/Simple.zep index 25c6dd4e94e..1e2701c364d 100644 --- a/phalcon/Mvc/Model/Resultset/Simple.zep +++ b/phalcon/Mvc/Model/Resultset/Simple.zep @@ -18,7 +18,7 @@ use Phalcon\Mvc\Model\Resultset; use Phalcon\Mvc\Model\Row; use Phalcon\Mvc\ModelInterface; use Phalcon\Storage\Serializer\SerializerInterface; -use Psr\SimpleCache\CacheInterface; +use PsrExt\SimpleCache\CacheInterface; /** * Simple resultsets only contains a complete objects diff --git a/phalcon/Mvc/Model/ResultsetInterface.zep b/phalcon/Mvc/Model/ResultsetInterface.zep index 7052d397e59..fb2c35c9e84 100644 --- a/phalcon/Mvc/Model/ResultsetInterface.zep +++ b/phalcon/Mvc/Model/ResultsetInterface.zep @@ -13,7 +13,7 @@ namespace Phalcon\Mvc\Model; use Closure; use Phalcon\Messages\MessageInterface; use Phalcon\Mvc\ModelInterface; -use Psr\SimpleCache\CacheInterface; +use PsrExt\SimpleCache\CacheInterface; /** * Phalcon\Mvc\Model\ResultsetInterface From fc27afb7557c9143b431e28aed3f8daac31791fd Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Mon, 24 Jan 2022 21:26:01 +0000 Subject: [PATCH 37/91] #15598 - Fix `SessionHandlerInterface::gc()` deprecation notice in PHP8.1 --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 6f056281b99..322aa3ca54b 100644 --- a/composer.lock +++ b/composer.lock @@ -111,12 +111,12 @@ "source": { "type": "git", "url": "https://github.com/zephir-lang/zephir.git", - "reference": "d514b08589177dff04bcb93ce2401c196d7e3871" + "reference": "23825621701309e4c18c09ecbeb49da968fe9696" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zephir-lang/zephir/zipball/d514b08589177dff04bcb93ce2401c196d7e3871", - "reference": "d514b08589177dff04bcb93ce2401c196d7e3871", + "url": "https://api.github.com/repos/zephir-lang/zephir/zipball/23825621701309e4c18c09ecbeb49da968fe9696", + "reference": "23825621701309e4c18c09ecbeb49da968fe9696", "shasum": "" }, "require": { @@ -191,7 +191,7 @@ "type": "github" } ], - "time": "2022-01-23T18:38:19+00:00" + "time": "2022-01-24T21:20:29+00:00" }, { "name": "psr/container", From 6ea42d104f490678058de1038544ac5e75bec8f9 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Mon, 24 Jan 2022 21:32:09 +0000 Subject: [PATCH 38/91] #15598 - Fix number of args in `ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX` --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 322aa3ca54b..a9da5c1138a 100644 --- a/composer.lock +++ b/composer.lock @@ -111,12 +111,12 @@ "source": { "type": "git", "url": "https://github.com/zephir-lang/zephir.git", - "reference": "23825621701309e4c18c09ecbeb49da968fe9696" + "reference": "1c62f6cd11ceec936b82bb536b249ebc19bff38b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zephir-lang/zephir/zipball/23825621701309e4c18c09ecbeb49da968fe9696", - "reference": "23825621701309e4c18c09ecbeb49da968fe9696", + "url": "https://api.github.com/repos/zephir-lang/zephir/zipball/1c62f6cd11ceec936b82bb536b249ebc19bff38b", + "reference": "1c62f6cd11ceec936b82bb536b249ebc19bff38b", "shasum": "" }, "require": { @@ -191,7 +191,7 @@ "type": "github" } ], - "time": "2022-01-24T21:20:29+00:00" + "time": "2022-01-24T21:30:37+00:00" }, { "name": "psr/container", From 1ba37975f83e6bbd92ee3f86e78cf29213d38d21 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Mon, 24 Jan 2022 21:45:05 +0000 Subject: [PATCH 39/91] #15598 - Suppress `MissingDependency` in Psalm --- psalm.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/psalm.xml b/psalm.xml index 801173f617a..51dae29a2b7 100644 --- a/psalm.xml +++ b/psalm.xml @@ -17,5 +17,6 @@ + From 3ac487eb3166e280b6e7d2f12edb91d62a241721 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Mon, 24 Jan 2022 22:19:46 +0000 Subject: [PATCH 40/91] #15598 - Partial fix of psalm errors --- phalcon/Cache/Exception/Exception.zep | 2 +- phalcon/Cache/Exception/InvalidArgumentException.zep | 2 +- phalcon/Html/Link/EvolvableLinkProvider.zep | 2 +- phalcon/Mvc/Model/Query.zep | 2 +- phalcon/Session/Adapter/AbstractAdapter.zep | 3 +++ phalcon/Session/Adapter/Noop.zep | 3 +++ phalcon/Session/Adapter/Stream.zep | 3 +++ psalm.xml | 1 - 8 files changed, 13 insertions(+), 5 deletions(-) diff --git a/phalcon/Cache/Exception/Exception.zep b/phalcon/Cache/Exception/Exception.zep index 468269e7875..86452b2862b 100644 --- a/phalcon/Cache/Exception/Exception.zep +++ b/phalcon/Cache/Exception/Exception.zep @@ -13,7 +13,7 @@ namespace Phalcon\Cache\Exception; /** * Exceptions thrown in Phalcon\Cache will use this class */ -class Exception extends \Exception implements \Psr\SimpleCache\CacheException +class Exception extends \Exception implements \PsrExt\SimpleCache\CacheException { } diff --git a/phalcon/Cache/Exception/InvalidArgumentException.zep b/phalcon/Cache/Exception/InvalidArgumentException.zep index 3b369c2f693..8dd8197bc51 100644 --- a/phalcon/Cache/Exception/InvalidArgumentException.zep +++ b/phalcon/Cache/Exception/InvalidArgumentException.zep @@ -13,7 +13,7 @@ namespace Phalcon\Cache\Exception; /** * Exceptions thrown in Phalcon\Cache will use this class */ -class InvalidArgumentException extends \Exception implements \Psr\SimpleCache\InvalidArgumentException +class InvalidArgumentException extends \Exception implements \PsrExt\SimpleCache\InvalidArgumentException { } diff --git a/phalcon/Html/Link/EvolvableLinkProvider.zep b/phalcon/Html/Link/EvolvableLinkProvider.zep index 01db326ec6f..75e75a26c34 100644 --- a/phalcon/Html/Link/EvolvableLinkProvider.zep +++ b/phalcon/Html/Link/EvolvableLinkProvider.zep @@ -27,7 +27,7 @@ class EvolvableLinkProvider extends LinkProvider implements EvolvableLinkProvide * normally without errors. The link is present if link is === identical * to a link object already in the collection. * - * @param LinkInterface link + * @param \Psr\Link\LinkInterface link * A link object that should be included in this collection. * * @return static diff --git a/phalcon/Mvc/Model/Query.zep b/phalcon/Mvc/Model/Query.zep index d08acaf739c..a4cc0b4ae02 100644 --- a/phalcon/Mvc/Model/Query.zep +++ b/phalcon/Mvc/Model/Query.zep @@ -100,7 +100,7 @@ class Query implements QueryInterface, InjectionAwareInterface protected bindTypes = []; /** - * @var \Psr\SimpleCache\CacheInterface|null + * @var \PsrExt\SimpleCache\CacheInterface|null */ protected cache = null; diff --git a/phalcon/Session/Adapter/AbstractAdapter.zep b/phalcon/Session/Adapter/AbstractAdapter.zep index c01a8015c36..bd6073b75ab 100644 --- a/phalcon/Session/Adapter/AbstractAdapter.zep +++ b/phalcon/Session/Adapter/AbstractAdapter.zep @@ -42,6 +42,9 @@ abstract class AbstractAdapter implements SessionHandlerInterface /** * Garbage Collector + * + * @param int $maxlifetime + * @return false|int */ public function gc(int maxlifetime) -> int|bool { diff --git a/phalcon/Session/Adapter/Noop.zep b/phalcon/Session/Adapter/Noop.zep index 3c117e154fd..a5a6435f411 100644 --- a/phalcon/Session/Adapter/Noop.zep +++ b/phalcon/Session/Adapter/Noop.zep @@ -95,6 +95,9 @@ class Noop implements SessionHandlerInterface /** * Garbage Collector + * + * @param int $maxlifetime + * @return false|int */ public function gc(int maxlifetime) -> int|bool { diff --git a/phalcon/Session/Adapter/Stream.zep b/phalcon/Session/Adapter/Stream.zep index 39ab2e2d331..419303493e3 100644 --- a/phalcon/Session/Adapter/Stream.zep +++ b/phalcon/Session/Adapter/Stream.zep @@ -85,6 +85,9 @@ class Stream extends Noop /** * Garbage Collector + * + * @param int $maxlifetime + * @return false|int */ public function gc(int maxlifetime) -> int|bool { diff --git a/psalm.xml b/psalm.xml index 51dae29a2b7..801173f617a 100644 --- a/psalm.xml +++ b/psalm.xml @@ -17,6 +17,5 @@ - From db977a8d15a24a44bb6f015dcdf5db607d06038c Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 20 Mar 2022 18:34:50 +0000 Subject: [PATCH 41/91] #15598 - Bump ZEPHIR_PARSER_VERSION and ZEPHIR_VERSION --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cab6427e77b..af599e3980b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,8 +20,8 @@ on: env: # All versions should be declared here PHALCON_VERSION: 5.0.0beta3 - ZEPHIR_PARSER_VERSION: 1.4.2 - ZEPHIR_VERSION: 0.15.2 + ZEPHIR_PARSER_VERSION: 1.5.0 + ZEPHIR_VERSION: 0.16.0 PSR_VERSION: 1.2.0 # For tests From d45270c212f0ab650c83cbe28a684795e9eb4f89 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 20 Mar 2022 18:39:03 +0000 Subject: [PATCH 42/91] #15598 - Update composer packages --- composer.json | 60 ++++---- composer.lock | 407 +++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 397 insertions(+), 70 deletions(-) diff --git a/composer.json b/composer.json index 6c97dba7fed..66ee8df505d 100644 --- a/composer.json +++ b/composer.json @@ -31,38 +31,38 @@ } ], "require": { - "php": ">=7.4", - "phalcon/zephir": "dev-#2341-dynamic-arg-info" - }, - "require-dev": { - "ext-apcu": "*", - "ext-dom": "*", - "ext-gd": "*", - "ext-iconv": "*", - "ext-igbinary": "*", - "ext-imagick": "*", - "ext-intl": "*", - "ext-json": "*", - "ext-libxml": "*", - "ext-mbstring": "*", - "ext-msgpack": "*", - "ext-pdo": "*", - "ext-psr": "^1.0", - "ext-redis": "*", - "ext-sqlite3": "*", - "ext-xml": "*", - "codeception/codeception": "^4.0", - "codeception/module-apc": "^1.0.0", - "codeception/module-asserts": "^1.0.0", - "codeception/module-cli": "^1.0.0", - "codeception/module-db": "^1.0.0", - "codeception/module-filesystem": "^1.0.0", - "codeception/module-memcache": "^2.0", + "php": ">=7.4" + }, + "require-dev": { + "ext-apcu": "*", + "ext-dom": "*", + "ext-gd": "*", + "ext-iconv": "*", + "ext-igbinary": "*", + "ext-imagick": "*", + "ext-intl": "*", + "ext-json": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-msgpack": "*", + "ext-pdo": "*", + "ext-psr": "^1.0", + "ext-redis": "*", + "ext-sqlite3": "*", + "ext-xml": "*", + "codeception/codeception": "^4.0", + "codeception/module-apc": "^1.0.0", + "codeception/module-asserts": "^1.0.0", + "codeception/module-cli": "^1.0.0", + "codeception/module-db": "^1.0.0", + "codeception/module-filesystem": "^1.0.0", + "codeception/module-memcache": "^2.0", "codeception/module-phalcon5": "^1.0.0", "codeception/module-redis": "^1.0.0", "friendsofphp/php-cs-fixer": "~3.0", "mustache/mustache": "^2.14.1", "phalcon/ide-stubs": "^4.1", + "phalcon/zephir": "dev-development", "phpunit/phpunit": "^8.5", "predis/predis": "^1.1", "squizlabs/php_codesniffer": "^3.4", @@ -74,9 +74,9 @@ "optimize-autoloader": true, "preferred-install": "dist", "sort-packages": true, - "allow-plugins": { - "composer/package-versions-deprecated": true - } + "allow-plugins": { + "composer/package-versions-deprecated": true + } }, "autoload-dev": { "psr-4": { diff --git a/composer.lock b/composer.lock index 2eebaf8d469..9d05c23cf29 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5eb2c3ac8103eb5c54906075dcfe2ce4", + "content-hash": "61f924770cab6ad2120afb013fe2ceab", "packages": [], "packages-dev": [ { @@ -1664,16 +1664,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.7.0", + "version": "v3.8.0", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "7705d5a985132a40282d18a176eb9a4a0497747c" + "reference": "cbad1115aac4b5c3c5540e7210d3c9fba2f81fa3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/7705d5a985132a40282d18a176eb9a4a0497747c", - "reference": "7705d5a985132a40282d18a176eb9a4a0497747c", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/cbad1115aac4b5c3c5540e7210d3c9fba2f81fa3", + "reference": "cbad1115aac4b5c3c5540e7210d3c9fba2f81fa3", "shasum": "" }, "require": { @@ -1741,7 +1741,7 @@ "description": "A tool to automatically fix PHP code style", "support": { "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", - "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.7.0" + "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.8.0" }, "funding": [ { @@ -1749,20 +1749,82 @@ "type": "github" } ], - "time": "2022-03-07T16:59:59+00:00" + "time": "2022-03-18T17:20:59+00:00" + }, + { + "name": "graham-campbell/result-type", + "version": "v1.0.4", + "source": { + "type": "git", + "url": "https://github.com/GrahamCampbell/Result-Type.git", + "reference": "0690bde05318336c7221785f2a932467f98b64ca" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/0690bde05318336c7221785f2a932467f98b64ca", + "reference": "0690bde05318336c7221785f2a932467f98b64ca", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^8.0", + "phpoption/phpoption": "^1.8" + }, + "require-dev": { + "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8" + }, + "type": "library", + "autoload": { + "psr-4": { + "GrahamCampbell\\ResultType\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + } + ], + "description": "An Implementation Of The Result Type", + "keywords": [ + "Graham Campbell", + "GrahamCampbell", + "Result Type", + "Result-Type", + "result" + ], + "support": { + "issues": "https://github.com/GrahamCampbell/Result-Type/issues", + "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.0.4" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/graham-campbell/result-type", + "type": "tidelift" + } + ], + "time": "2021-11-21T21:41:47+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "7.4.1", + "version": "7.4.2", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79" + "reference": "ac1ec1cd9b5624694c3a40be801d94137afb12b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ee0a041b1760e6a53d2a39c8c34115adc2af2c79", - "reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ac1ec1cd9b5624694c3a40be801d94137afb12b4", + "reference": "ac1ec1cd9b5624694c3a40be801d94137afb12b4", "shasum": "" }, "require": { @@ -1857,7 +1919,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.4.1" + "source": "https://github.com/guzzle/guzzle/tree/7.4.2" }, "funding": [ { @@ -1873,7 +1935,7 @@ "type": "tidelift" } ], - "time": "2021-12-06T18:43:05+00:00" + "time": "2022-03-20T14:16:28+00:00" }, { "name": "guzzlehttp/promises", @@ -1961,16 +2023,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "2.1.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72" + "reference": "6565c7e0db3231e92dd5ca3bed448b30fbc89eb1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/089edd38f5b8abba6cb01567c2a8aaa47cec4c72", - "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/6565c7e0db3231e92dd5ca3bed448b30fbc89eb1", + "reference": "6565c7e0db3231e92dd5ca3bed448b30fbc89eb1", "shasum": "" }, "require": { @@ -1994,7 +2056,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } }, "autoload": { @@ -2056,7 +2118,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.1.0" + "source": "https://github.com/guzzle/psr7/tree/2.2.0" }, "funding": [ { @@ -2072,7 +2134,106 @@ "type": "tidelift" } ], - "time": "2021-10-06T17:43:30+00:00" + "time": "2022-03-20T13:51:08+00:00" + }, + { + "name": "monolog/monolog", + "version": "2.4.0", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/monolog.git", + "reference": "d7fd7450628561ba697b7097d86db72662f54aef" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/d7fd7450628561ba697b7097d86db72662f54aef", + "reference": "d7fd7450628561ba697b7097d86db72662f54aef", + "shasum": "" + }, + "require": { + "php": ">=7.2", + "psr/log": "^1.0.1 || ^2.0 || ^3.0" + }, + "provide": { + "psr/log-implementation": "1.0.0 || 2.0.0 || 3.0.0" + }, + "require-dev": { + "aws/aws-sdk-php": "^2.4.9 || ^3.0", + "doctrine/couchdb": "~1.0@dev", + "elasticsearch/elasticsearch": "^7", + "graylog2/gelf-php": "^1.4.2", + "mongodb/mongodb": "^1.8", + "php-amqplib/php-amqplib": "~2.4 || ^3", + "php-console/php-console": "^3.1.3", + "phpspec/prophecy": "^1.6.1", + "phpstan/phpstan": "^0.12.91", + "phpunit/phpunit": "^8.5", + "predis/predis": "^1.1", + "rollbar/rollbar": "^1.3 || ^2 || ^3", + "ruflin/elastica": ">=0.90@dev", + "swiftmailer/swiftmailer": "^5.3|^6.0" + }, + "suggest": { + "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", + "doctrine/couchdb": "Allow sending log messages to a CouchDB server", + "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client", + "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", + "ext-curl": "Required to send log messages using the IFTTTHandler, the LogglyHandler, the SendGridHandler, the SlackWebhookHandler or the TelegramBotHandler", + "ext-mbstring": "Allow to work properly with unicode symbols", + "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)", + "ext-openssl": "Required to send log messages using SSL", + "ext-sockets": "Allow sending log messages to a Syslog server (via UDP driver)", + "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", + "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)", + "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", + "php-console/php-console": "Allow sending log messages to Google Chrome", + "rollbar/rollbar": "Allow sending log messages to Rollbar", + "ruflin/elastica": "Allow sending log messages to an Elastic Search server" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.x-dev" + } + }, + "autoload": { + "psr-4": { + "Monolog\\": "src/Monolog" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "https://seld.be" + } + ], + "description": "Sends your logs to files, sockets, inboxes, databases and various web services", + "homepage": "https://github.com/Seldaek/monolog", + "keywords": [ + "log", + "logging", + "psr-3" + ], + "support": { + "issues": "https://github.com/Seldaek/monolog/issues", + "source": "https://github.com/Seldaek/monolog/tree/2.4.0" + }, + "funding": [ + { + "url": "https://github.com/Seldaek", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/monolog/monolog", + "type": "tidelift" + } + ], + "time": "2022-03-14T12:44:37+00:00" }, { "name": "mustache/mustache", @@ -2410,6 +2571,95 @@ ], "time": "2020-11-13T10:58:11+00:00" }, + { + "name": "phalcon/zephir", + "version": "dev-development", + "source": { + "type": "git", + "url": "https://github.com/zephir-lang/zephir.git", + "reference": "fd6e5f1e8139d7f1e88fa370da6aeaa3b650a855" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zephir-lang/zephir/zipball/fd6e5f1e8139d7f1e88fa370da6aeaa3b650a855", + "reference": "fd6e5f1e8139d7f1e88fa370da6aeaa3b650a855", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "ext-hash": "*", + "ext-json": "*", + "ext-mbstring": "*", + "ext-pcre": "*", + "ext-xml": "*", + "ext-zlib": "*", + "monolog/monolog": "^2.3", + "php": ">=7.4.1", + "symfony/console": "^5.2", + "symfony/event-dispatcher": "^5.3" + }, + "require-dev": { + "ext-gmp": "*", + "ext-pdo": "*", + "ext-pdo_sqlite": "*", + "ext-zip": "*", + "phpunit/phpunit": "^9.5", + "psr/log": "1.1.*" + }, + "default-branch": true, + "bin": [ + "zephir" + ], + "type": "library", + "autoload": { + "files": [ + "Library/functions.php" + ], + "psr-4": { + "Zephir\\": "Library" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Phalcon Team", + "email": "team@zephir-lang.com", + "homepage": "https://zephir-lang.com" + }, + { + "name": "Contributors", + "homepage": "https://github.com/zephir-lang/zephir/graphs/contributors" + } + ], + "description": "Zephir is a compiled high level language aimed to the creation of C-extensions for PHP", + "homepage": "https://zephir-lang.com", + "keywords": [ + "extension", + "internals", + "phalcon", + "zephir" + ], + "support": { + "docs": "https://docs.zephir-lang.com", + "irc": "irc://irc.freenode.net/zephir", + "issues": "https://github.com/zephir-lang/zephir/issues?state=open", + "source": "https://github.com/zephir-lang/zephir" + }, + "funding": [ + { + "url": "https://opencollective.com/phalcon", + "type": "custom" + }, + { + "url": "https://github.com/phalcon", + "type": "github" + } + ], + "time": "2022-03-20T15:13:42+00:00" + }, { "name": "phar-io/manifest", "version": "2.0.3", @@ -2733,6 +2983,77 @@ }, "time": "2022-01-04T19:58:01+00:00" }, + { + "name": "phpoption/phpoption", + "version": "1.8.1", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/php-option.git", + "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15", + "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^8.0" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.4.1", + "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.8-dev" + } + }, + "autoload": { + "psr-4": { + "PhpOption\\": "src/PhpOption/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh" + }, + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + } + ], + "description": "Option Type for PHP", + "keywords": [ + "language", + "option", + "php", + "type" + ], + "support": { + "issues": "https://github.com/schmittjoh/php-option/issues", + "source": "https://github.com/schmittjoh/php-option/tree/1.8.1" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption", + "type": "tidelift" + } + ], + "time": "2021-12-04T23:24:31+00:00" + }, { "name": "phpspec/prophecy", "version": "v1.15.0", @@ -3099,16 +3420,16 @@ }, { "name": "phpunit/phpunit", - "version": "8.5.24", + "version": "8.5.25", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "293cb0099d75407d971a73f41e51f35b664667ed" + "reference": "9ff23f4dfde040ccd3b8db876192d1184b934158" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/293cb0099d75407d971a73f41e51f35b664667ed", - "reference": "293cb0099d75407d971a73f41e51f35b664667ed", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9ff23f4dfde040ccd3b8db876192d1184b934158", + "reference": "9ff23f4dfde040ccd3b8db876192d1184b934158", "shasum": "" }, "require": { @@ -3180,7 +3501,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.24" + "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.25" }, "funding": [ { @@ -3192,7 +3513,7 @@ "type": "github" } ], - "time": "2022-03-05T16:52:36+00:00" + "time": "2022-03-16T16:24:13+00:00" }, { "name": "predis/predis", @@ -6360,35 +6681,39 @@ }, { "name": "vlucas/phpdotenv", - "version": "v2.6.9", + "version": "v5.4.1", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "2e93cc98e2e8e869f8d9cfa61bb3a99ba4fc4141" + "reference": "264dce589e7ce37a7ba99cb901eed8249fbec92f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2e93cc98e2e8e869f8d9cfa61bb3a99ba4fc4141", - "reference": "2e93cc98e2e8e869f8d9cfa61bb3a99ba4fc4141", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/264dce589e7ce37a7ba99cb901eed8249fbec92f", + "reference": "264dce589e7ce37a7ba99cb901eed8249fbec92f", "shasum": "" }, "require": { - "php": "^5.3.9 || ^7.0 || ^8.0", - "symfony/polyfill-ctype": "^1.17" + "ext-pcre": "*", + "graham-campbell/result-type": "^1.0.2", + "php": "^7.1.3 || ^8.0", + "phpoption/phpoption": "^1.8", + "symfony/polyfill-ctype": "^1.23", + "symfony/polyfill-mbstring": "^1.23.1", + "symfony/polyfill-php80": "^1.23.1" }, "require-dev": { + "bamarni/composer-bin-plugin": "^1.4.1", "ext-filter": "*", - "ext-pcre": "*", - "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.21" + "phpunit/phpunit": "^7.5.20 || ^8.5.21 || ^9.5.10" }, "suggest": { - "ext-filter": "Required to use the boolean validator.", - "ext-pcre": "Required to use most of the library." + "ext-filter": "Required to use the boolean validator." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "5.4-dev" } }, "autoload": { @@ -6420,7 +6745,7 @@ ], "support": { "issues": "https://github.com/vlucas/phpdotenv/issues", - "source": "https://github.com/vlucas/phpdotenv/tree/v2.6.9" + "source": "https://github.com/vlucas/phpdotenv/tree/v5.4.1" }, "funding": [ { @@ -6432,7 +6757,7 @@ "type": "tidelift" } ], - "time": "2021-12-12T22:59:22+00:00" + "time": "2021-12-12T23:22:04+00:00" }, { "name": "webmozart/assert", @@ -6546,7 +6871,9 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "phalcon/zephir": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { From d958de70f9b2b0b492e1738488686251801a9282 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 20 Mar 2022 18:41:43 +0000 Subject: [PATCH 43/91] #15598 - Regenerate `ext/` directory --- ext/config.m4 | 1 + ext/config.w32 | 2 +- ext/kernel/file.c | 12 ++ ext/kernel/main.c | 6 +- ext/kernel/require.c | 23 ++- ext/phalcon.c | 2 + ext/phalcon.h | 1 + ext/phalcon/0__closure.zep.c | 1 + ext/phalcon/10__closure.zep.c | 1 + ext/phalcon/11__closure.zep.c | 1 + ext/phalcon/12__closure.zep.c | 1 + ext/phalcon/13__closure.zep.c | 1 + ext/phalcon/14__closure.zep.c | 1 + ext/phalcon/15__closure.zep.c | 1 + ext/phalcon/16__closure.zep.c | 1 + ext/phalcon/1__closure.zep.c | 1 + ext/phalcon/2__closure.zep.c | 1 + ext/phalcon/3__closure.zep.c | 1 + ext/phalcon/4__closure.zep.c | 1 + ext/phalcon/5__closure.zep.c | 1 + ext/phalcon/6__closure.zep.c | 1 + ext/phalcon/7__closure.zep.c | 1 + ext/phalcon/8__closure.zep.c | 1 + ext/phalcon/9__closure.zep.c | 1 + ext/phalcon/annotations/collection.zep.h | 10 +- ext/phalcon/assets/collection.zep.h | 6 +- ext/phalcon/assets/manager.zep.c | 26 ++-- ext/phalcon/cache/cache.zep.c | 2 +- ext/phalcon/cache/cachefactory.zep.h | 4 +- ext/phalcon/cache/exception/exception.zep.c | 2 +- .../exception/invalidargumentexception.zep.c | 2 +- ext/phalcon/container/container.zep.c | 2 +- .../pdo/profiler/memorylogger.zep.c | 2 +- .../datamapper/pdo/profiler/profiler.zep.c | 2 +- .../datamapper/pdo/profiler/profiler.zep.h | 4 +- .../pdo/profiler/profilerinterface.zep.h | 2 +- ext/phalcon/db/enum.zep.c | 2 + ext/phalcon/db/result/pdoresult.zep.c | 146 +++++++++++------- ext/phalcon/db/result/pdoresult.zep.h | 12 +- ext/phalcon/di/di.zep.c | 62 ++++---- ext/phalcon/di/di.zep.h | 6 +- ext/phalcon/filter/sanitize/stringval.zep.c | 61 +++++++- .../filter/validation/abstractvalidator.zep.c | 12 +- .../filter/validation/abstractvalidator.zep.h | 2 +- ext/phalcon/forms/form.zep.h | 10 +- ext/phalcon/html/link/evolvablelink.zep.c | 2 +- .../html/link/evolvablelinkprovider.zep.c | 8 +- .../html/link/evolvablelinkprovider.zep.h | 4 +- ext/phalcon/html/link/link.zep.c | 2 +- ext/phalcon/html/link/linkprovider.zep.c | 8 +- ext/phalcon/html/link/linkprovider.zep.h | 2 +- .../http/message/abstractmessage.zep.c | 6 +- .../http/message/abstractmessage.zep.h | 6 +- .../http/message/abstractrequest.zep.c | 4 +- .../http/message/abstractrequest.zep.h | 4 +- ext/phalcon/http/message/request.zep.c | 2 +- ext/phalcon/http/message/requestfactory.zep.c | 2 +- ext/phalcon/http/message/requestfactory.zep.h | 2 +- ext/phalcon/http/message/response.zep.c | 2 +- .../http/message/responsefactory.zep.c | 2 +- .../http/message/responsefactory.zep.h | 2 +- ext/phalcon/http/message/serverrequest.zep.c | 6 +- .../http/message/serverrequestfactory.zep.c | 6 +- .../http/message/serverrequestfactory.zep.h | 2 +- ext/phalcon/http/message/stream.zep.c | 2 +- ext/phalcon/http/message/streamfactory.zep.c | 2 +- ext/phalcon/http/message/streamfactory.zep.h | 6 +- ext/phalcon/http/message/uploadedfile.zep.c | 6 +- .../http/message/uploadedfilefactory.zep.c | 4 +- .../http/message/uploadedfilefactory.zep.h | 4 +- ext/phalcon/http/message/uri.zep.c | 2 +- ext/phalcon/http/message/urifactory.zep.c | 2 +- ext/phalcon/http/message/urifactory.zep.h | 2 +- ext/phalcon/http/request/file.zep.c | 2 +- .../http/server/abstractmiddleware.zep.c | 2 +- .../http/server/abstractmiddleware.zep.h | 6 +- .../http/server/abstractrequesthandler.zep.c | 2 +- .../http/server/abstractrequesthandler.zep.h | 4 +- ext/phalcon/logger/logger.zep.c | 2 +- ext/phalcon/messages/messages.zep.c | 24 ++- ext/phalcon/messages/messages.zep.h | 6 +- ext/phalcon/mvc/micro.zep.c | 69 +++++---- ext/phalcon/mvc/micro.zep.h | 16 +- ext/phalcon/mvc/model.zep.c | 109 ++++++++----- ext/phalcon/mvc/model.zep.h | 22 ++- ext/phalcon/mvc/model/criteria.zep.c | 4 +- ext/phalcon/mvc/model/query.zep.c | 4 +- ext/phalcon/mvc/model/resultset.zep.c | 14 +- ext/phalcon/mvc/model/resultset.zep.h | 10 +- ext/phalcon/mvc/model/resultset/complex.zep.c | 115 ++++++++------ ext/phalcon/mvc/model/resultset/complex.zep.h | 24 ++- ext/phalcon/mvc/model/resultset/simple.zep.c | 83 ++++++---- ext/phalcon/mvc/model/resultset/simple.zep.h | 14 +- .../mvc/model/resultsetinterface.zep.h | 2 +- ext/phalcon/mvc/model/row.zep.c | 39 +++-- ext/phalcon/mvc/model/row.zep.h | 6 +- .../session/adapter/abstractadapter.zep.c | 12 +- .../session/adapter/abstractadapter.zep.h | 12 +- ext/phalcon/session/adapter/noop.zep.c | 12 +- ext/phalcon/session/adapter/noop.zep.h | 12 +- ext/phalcon/session/adapter/stream.zep.c | 18 ++- ext/phalcon/session/adapter/stream.zep.h | 12 +- ext/phalcon/storage/adapter/apcu.zep.c | 1 + .../serializer/abstractserializer.zep.c | 33 ++++ .../serializer/abstractserializer.zep.h | 12 ++ ext/phalcon/storage/serializer/base64.zep.c | 15 +- ext/phalcon/storage/serializer/base64.zep.h | 9 +- ext/phalcon/storage/serializer/igbinary.zep.c | 16 +- ext/phalcon/storage/serializer/igbinary.zep.h | 9 +- ext/phalcon/storage/serializer/json.zep.c | 16 +- ext/phalcon/storage/serializer/json.zep.h | 9 +- .../serializer/memcachedigbinary.zep.c | 1 + .../serializer/memcachedigbinary.zep.h | 1 + .../storage/serializer/memcachedjson.zep.c | 1 + .../storage/serializer/memcachedjson.zep.h | 1 + .../storage/serializer/memcachedphp.zep.c | 1 + .../storage/serializer/memcachedphp.zep.h | 1 + ext/phalcon/storage/serializer/none.zep.c | 16 +- ext/phalcon/storage/serializer/none.zep.h | 11 +- ext/phalcon/storage/serializer/php.zep.c | 18 ++- ext/phalcon/storage/serializer/php.zep.h | 9 +- .../storage/serializer/redisigbinary.zep.c | 1 + .../storage/serializer/redisigbinary.zep.h | 1 + .../storage/serializer/redisjson.zep.c | 1 + .../storage/serializer/redisjson.zep.h | 1 + .../storage/serializer/redismsgpack.zep.c | 1 + .../storage/serializer/redismsgpack.zep.h | 1 + .../storage/serializer/redisnone.zep.c | 1 + .../storage/serializer/redisnone.zep.h | 1 + ext/phalcon/storage/serializer/redisphp.zep.c | 1 + ext/phalcon/storage/serializer/redisphp.zep.h | 1 + .../serializer/serializerinterface.zep.c | 5 - ext/phalcon/support/collection.zep.c | 75 ++++++--- ext/phalcon/support/collection.zep.h | 25 ++- ext/phalcon/support/debug/dump.zep.c | 2 +- ext/phalcon/support/registry.zep.c | 3 +- ext/phalcon/support/registry.zep.h | 6 +- ext/phalcon/tag.zep.c | 7 +- .../translate/adapter/abstractadapter.zep.c | 3 +- .../translate/adapter/abstractadapter.zep.h | 6 +- ext/php_phalcon.h | 2 +- 141 files changed, 1023 insertions(+), 501 deletions(-) diff --git a/ext/config.m4 b/ext/config.m4 index 968eb079ce7..d7bea0b4887 100644 --- a/ext/config.m4 +++ b/ext/config.m4 @@ -261,6 +261,7 @@ if test "$PHP_PHALCON" = "yes"; then phalcon/db/result/pdoresult.zep.c phalcon/di/exception/serviceresolutionexception.zep.c phalcon/di/factorydefault/cli.zep.c + phalcon/di/initializationawareinterface.zep.c phalcon/di/service.zep.c phalcon/di/service/builder.zep.c phalcon/di/serviceproviderinterface.zep.c diff --git a/ext/config.w32 b/ext/config.w32 index a652df51fe9..47efdf37134 100644 --- a/ext/config.w32 +++ b/ext/config.w32 @@ -14,7 +14,7 @@ if (PHP_PHALCON != "no") { ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/model/query", "scanner.c parser.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/view/engine/volt", "parser.c scanner.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/url", "utils.c", "phalcon"); - ADD_SOURCES(configure_module_dirname + "/phalcon/di", "injectionawareinterface.zep.c abstractinjectionaware.zep.c injectable.zep.c diinterface.zep.c di.zep.c exception.zep.c factorydefault.zep.c serviceinterface.zep.c service.zep.c serviceproviderinterface.zep.c", "phalcon"); + ADD_SOURCES(configure_module_dirname + "/phalcon/di", "injectionawareinterface.zep.c abstractinjectionaware.zep.c injectable.zep.c diinterface.zep.c di.zep.c exception.zep.c factorydefault.zep.c serviceinterface.zep.c initializationawareinterface.zep.c service.zep.c serviceproviderinterface.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/html/helper", "abstracthelper.zep.c abstractseries.zep.c abstractlist.zep.c ol.zep.c style.zep.c anchor.zep.c base.zep.c body.zep.c button.zep.c close.zep.c doctype.zep.c element.zep.c form.zep.c img.zep.c label.zep.c link.zep.c meta.zep.c script.zep.c title.zep.c ul.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/filter/validation", "validatorinterface.zep.c abstractvalidator.zep.c validatorcompositeinterface.zep.c abstractvalidatorcomposite.zep.c abstractcombinedfieldsvalidator.zep.c validationinterface.zep.c exception.zep.c validatorfactory.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/html/helper/input", "abstractinput.zep.c checkbox.zep.c color.zep.c date.zep.c datetime.zep.c datetimelocal.zep.c email.zep.c file.zep.c hidden.zep.c image.zep.c input.zep.c month.zep.c numeric.zep.c password.zep.c radio.zep.c range.zep.c search.zep.c select.zep.c submit.zep.c tel.zep.c text.zep.c textarea.zep.c time.zep.c url.zep.c week.zep.c", "phalcon"); diff --git a/ext/kernel/file.c b/ext/kernel/file.c index a0540f7d837..83237c4faef 100644 --- a/ext/kernel/file.c +++ b/ext/kernel/file.c @@ -65,7 +65,13 @@ int zephir_file_exists(zval *filename) return FAILURE; } +#if PHP_VERSION_ID >= 80100 + zend_string *file = zend_string_init(Z_STRVAL_P(filename), Z_STRLEN_P(filename), 0); + php_stat(file, FS_EXISTS, &return_value); + zval_ptr_dtor(file); +#else php_stat(Z_STRVAL_P(filename), (php_stat_len) Z_STRLEN_P(filename), FS_EXISTS, &return_value); +#endif if (Z_TYPE(return_value) != IS_TRUE) { return FAILURE; @@ -288,7 +294,13 @@ void zephir_file_put_contents(zval *return_value, zval *filename, zval *data) void zephir_filemtime(zval *return_value, zval *path) { if (EXPECTED(Z_TYPE_P(path) == IS_STRING)) { +#if PHP_VERSION_ID >= 80100 + zend_string *file = zend_string_init(Z_STRVAL_P(path), Z_STRLEN_P(path), 0); + php_stat(file, FS_MTIME, return_value); + zval_ptr_dtor(file); +#else php_stat(Z_STRVAL_P(path), (php_stat_len)(Z_STRLEN_P(path)), FS_MTIME, return_value); +#endif } else { ZVAL_FALSE(return_value); } diff --git a/ext/kernel/main.c b/ext/kernel/main.c index 8014a651454..95eba881d15 100644 --- a/ext/kernel/main.c +++ b/ext/kernel/main.c @@ -151,7 +151,7 @@ void zephir_fast_count(zval *result, zval *value) } } - if (instanceof_function(Z_OBJCE_P(value), spl_ce_Countable)) { + if (instanceof_function(Z_OBJCE_P(value), zend_ce_countable)) { #if PHP_VERSION_ID >= 80000 zend_call_method_with_0_params(Z_OBJ_P(value), NULL, NULL, "count", &retval); #else @@ -201,7 +201,7 @@ int zephir_fast_count_ev(zval *value) return (int) count > 0; } - if (instanceof_function(Z_OBJCE_P(value), spl_ce_Countable)) { + if (instanceof_function(Z_OBJCE_P(value), zend_ce_countable)) { #if PHP_VERSION_ID >= 80000 zend_call_method_with_0_params(Z_OBJ_P(value), NULL, NULL, "count", &retval); #else @@ -249,7 +249,7 @@ int zephir_fast_count_int(zval *value) return (int) count; } - if (instanceof_function(Z_OBJCE_P(value), spl_ce_Countable)) { + if (instanceof_function(Z_OBJCE_P(value), zend_ce_countable)) { #if PHP_VERSION_ID >= 80000 zend_call_method_with_0_params(Z_OBJ_P(value), NULL, NULL, "count", &retval); #else diff --git a/ext/kernel/require.c b/ext/kernel/require.c index 96160ba4ef3..98125c93847 100644 --- a/ext/kernel/require.c +++ b/ext/kernel/require.c @@ -45,14 +45,22 @@ int zephir_require_ret(zval *return_value_ptr, const char *require_path) } #endif - ret = php_stream_open_for_zend_ex(require_path, &file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE); +#if PHP_VERSION_ID >= 80100 + zend_string *zend_string_path = zend_string_init(require_path, strlen(require_path), 0); + + zend_stream_init_filename_ex(&file_handle, zend_string_path); + ret = php_stream_open_for_zend_ex(&file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE); + + zval_ptr_dtor(zend_string_path); +#else + ret = php_stream_open_for_zend_ex(require_path, &file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE); +#endif if (ret != SUCCESS) { return FAILURE; } new_op_array = zend_compile_file(&file_handle, ZEND_REQUIRE); if (new_op_array) { - if (file_handle.handle.stream.handle) { ZVAL_NULL(&dummy); if (!file_handle.opened_path) { @@ -110,7 +118,16 @@ int zephir_require_once_ret(zval *return_value_ptr, const char *require_path) } #endif - ret = php_stream_open_for_zend_ex(require_path, &file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE); +#if PHP_VERSION_ID >= 80100 + zend_string *zend_string_path = zend_string_init(require_path, strlen(require_path), 0); + + zend_stream_init_filename_ex(&file_handle, zend_string_path); + ret = php_stream_open_for_zend_ex(&file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE); + + zval_ptr_dtor(zend_string_path); +#else + ret = php_stream_open_for_zend_ex(require_path, &file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE); +#endif if (ret != SUCCESS) { return FAILURE; } diff --git a/ext/phalcon.c b/ext/phalcon.c index a3774daecaa..408c3037a4f 100644 --- a/ext/phalcon.c +++ b/ext/phalcon.c @@ -118,6 +118,7 @@ zend_class_entry *phalcon_session_managerinterface_ce; zend_class_entry *phalcon_acl_componentawareinterface_ce; zend_class_entry *phalcon_acl_roleawareinterface_ce; zend_class_entry *phalcon_cli_routerinterface_ce; +zend_class_entry *phalcon_di_initializationawareinterface_ce; zend_class_entry *phalcon_di_serviceproviderinterface_ce; zend_class_entry *phalcon_mvc_controller_bindmodelinterface_ce; zend_class_entry *phalcon_mvc_micro_middlewareinterface_ce; @@ -777,6 +778,7 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Acl_ComponentAwareInterface); ZEPHIR_INIT(Phalcon_Acl_RoleAwareInterface); ZEPHIR_INIT(Phalcon_Cli_RouterInterface); + ZEPHIR_INIT(Phalcon_Di_InitializationAwareInterface); ZEPHIR_INIT(Phalcon_Di_ServiceProviderInterface); ZEPHIR_INIT(Phalcon_Mvc_Controller_BindModelInterface); ZEPHIR_INIT(Phalcon_Mvc_Micro_MiddlewareInterface); diff --git a/ext/phalcon.h b/ext/phalcon.h index 1c1a4ed2ff3..72adf5f914b 100644 --- a/ext/phalcon.h +++ b/ext/phalcon.h @@ -256,6 +256,7 @@ #include "phalcon/db/result/pdoresult.zep.h" #include "phalcon/di/exception/serviceresolutionexception.zep.h" #include "phalcon/di/factorydefault/cli.zep.h" +#include "phalcon/di/initializationawareinterface.zep.h" #include "phalcon/di/service.zep.h" #include "phalcon/di/service/builder.zep.h" #include "phalcon/di/serviceproviderinterface.zep.h" diff --git a/ext/phalcon/0__closure.zep.c b/ext/phalcon/0__closure.zep.c index a3c360df385..b2065d74011 100644 --- a/ext/phalcon/0__closure.zep.c +++ b/ext/phalcon/0__closure.zep.c @@ -49,3 +49,4 @@ PHP_METHOD(phalcon_0__closure, __invoke) ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$true); } + diff --git a/ext/phalcon/10__closure.zep.c b/ext/phalcon/10__closure.zep.c index 5deb4673627..79e6c65e17e 100644 --- a/ext/phalcon/10__closure.zep.c +++ b/ext/phalcon/10__closure.zep.c @@ -56,3 +56,4 @@ PHP_METHOD(phalcon_10__closure, __invoke) } RETURN_MM_BOOL(_1); } + diff --git a/ext/phalcon/11__closure.zep.c b/ext/phalcon/11__closure.zep.c index 8b6dbad70e1..5db1fe15a26 100644 --- a/ext/phalcon/11__closure.zep.c +++ b/ext/phalcon/11__closure.zep.c @@ -56,3 +56,4 @@ PHP_METHOD(phalcon_11__closure, __invoke) } RETURN_MM_BOOL(_1); } + diff --git a/ext/phalcon/12__closure.zep.c b/ext/phalcon/12__closure.zep.c index 7c437fac228..fb6065c7fbf 100644 --- a/ext/phalcon/12__closure.zep.c +++ b/ext/phalcon/12__closure.zep.c @@ -49,3 +49,4 @@ PHP_METHOD(phalcon_12__closure, __invoke) zephir_uncamelize(return_value, action, &_0 ); RETURN_MM(); } + diff --git a/ext/phalcon/13__closure.zep.c b/ext/phalcon/13__closure.zep.c index 4369b7ace2e..e9eac76c408 100644 --- a/ext/phalcon/13__closure.zep.c +++ b/ext/phalcon/13__closure.zep.c @@ -49,3 +49,4 @@ PHP_METHOD(phalcon_13__closure, __invoke) ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$true); } + diff --git a/ext/phalcon/14__closure.zep.c b/ext/phalcon/14__closure.zep.c index 23ba5a06da0..d6cd97546c9 100644 --- a/ext/phalcon/14__closure.zep.c +++ b/ext/phalcon/14__closure.zep.c @@ -51,3 +51,4 @@ PHP_METHOD(phalcon_14__closure, __invoke) ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$true); } + diff --git a/ext/phalcon/15__closure.zep.c b/ext/phalcon/15__closure.zep.c index 42fda0b55c6..2ee92e2ed22 100644 --- a/ext/phalcon/15__closure.zep.c +++ b/ext/phalcon/15__closure.zep.c @@ -47,3 +47,4 @@ PHP_METHOD(phalcon_15__closure, __invoke) } RETURN_BOOL(_0); } + diff --git a/ext/phalcon/16__closure.zep.c b/ext/phalcon/16__closure.zep.c index 28995d6383d..52e28c943cb 100644 --- a/ext/phalcon/16__closure.zep.c +++ b/ext/phalcon/16__closure.zep.c @@ -47,3 +47,4 @@ PHP_METHOD(phalcon_16__closure, __invoke) } RETURN_BOOL(_0); } + diff --git a/ext/phalcon/1__closure.zep.c b/ext/phalcon/1__closure.zep.c index 58284e2db7f..e3bd6b88447 100644 --- a/ext/phalcon/1__closure.zep.c +++ b/ext/phalcon/1__closure.zep.c @@ -51,3 +51,4 @@ PHP_METHOD(phalcon_1__closure, __invoke) ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$true); } + diff --git a/ext/phalcon/2__closure.zep.c b/ext/phalcon/2__closure.zep.c index edaac249a2e..2ddcffecdd8 100644 --- a/ext/phalcon/2__closure.zep.c +++ b/ext/phalcon/2__closure.zep.c @@ -51,3 +51,4 @@ PHP_METHOD(phalcon_2__closure, __invoke) zephir_ucfirst(return_value, &_0); RETURN_MM(); } + diff --git a/ext/phalcon/3__closure.zep.c b/ext/phalcon/3__closure.zep.c index 31799420f0c..c7fda2ae048 100644 --- a/ext/phalcon/3__closure.zep.c +++ b/ext/phalcon/3__closure.zep.c @@ -49,3 +49,4 @@ PHP_METHOD(phalcon_3__closure, __invoke) ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$true); } + diff --git a/ext/phalcon/4__closure.zep.c b/ext/phalcon/4__closure.zep.c index 5acb0bd366d..ce46964d399 100644 --- a/ext/phalcon/4__closure.zep.c +++ b/ext/phalcon/4__closure.zep.c @@ -51,3 +51,4 @@ PHP_METHOD(phalcon_4__closure, __invoke) ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$true); } + diff --git a/ext/phalcon/5__closure.zep.c b/ext/phalcon/5__closure.zep.c index ae001d96423..7401e34247b 100644 --- a/ext/phalcon/5__closure.zep.c +++ b/ext/phalcon/5__closure.zep.c @@ -49,3 +49,4 @@ PHP_METHOD(phalcon_5__closure, __invoke) ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$true); } + diff --git a/ext/phalcon/6__closure.zep.c b/ext/phalcon/6__closure.zep.c index f1c09695972..5ae8575852e 100644 --- a/ext/phalcon/6__closure.zep.c +++ b/ext/phalcon/6__closure.zep.c @@ -51,3 +51,4 @@ PHP_METHOD(phalcon_6__closure, __invoke) ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$true); } + diff --git a/ext/phalcon/7__closure.zep.c b/ext/phalcon/7__closure.zep.c index 3363219b088..6b96d81e1fd 100644 --- a/ext/phalcon/7__closure.zep.c +++ b/ext/phalcon/7__closure.zep.c @@ -49,3 +49,4 @@ PHP_METHOD(phalcon_7__closure, __invoke) ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$true); } + diff --git a/ext/phalcon/8__closure.zep.c b/ext/phalcon/8__closure.zep.c index c00a360fe33..e292f183130 100644 --- a/ext/phalcon/8__closure.zep.c +++ b/ext/phalcon/8__closure.zep.c @@ -51,3 +51,4 @@ PHP_METHOD(phalcon_8__closure, __invoke) ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$true); } + diff --git a/ext/phalcon/9__closure.zep.c b/ext/phalcon/9__closure.zep.c index de2eda065e1..eb1c5f832c2 100644 --- a/ext/phalcon/9__closure.zep.c +++ b/ext/phalcon/9__closure.zep.c @@ -42,3 +42,4 @@ PHP_METHOD(phalcon_9__closure, __invoke) RETURN_BOOL(1); } + diff --git a/ext/phalcon/annotations/collection.zep.h b/ext/phalcon/annotations/collection.zep.h index ee68286f306..82c2ec4e30e 100644 --- a/ext/phalcon/annotations/collection.zep.h +++ b/ext/phalcon/annotations/collection.zep.h @@ -26,7 +26,11 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_annotations_collection_count, 0, 0, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_annotations_collection_current, 0, 0, 0) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_annotations_collection_current, 0, 0, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_annotations_collection_current, 0, 0, IS_NULL, 0) +#endif ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_annotations_collection_get, 0, 1, Phalcon\\Annotations\\Annotation, 0) @@ -59,11 +63,7 @@ ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_annotations_collection_method_entry) { PHP_ME(Phalcon_Annotations_Collection, __construct, arginfo_phalcon_annotations_collection___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) PHP_ME(Phalcon_Annotations_Collection, count, arginfo_phalcon_annotations_collection_count, ZEND_ACC_PUBLIC) -#if PHP_VERSION_ID >= 80000 PHP_ME(Phalcon_Annotations_Collection, current, arginfo_phalcon_annotations_collection_current, ZEND_ACC_PUBLIC) -#else - PHP_ME(Phalcon_Annotations_Collection, current, NULL, ZEND_ACC_PUBLIC) -#endif PHP_ME(Phalcon_Annotations_Collection, get, arginfo_phalcon_annotations_collection_get, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Annotations_Collection, getAll, arginfo_phalcon_annotations_collection_getall, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Annotations_Collection, getAnnotations, arginfo_phalcon_annotations_collection_getannotations, ZEND_ACC_PUBLIC) diff --git a/ext/phalcon/assets/collection.zep.h b/ext/phalcon/assets/collection.zep.h index b28757ed01c..80b15faaaf2 100644 --- a/ext/phalcon/assets/collection.zep.h +++ b/ext/phalcon/assets/collection.zep.h @@ -138,7 +138,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_count, 0, 0, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_assets_collection_getiterator, 0, 0, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_assets_collection_getiterator, 0, 0, Traversable, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getrealtargetpath, 0, 1, IS_STRING, 0) @@ -255,11 +255,7 @@ ZEPHIR_INIT_FUNCS(phalcon_assets_collection_method_entry) { PHP_ME(Phalcon_Assets_Collection, addInlineJs, arginfo_phalcon_assets_collection_addinlinejs, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Assets_Collection, addJs, arginfo_phalcon_assets_collection_addjs, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Assets_Collection, count, arginfo_phalcon_assets_collection_count, ZEND_ACC_PUBLIC) -#if PHP_VERSION_ID >= 80000 PHP_ME(Phalcon_Assets_Collection, getIterator, arginfo_phalcon_assets_collection_getiterator, ZEND_ACC_PUBLIC) -#else - PHP_ME(Phalcon_Assets_Collection, getIterator, NULL, ZEND_ACC_PUBLIC) -#endif PHP_ME(Phalcon_Assets_Collection, getRealTargetPath, arginfo_phalcon_assets_collection_getrealtargetpath, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Assets_Collection, has, arginfo_phalcon_assets_collection_has, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Assets_Collection, isAutoVersion, arginfo_phalcon_assets_collection_isautoversion, ZEND_ACC_PUBLIC) diff --git a/ext/phalcon/assets/manager.zep.c b/ext/phalcon/assets/manager.zep.c index 456a44db309..6abc5edeab9 100644 --- a/ext/phalcon/assets/manager.zep.c +++ b/ext/phalcon/assets/manager.zep.c @@ -1656,7 +1656,7 @@ PHP_METHOD(Phalcon_Assets_Manager, outputInline) ZEPHIR_CALL_METHOD(&join, collection, "getjoin", NULL, 0); zephir_check_call_status(); if (1 != ZEPHIR_IS_EMPTY(&codes)) { - zephir_is_iterable(&codes, 0, "phalcon/Assets/Manager.zep", 770); + zephir_is_iterable(&codes, 0, "phalcon/Assets/Manager.zep", 769); if (Z_TYPE_P(&codes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&codes), _0$$3) { @@ -1666,14 +1666,14 @@ PHP_METHOD(Phalcon_Assets_Manager, outputInline) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&content, &code, "getcontent", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&filters, 0, "phalcon/Assets/Manager.zep", 758); + zephir_is_iterable(&filters, 0, "phalcon/Assets/Manager.zep", 757); if (Z_TYPE_P(&filters) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&filters), _2$$4) { ZEPHIR_INIT_NVAR(&filter); ZVAL_COPY(&filter, _2$$4); if (Z_TYPE_P(&filter) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_assets_exception_ce, "The filter is not valid", "phalcon/Assets/Manager.zep", 748); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_assets_exception_ce, "The filter is not valid", "phalcon/Assets/Manager.zep", 747); return; } ZEPHIR_CALL_METHOD(&_4$$5, &filter, "filter", NULL, 0, &content); @@ -1692,7 +1692,7 @@ PHP_METHOD(Phalcon_Assets_Manager, outputInline) ZEPHIR_CALL_METHOD(&filter, &filters, "current", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&filter) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_assets_exception_ce, "The filter is not valid", "phalcon/Assets/Manager.zep", 748); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_assets_exception_ce, "The filter is not valid", "phalcon/Assets/Manager.zep", 747); return; } ZEPHIR_CALL_METHOD(&_5$$7, &filter, "filter", NULL, 0, &content); @@ -1732,14 +1732,14 @@ PHP_METHOD(Phalcon_Assets_Manager, outputInline) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&content, &code, "getcontent", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&filters, 0, "phalcon/Assets/Manager.zep", 758); + zephir_is_iterable(&filters, 0, "phalcon/Assets/Manager.zep", 757); if (Z_TYPE_P(&filters) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&filters), _11$$11) { ZEPHIR_INIT_NVAR(&filter); ZVAL_COPY(&filter, _11$$11); if (Z_TYPE_P(&filter) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_assets_exception_ce, "The filter is not valid", "phalcon/Assets/Manager.zep", 748); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_assets_exception_ce, "The filter is not valid", "phalcon/Assets/Manager.zep", 747); return; } ZEPHIR_CALL_METHOD(&_13$$12, &filter, "filter", NULL, 0, &content); @@ -1758,7 +1758,7 @@ PHP_METHOD(Phalcon_Assets_Manager, outputInline) ZEPHIR_CALL_METHOD(&filter, &filters, "current", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&filter) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_assets_exception_ce, "The filter is not valid", "phalcon/Assets/Manager.zep", 748); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_assets_exception_ce, "The filter is not valid", "phalcon/Assets/Manager.zep", 747); return; } ZEPHIR_CALL_METHOD(&_14$$14, &filter, "filter", NULL, 0, &content); @@ -2184,7 +2184,7 @@ PHP_METHOD(Phalcon_Assets_Manager, checkAndCreateCollection) zephir_update_property_array(this_ptr, SL("collections"), &type, &_1$$3); } zephir_read_property(&_2, this_ptr, ZEND_STRL("collections"), PH_NOISY_CC | PH_READONLY); - zephir_array_fetch(&_3, &_2, &type, PH_NOISY | PH_READONLY, "phalcon/Assets/Manager.zep", 934); + zephir_array_fetch(&_3, &_2, &type, PH_NOISY | PH_READONLY, "phalcon/Assets/Manager.zep", 933); RETURN_CTOR(&_3); } @@ -2305,7 +2305,7 @@ PHP_METHOD(Phalcon_Assets_Manager, doCallback) } ZEPHIR_INIT_VAR(&_1); ZVAL_BOOL(&_1, local); - zephir_array_append(¶meters, &_1, PH_SEPARATE, "phalcon/Assets/Manager.zep", 982); + zephir_array_append(¶meters, &_1, PH_SEPARATE, "phalcon/Assets/Manager.zep", 981); ZEPHIR_CALL_USER_FUNC_ARRAY(return_value, callback, ¶meters); zephir_check_call_status(); RETURN_MM(); @@ -2436,13 +2436,13 @@ PHP_METHOD(Phalcon_Assets_Manager, processParameters) } if (1 == zephir_array_isset_long(¶ms, 1)) { ZEPHIR_OBS_VAR(&_2$$4); - zephir_array_fetch_long(&_2$$4, ¶ms, 1, PH_NOISY, "phalcon/Assets/Manager.zep", 1026); + zephir_array_fetch_long(&_2$$4, ¶ms, 1, PH_NOISY, "phalcon/Assets/Manager.zep", 1025); local = zephir_get_boolval(&_2$$4); zephir_array_unset_long(¶ms, 1, PH_SEPARATE); } else { if (1 == zephir_array_isset_string(¶ms, SL("local"))) { ZEPHIR_OBS_VAR(&_3$$6); - zephir_array_fetch_string(&_3$$6, ¶ms, SL("local"), PH_NOISY, "phalcon/Assets/Manager.zep", 1030); + zephir_array_fetch_string(&_3$$6, ¶ms, SL("local"), PH_NOISY, "phalcon/Assets/Manager.zep", 1029); local = zephir_get_boolval(&_3$$6); zephir_array_unset_string(¶ms, SL("local"), PH_SEPARATE); } @@ -2462,13 +2462,13 @@ PHP_METHOD(Phalcon_Assets_Manager, processParameters) ZVAL_STRING(&_6$$9, ""); zephir_array_update_zval(¶ms, &name, &_6$$9, PH_COPY | PH_SEPARATE); if (1 == zephir_array_isset_long(¶ms, 0)) { - zephir_array_fetch_long(&_7$$10, ¶ms, 0, PH_NOISY | PH_READONLY, "phalcon/Assets/Manager.zep", 1050); + zephir_array_fetch_long(&_7$$10, ¶ms, 0, PH_NOISY | PH_READONLY, "phalcon/Assets/Manager.zep", 1049); zephir_array_update_zval(¶ms, &name, &_7$$10, PH_COPY | PH_SEPARATE); zephir_array_unset_long(¶ms, 0, PH_SEPARATE); } } ZEPHIR_OBS_VAR(&tag); - zephir_array_fetch(&tag, ¶ms, &name, PH_NOISY, "phalcon/Assets/Manager.zep", 1055); + zephir_array_fetch(&tag, ¶ms, &name, PH_NOISY, "phalcon/Assets/Manager.zep", 1054); zephir_array_unset(¶ms, &name, PH_SEPARATE); if (local) { ZEPHIR_INIT_VAR(&_8$$11); diff --git a/ext/phalcon/cache/cache.zep.c b/ext/phalcon/cache/cache.zep.c index f0288457aa1..c88b5d38573 100644 --- a/ext/phalcon/cache/cache.zep.c +++ b/ext/phalcon/cache/cache.zep.c @@ -45,7 +45,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Cache_Cache) * @var AdapterInterface */ zend_declare_property_null(phalcon_cache_cache_ce, SL("adapter"), ZEND_ACC_PROTECTED); - zend_class_implements(phalcon_cache_cache_ce, 1, zephir_get_internal_ce(SL("psr\\simplecache\\cacheinterface"))); + zend_class_implements(phalcon_cache_cache_ce, 1, zephir_get_internal_ce(SL("psrext\\simplecache\\cacheinterface"))); return SUCCESS; } diff --git a/ext/phalcon/cache/cachefactory.zep.h b/ext/phalcon/cache/cachefactory.zep.h index 0aa215effe7..87738d30a34 100644 --- a/ext/phalcon/cache/cachefactory.zep.h +++ b/ext/phalcon/cache/cachefactory.zep.h @@ -12,11 +12,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_cache_cachefactory___construct, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, factory, Phalcon\\Cache\\AdapterFactory, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_cache_cachefactory_load, 0, 1, Psr\\SimpleCache\\CacheInterface, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_cache_cachefactory_load, 0, 1, PsrExt\\SimpleCache\\CacheInterface, 0) ZEND_ARG_INFO(0, config) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_cache_cachefactory_newinstance, 0, 1, Psr\\SimpleCache\\CacheInterface, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_cache_cachefactory_newinstance, 0, 1, PsrExt\\SimpleCache\\CacheInterface, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) #if PHP_VERSION_ID >= 80000 ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "[]") diff --git a/ext/phalcon/cache/exception/exception.zep.c b/ext/phalcon/cache/exception/exception.zep.c index ee577ce63e6..1aaeb66bfd1 100644 --- a/ext/phalcon/cache/exception/exception.zep.c +++ b/ext/phalcon/cache/exception/exception.zep.c @@ -29,7 +29,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Cache_Exception_Exception) { ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Cache\\Exception, Exception, phalcon, cache_exception_exception, zend_ce_exception, NULL, 0); - zend_class_implements(phalcon_cache_exception_exception_ce, 1, zephir_get_internal_ce(SL("psr\\simplecache\\cacheexception"))); + zend_class_implements(phalcon_cache_exception_exception_ce, 1, zephir_get_internal_ce(SL("psrext\\simplecache\\cacheexception"))); return SUCCESS; } diff --git a/ext/phalcon/cache/exception/invalidargumentexception.zep.c b/ext/phalcon/cache/exception/invalidargumentexception.zep.c index 37fb795a6e4..73a3baa9b59 100644 --- a/ext/phalcon/cache/exception/invalidargumentexception.zep.c +++ b/ext/phalcon/cache/exception/invalidargumentexception.zep.c @@ -29,7 +29,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Cache_Exception_InvalidArgumentException) { ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Cache\\Exception, InvalidArgumentException, phalcon, cache_exception_invalidargumentexception, zend_ce_exception, NULL, 0); - zend_class_implements(phalcon_cache_exception_invalidargumentexception_ce, 1, zephir_get_internal_ce(SL("psr\\simplecache\\invalidargumentexception"))); + zend_class_implements(phalcon_cache_exception_invalidargumentexception_ce, 1, zephir_get_internal_ce(SL("psrext\\simplecache\\invalidargumentexception"))); return SUCCESS; } diff --git a/ext/phalcon/container/container.zep.c b/ext/phalcon/container/container.zep.c index e8bd3a23a11..886e975988d 100644 --- a/ext/phalcon/container/container.zep.c +++ b/ext/phalcon/container/container.zep.c @@ -37,7 +37,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Container_Container) * @var DiInterface */ zend_declare_property_null(phalcon_container_container_ce, SL("container"), ZEND_ACC_PROTECTED); - zend_class_implements(phalcon_container_container_ce, 1, zephir_get_internal_ce(SL("psr\\container\\containerinterface"))); + zend_class_implements(phalcon_container_container_ce, 1, zephir_get_internal_ce(SL("psrext\\container\\containerinterface"))); return SUCCESS; } diff --git a/ext/phalcon/datamapper/pdo/profiler/memorylogger.zep.c b/ext/phalcon/datamapper/pdo/profiler/memorylogger.zep.c index c63aae1ce9f..da1bfd6b164 100644 --- a/ext/phalcon/datamapper/pdo/profiler/memorylogger.zep.c +++ b/ext/phalcon/datamapper/pdo/profiler/memorylogger.zep.c @@ -40,7 +40,7 @@ */ ZEPHIR_INIT_CLASS(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger) { - ZEPHIR_REGISTER_CLASS_EX(Phalcon\\DataMapper\\Pdo\\Profiler, MemoryLogger, phalcon, datamapper_pdo_profiler_memorylogger, zephir_get_internal_ce(SL("psr\\log\\abstractlogger")), phalcon_datamapper_pdo_profiler_memorylogger_method_entry, 0); + ZEPHIR_REGISTER_CLASS_EX(Phalcon\\DataMapper\\Pdo\\Profiler, MemoryLogger, phalcon, datamapper_pdo_profiler_memorylogger, zephir_get_internal_ce(SL("psrext\\log\\abstractlogger")), phalcon_datamapper_pdo_profiler_memorylogger_method_entry, 0); /** * @var array diff --git a/ext/phalcon/datamapper/pdo/profiler/profiler.zep.c b/ext/phalcon/datamapper/pdo/profiler/profiler.zep.c index ce6198e4586..af7770c7175 100644 --- a/ext/phalcon/datamapper/pdo/profiler/profiler.zep.c +++ b/ext/phalcon/datamapper/pdo/profiler/profiler.zep.c @@ -94,7 +94,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, __construct) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 1) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(logger, zephir_get_internal_ce(SL("psr\\log\\loggerinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(logger, zephir_get_internal_ce(SL("psrext\\log\\loggerinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/datamapper/pdo/profiler/profiler.zep.h b/ext/phalcon/datamapper/pdo/profiler/profiler.zep.h index f24a39abf80..6d7eb20d97f 100644 --- a/ext/phalcon/datamapper/pdo/profiler/profiler.zep.h +++ b/ext/phalcon/datamapper/pdo/profiler/profiler.zep.h @@ -17,7 +17,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, encode); zend_object *zephir_init_properties_Phalcon_DataMapper_Pdo_Profiler_Profiler(zend_class_entry *class_type); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_profiler___construct, 0, 0, 0) - ZEND_ARG_OBJ_INFO(0, logger, Psr\\Log\\LoggerInterface, 1) + ZEND_ARG_OBJ_INFO(0, logger, PsrExt\\Log\\LoggerInterface, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_profiler_finish, 0, 0, IS_VOID, 0) @@ -33,7 +33,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_profiler_getlogformat, 0, 0, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_profiler_getlogger, 0, 0, Psr\\Log\\LoggerInterface, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_profiler_getlogger, 0, 0, PsrExt\\Log\\LoggerInterface, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_profiler_getloglevel, 0, 0, IS_STRING, 0) diff --git a/ext/phalcon/datamapper/pdo/profiler/profilerinterface.zep.h b/ext/phalcon/datamapper/pdo/profiler/profilerinterface.zep.h index 8ba333b23b8..8db2894aff0 100644 --- a/ext/phalcon/datamapper/pdo/profiler/profilerinterface.zep.h +++ b/ext/phalcon/datamapper/pdo/profiler/profilerinterface.zep.h @@ -13,7 +13,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_ #endif ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_profilerinterface_getlogger, 0, 0, Psr\\Log\\LoggerInterface, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_profilerinterface_getlogger, 0, 0, PsrExt\\Log\\LoggerInterface, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_profilerinterface_getlogformat, 0, 0, IS_STRING, 0) diff --git a/ext/phalcon/db/enum.zep.c b/ext/phalcon/db/enum.zep.c index e12c380b07c..724d45481d8 100644 --- a/ext/phalcon/db/enum.zep.c +++ b/ext/phalcon/db/enum.zep.c @@ -63,6 +63,8 @@ ZEPHIR_INIT_CLASS(Phalcon_Db_Enum) zephir_declare_class_constant_long(phalcon_db_enum_ce, SL("FETCH_UNIQUE"), 196608); + zephir_declare_class_constant_long(phalcon_db_enum_ce, SL("FETCH_DEFAULT"), 0); + return SUCCESS; } diff --git a/ext/phalcon/db/result/pdoresult.zep.c b/ext/phalcon/db/result/pdoresult.zep.c index 77108e3d03a..a2b3cf2f079 100644 --- a/ext/phalcon/db/result/pdoresult.zep.c +++ b/ext/phalcon/db/result/pdoresult.zep.c @@ -69,7 +69,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Db_Result_PdoResult) * * @var int */ - zend_declare_property_long(phalcon_db_result_pdoresult_ce, SL("fetchMode"), 5, ZEND_ACC_PROTECTED); + zend_declare_property_long(phalcon_db_result_pdoresult_ce, SL("fetchMode"), 0, ZEND_ACC_PROTECTED); /** * Internal resultset * @@ -168,8 +168,8 @@ PHP_METHOD(Phalcon_Db_Result_PdoResult, dataSeek) { long n = 0; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zephir_fcall_cache_entry *_3 = NULL; - zval *number_param = NULL, connection, pdo, sqlStatement, bindParams, statement, _0, _1$$4, _2$$4; + zephir_fcall_cache_entry *_4 = NULL; + zval *number_param = NULL, connection, pdo, sqlStatement, bindParams, statement, _0, _1$$4, _2$$4, _3$$6; zend_long number, ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); @@ -181,6 +181,7 @@ PHP_METHOD(Phalcon_Db_Result_PdoResult, dataSeek) ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1$$4); ZVAL_UNDEF(&_2$$4); + ZVAL_UNDEF(&_3$$6); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -222,7 +223,8 @@ PHP_METHOD(Phalcon_Db_Result_PdoResult, dataSeek) if (!(n != number)) { break; } - ZEPHIR_CALL_METHOD(NULL, &statement, "fetch", &_3, 0); + zephir_read_property(&_3$$6, this_ptr, ZEND_STRL("fetchMode"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(NULL, &statement, "fetch", &_4, 0, &_3$$6); zephir_check_call_status(); n++; } @@ -272,44 +274,55 @@ PHP_METHOD(Phalcon_Db_Result_PdoResult, execute) PHP_METHOD(Phalcon_Db_Result_PdoResult, fetch) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *fetchStyle = NULL, fetchStyle_sub, *cursorOrientation = NULL, cursorOrientation_sub, *cursorOffset = NULL, cursorOffset_sub, __$null, _0; + zval *fetchStyle_param = NULL, *cursorOrientation_param = NULL, *cursorOffset_param = NULL, mode, _0, _1, _2; + zend_long fetchStyle, cursorOrientation, cursorOffset, ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); - ZVAL_UNDEF(&fetchStyle_sub); - ZVAL_UNDEF(&cursorOrientation_sub); - ZVAL_UNDEF(&cursorOffset_sub); - ZVAL_NULL(&__$null); + ZVAL_UNDEF(&mode); ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 3) Z_PARAM_OPTIONAL - Z_PARAM_ZVAL_OR_NULL(fetchStyle) - Z_PARAM_ZVAL_OR_NULL(cursorOrientation) - Z_PARAM_ZVAL_OR_NULL(cursorOffset) + Z_PARAM_LONG_OR_NULL(fetchStyle, is_null_true) + Z_PARAM_LONG(cursorOrientation) + Z_PARAM_LONG(cursorOffset) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 0, 3, &fetchStyle, &cursorOrientation, &cursorOffset); - if (!fetchStyle) { - fetchStyle = &fetchStyle_sub; - fetchStyle = &__$null; + zephir_fetch_params(1, 0, 3, &fetchStyle_param, &cursorOrientation_param, &cursorOffset_param); + if (!fetchStyle_param) { + fetchStyle = 0; + } else { + fetchStyle = zephir_get_intval(fetchStyle_param); } - if (!cursorOrientation) { - cursorOrientation = &cursorOrientation_sub; - cursorOrientation = &__$null; + if (!cursorOrientation_param) { + cursorOrientation = 0; + } else { + cursorOrientation = zephir_get_intval(cursorOrientation_param); } - if (!cursorOffset) { - cursorOffset = &cursorOffset_sub; - cursorOffset = &__$null; + if (!cursorOffset_param) { + cursorOffset = 0; + } else { + cursorOffset = zephir_get_intval(cursorOffset_param); } + if (1 == 1) { + ZEPHIR_INIT_VAR(&mode); + ZVAL_LONG(&mode, fetchStyle); + } else { + ZEPHIR_OBS_NVAR(&mode); + zephir_read_property(&mode, this_ptr, ZEND_STRL("fetchMode"), PH_NOISY_CC); + } zephir_read_property(&_0, this_ptr, ZEND_STRL("pdoStatement"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_METHOD(&_0, "fetch", NULL, 0, fetchStyle, cursorOrientation, cursorOffset); + ZVAL_LONG(&_1, cursorOrientation); + ZVAL_LONG(&_2, cursorOffset); + ZEPHIR_RETURN_CALL_METHOD(&_0, "fetch", NULL, 0, &mode, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -329,67 +342,78 @@ PHP_METHOD(Phalcon_Db_Result_PdoResult, fetch) */ PHP_METHOD(Phalcon_Db_Result_PdoResult, fetchAll) { - zend_bool _1; + zend_bool _3; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *fetchStyle = NULL, fetchStyle_sub, *fetchArgument = NULL, fetchArgument_sub, *ctorArgs = NULL, ctorArgs_sub, __$null, pdoStatement, _0; + zval *fetchStyle_param = NULL, *fetchArgument_param = NULL, *ctorArgs_param = NULL, pdoStatement, mode, _0, _1$$3, _2$$3, _4$$4, _5$$4; + zend_long fetchStyle, fetchArgument, ctorArgs, ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); - ZVAL_UNDEF(&fetchStyle_sub); - ZVAL_UNDEF(&fetchArgument_sub); - ZVAL_UNDEF(&ctorArgs_sub); - ZVAL_NULL(&__$null); ZVAL_UNDEF(&pdoStatement); + ZVAL_UNDEF(&mode); ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1$$3); + ZVAL_UNDEF(&_2$$3); + ZVAL_UNDEF(&_4$$4); + ZVAL_UNDEF(&_5$$4); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 3) Z_PARAM_OPTIONAL - Z_PARAM_ZVAL_OR_NULL(fetchStyle) - Z_PARAM_ZVAL_OR_NULL(fetchArgument) - Z_PARAM_ZVAL_OR_NULL(ctorArgs) + Z_PARAM_LONG_OR_NULL(fetchStyle, is_null_true) + Z_PARAM_LONG(fetchArgument) + Z_PARAM_LONG(ctorArgs) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 0, 3, &fetchStyle, &fetchArgument, &ctorArgs); - if (!fetchStyle) { - fetchStyle = &fetchStyle_sub; - fetchStyle = &__$null; + zephir_fetch_params(1, 0, 3, &fetchStyle_param, &fetchArgument_param, &ctorArgs_param); + if (!fetchStyle_param) { + fetchStyle = 0; + } else { + fetchStyle = zephir_get_intval(fetchStyle_param); } - if (!fetchArgument) { - fetchArgument = &fetchArgument_sub; - fetchArgument = &__$null; + if (!fetchArgument_param) { + fetchArgument = 0; + } else { + fetchArgument = zephir_get_intval(fetchArgument_param); } - if (!ctorArgs) { - ctorArgs = &ctorArgs_sub; - ctorArgs = &__$null; + if (!ctorArgs_param) { + ctorArgs = 0; + } else { + ctorArgs = zephir_get_intval(ctorArgs_param); } zephir_read_property(&_0, this_ptr, ZEND_STRL("pdoStatement"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&pdoStatement, &_0); - if (Z_TYPE_P(fetchStyle) != IS_LONG) { - ZEPHIR_RETURN_CALL_METHOD(&pdoStatement, "fetchall", NULL, 0); - zephir_check_call_status(); - RETURN_MM(); + if (1 == 1) { + ZEPHIR_INIT_VAR(&mode); + ZVAL_LONG(&mode, fetchStyle); + } else { + ZEPHIR_OBS_NVAR(&mode); + zephir_read_property(&mode, this_ptr, ZEND_STRL("fetchMode"), PH_NOISY_CC); } - if (ZEPHIR_IS_LONG(fetchStyle, 8)) { - ZEPHIR_RETURN_CALL_METHOD(&pdoStatement, "fetchall", NULL, 0, fetchStyle, fetchArgument, ctorArgs); + if (fetchStyle == 8) { + ZVAL_LONG(&_1$$3, fetchArgument); + ZVAL_LONG(&_2$$3, ctorArgs); + ZEPHIR_RETURN_CALL_METHOD(&pdoStatement, "fetchall", NULL, 0, &mode, &_1$$3, &_2$$3); zephir_check_call_status(); RETURN_MM(); } - _1 = ZEPHIR_IS_LONG(fetchStyle, 7); - if (!(_1)) { - _1 = ZEPHIR_IS_LONG(fetchStyle, 10); + _3 = fetchStyle == 7; + if (!(_3)) { + _3 = fetchStyle == 10; } - if (_1) { - ZEPHIR_RETURN_CALL_METHOD(&pdoStatement, "fetchall", NULL, 0, fetchStyle, fetchArgument); + if (_3) { + ZVAL_LONG(&_4$$4, fetchStyle); + ZVAL_LONG(&_5$$4, fetchArgument); + ZEPHIR_RETURN_CALL_METHOD(&pdoStatement, "fetchall", NULL, 0, &_4$$4, &_5$$4); zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_RETURN_CALL_METHOD(&pdoStatement, "fetchall", NULL, 0, fetchStyle); + ZVAL_LONG(&_0, fetchStyle); + ZEPHIR_RETURN_CALL_METHOD(&pdoStatement, "fetchall", NULL, 0, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -413,18 +437,20 @@ PHP_METHOD(Phalcon_Db_Result_PdoResult, fetchAll) */ PHP_METHOD(Phalcon_Db_Result_PdoResult, fetchArray) { - zval _0; + zval _0, _1; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); ZEPHIR_MM_GROW(); zephir_read_property(&_0, this_ptr, ZEND_STRL("pdoStatement"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_METHOD(&_0, "fetch", NULL, 0); + zephir_read_property(&_1, this_ptr, ZEND_STRL("fetchMode"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_RETURN_CALL_METHOD(&_0, "fetch", NULL, 0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -513,7 +539,7 @@ PHP_METHOD(Phalcon_Db_Result_PdoResult, numRows) ZVAL_STRING(&_7$$6, "/^SELECT\\s+(.*)/i"); zephir_preg_match(&_6$$6, &_7$$6, &sqlStatement, &matches, 0, 0 , 0 ); if (zephir_is_true(&_6$$6)) { - zephir_array_fetch_long(&_8$$7, &matches, 1, PH_NOISY | PH_READONLY, "phalcon/Db/Result/PdoResult.zep", 309); + zephir_array_fetch_long(&_8$$7, &matches, 1, PH_NOISY | PH_READONLY, "phalcon/Db/Result/PdoResult.zep", 311); ZEPHIR_INIT_VAR(&_9$$7); ZEPHIR_CONCAT_SVS(&_9$$7, "SELECT COUNT(*) \"numrows\" FROM (SELECT ", &_8$$7, ")"); zephir_read_property(&_10$$7, this_ptr, ZEND_STRL("bindParams"), PH_NOISY_CC | PH_READONLY); @@ -523,7 +549,7 @@ PHP_METHOD(Phalcon_Db_Result_PdoResult, numRows) ZEPHIR_CALL_METHOD(&row, &result, "fetch", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&rowCount); - zephir_array_fetch_string(&rowCount, &row, SL("numrows"), PH_NOISY, "phalcon/Db/Result/PdoResult.zep", 315); + zephir_array_fetch_string(&rowCount, &row, SL("numrows"), PH_NOISY, "phalcon/Db/Result/PdoResult.zep", 317); } } else { ZEPHIR_INIT_NVAR(&rowCount); diff --git a/ext/phalcon/db/result/pdoresult.zep.h b/ext/phalcon/db/result/pdoresult.zep.h index af7754674f4..56eb8da1bbe 100644 --- a/ext/phalcon/db/result/pdoresult.zep.h +++ b/ext/phalcon/db/result/pdoresult.zep.h @@ -31,15 +31,15 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_result_pdoresult_exec ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_result_pdoresult_fetch, 0, 0, 0) - ZEND_ARG_INFO(0, fetchStyle) - ZEND_ARG_INFO(0, cursorOrientation) - ZEND_ARG_INFO(0, cursorOffset) + ZEND_ARG_TYPE_INFO(0, fetchStyle, IS_LONG, 1) + ZEND_ARG_TYPE_INFO(0, cursorOrientation, IS_LONG, 0) + ZEND_ARG_TYPE_INFO(0, cursorOffset, IS_LONG, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_result_pdoresult_fetchall, 0, 0, IS_ARRAY, 0) - ZEND_ARG_INFO(0, fetchStyle) - ZEND_ARG_INFO(0, fetchArgument) - ZEND_ARG_INFO(0, ctorArgs) + ZEND_ARG_TYPE_INFO(0, fetchStyle, IS_LONG, 1) + ZEND_ARG_TYPE_INFO(0, fetchArgument, IS_LONG, 0) + ZEND_ARG_TYPE_INFO(0, ctorArgs, IS_LONG, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_result_pdoresult_fetcharray, 0, 0, 0) diff --git a/ext/phalcon/di/di.zep.c b/ext/phalcon/di/di.zep.c index 593077e0cbc..6a9ece47b56 100644 --- a/ext/phalcon/di/di.zep.c +++ b/ext/phalcon/di/di.zep.c @@ -207,7 +207,7 @@ PHP_METHOD(Phalcon_Di_Di, __call) ZEPHIR_CONCAT_SVS(&_7, "Call to undefined method or service '", &method, "'"); ZEPHIR_CALL_METHOD(NULL, &_6, "__construct", NULL, 31, &_7); zephir_check_call_status(); - zephir_throw_exception_debug(&_6, "phalcon/Di/Di.zep", 146); + zephir_throw_exception_debug(&_6, "phalcon/Di/Di.zep", 147); ZEPHIR_MM_RESTORE(); return; } @@ -277,7 +277,7 @@ PHP_METHOD(Phalcon_Di_Di, attempt) zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("services"), &name, &_1); zephir_read_property(&_3, this_ptr, ZEND_STRL("services"), PH_NOISY_CC | PH_READONLY); - zephir_array_fetch(&_4, &_3, &name, PH_NOISY | PH_READONLY, "phalcon/Di/Di.zep", 162); + zephir_array_fetch(&_4, &_3, &name, PH_NOISY | PH_READONLY, "phalcon/Di/Di.zep", 163); RETURN_CTOR(&_4); } @@ -286,11 +286,11 @@ PHP_METHOD(Phalcon_Di_Di, attempt) */ PHP_METHOD(Phalcon_Di_Di, get) { - zval _6$$5, _15$$17; + zval _6$$5, _15$$18; zend_bool _1$$3, _14$$11; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *name_param = NULL, *parameters = NULL, parameters_sub, __$null, service, eventsManager, isShared, instance, _0, _5, _2$$3, _3$$4, _4$$4, _7$$5, _8$$7, _9$$7, _10$$9, _12$$12, _16$$17; + zval *name_param = NULL, *parameters = NULL, parameters_sub, __$null, service, eventsManager, isShared, instance, _0, _5, _2$$3, _3$$4, _4$$4, _7$$5, _8$$7, _9$$7, _10$$9, _12$$12, _16$$18; zval name, _11$$9, _13$$12; zval *this_ptr = getThis(); @@ -313,9 +313,9 @@ PHP_METHOD(Phalcon_Di_Di, get) ZVAL_UNDEF(&_9$$7); ZVAL_UNDEF(&_10$$9); ZVAL_UNDEF(&_12$$12); - ZVAL_UNDEF(&_16$$17); + ZVAL_UNDEF(&_16$$18); ZVAL_UNDEF(&_6$$5); - ZVAL_UNDEF(&_15$$17); + ZVAL_UNDEF(&_15$$18); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) @@ -357,7 +357,7 @@ PHP_METHOD(Phalcon_Di_Di, get) } if (_1$$3) { zephir_read_property(&_3$$4, this_ptr, ZEND_STRL("sharedInstances"), PH_NOISY_CC | PH_READONLY); - zephir_array_fetch(&_4$$4, &_3$$4, &name, PH_NOISY | PH_READONLY, "phalcon/Di/Di.zep", 180); + zephir_array_fetch(&_4$$4, &_3$$4, &name, PH_NOISY | PH_READONLY, "phalcon/Di/Di.zep", 181); RETURN_CTOR(&_4$$4); } } @@ -397,7 +397,7 @@ PHP_METHOD(Phalcon_Di_Di, get) ZEPHIR_CONCAT_SVS(&_11$$9, "Service '", &name, "' cannot be resolved"); ZEPHIR_CALL_METHOD(NULL, &_10$$9, "__construct", NULL, 31, &_11$$9); zephir_check_call_status(); - zephir_throw_exception_debug(&_10$$9, "phalcon/Di/Di.zep", 209); + zephir_throw_exception_debug(&_10$$9, "phalcon/Di/Di.zep", 210); ZEPHIR_MM_RESTORE(); return; } @@ -413,7 +413,7 @@ PHP_METHOD(Phalcon_Di_Di, get) ZEPHIR_CONCAT_SVS(&_13$$12, "Service '", &name, "' was not found in the dependency injection container"); ZEPHIR_CALL_METHOD(NULL, &_12$$12, "__construct", NULL, 31, &_13$$12); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$12, "phalcon/Di/Di.zep", 224); + zephir_throw_exception_debug(&_12$$12, "phalcon/Di/Di.zep", 225); ZEPHIR_MM_RESTORE(); return; } @@ -437,16 +437,20 @@ PHP_METHOD(Phalcon_Di_Di, get) ZEPHIR_CALL_METHOD(NULL, &instance, "setdi", NULL, 0, this_ptr); zephir_check_call_status(); } + if (zephir_instance_of_ev(&instance, phalcon_di_initializationawareinterface_ce)) { + ZEPHIR_CALL_METHOD(NULL, &instance, "initialize", NULL, 0); + zephir_check_call_status(); + } } if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(&_15$$17); - zephir_create_array(&_15$$17, 3, 0); - zephir_array_update_string(&_15$$17, SL("name"), &name, PH_COPY | PH_SEPARATE); - zephir_array_update_string(&_15$$17, SL("parameters"), parameters, PH_COPY | PH_SEPARATE); - zephir_array_update_string(&_15$$17, SL("instance"), &instance, PH_COPY | PH_SEPARATE); - ZEPHIR_INIT_VAR(&_16$$17); - ZVAL_STRING(&_16$$17, "di:afterServiceResolve"); - ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_16$$17, this_ptr, &_15$$17); + ZEPHIR_INIT_VAR(&_15$$18); + zephir_create_array(&_15$$18, 3, 0); + zephir_array_update_string(&_15$$18, SL("name"), &name, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_15$$18, SL("parameters"), parameters, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_15$$18, SL("instance"), &instance, PH_COPY | PH_SEPARATE); + ZEPHIR_INIT_VAR(&_16$$18); + ZVAL_STRING(&_16$$18, "di:afterServiceResolve"); + ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_16$$18, this_ptr, &_15$$18); zephir_check_call_status(); } RETURN_CCTOR(&instance); @@ -526,7 +530,7 @@ PHP_METHOD(Phalcon_Di_Di, getRaw) ZEPHIR_CONCAT_SVS(&_2$$3, "Service '", &name, "' was not found in the dependency injection container"); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 31, &_2$$3); zephir_check_call_status(); - zephir_throw_exception_debug(&_1$$3, "phalcon/Di/Di.zep", 290); + zephir_throw_exception_debug(&_1$$3, "phalcon/Di/Di.zep", 295); ZEPHIR_MM_RESTORE(); return; } @@ -581,7 +585,7 @@ PHP_METHOD(Phalcon_Di_Di, getService) ZEPHIR_CONCAT_SVS(&_2$$3, "Service '", &name, "' was not found in the dependency injection container"); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 31, &_2$$3); zephir_check_call_status(); - zephir_throw_exception_debug(&_1$$3, "phalcon/Di/Di.zep", 306); + zephir_throw_exception_debug(&_1$$3, "phalcon/Di/Di.zep", 311); ZEPHIR_MM_RESTORE(); return; } @@ -691,7 +695,7 @@ PHP_METHOD(Phalcon_Di_Di, loadFromConfig) ZEPHIR_CALL_METHOD(&services, config, "toarray", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&services, 0, "phalcon/Di/Di.zep", 356); + zephir_is_iterable(&services, 0, "phalcon/Di/Di.zep", 361); if (Z_TYPE_P(&services) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&services), _2, _3, _0) { @@ -706,7 +710,7 @@ PHP_METHOD(Phalcon_Di_Di, loadFromConfig) _4$$3 = zephir_array_isset_string(&service, SL("shared")); if (_4$$3) { ZEPHIR_OBS_NVAR(&_5$$3); - zephir_array_fetch_string(&_5$$3, &service, SL("shared"), PH_NOISY, "phalcon/Di/Di.zep", 354); + zephir_array_fetch_string(&_5$$3, &service, SL("shared"), PH_NOISY, "phalcon/Di/Di.zep", 359); _4$$3 = zephir_is_true(&_5$$3); } ZVAL_BOOL(&_6$$3, _4$$3); @@ -729,7 +733,7 @@ PHP_METHOD(Phalcon_Di_Di, loadFromConfig) _8$$4 = zephir_array_isset_string(&service, SL("shared")); if (_8$$4) { ZEPHIR_OBS_NVAR(&_9$$4); - zephir_array_fetch_string(&_9$$4, &service, SL("shared"), PH_NOISY, "phalcon/Di/Di.zep", 354); + zephir_array_fetch_string(&_9$$4, &service, SL("shared"), PH_NOISY, "phalcon/Di/Di.zep", 359); _8$$4 = zephir_is_true(&_9$$4); } ZVAL_BOOL(&_10$$4, _8$$4); @@ -946,7 +950,8 @@ PHP_METHOD(Phalcon_Di_Di, offsetGet) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *name, name_sub; + zval name_sub; + zval *name; zval *this_ptr = getThis(); ZVAL_UNDEF(&name_sub); @@ -974,7 +979,8 @@ PHP_METHOD(Phalcon_Di_Di, offsetExists) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *name, name_sub; + zval name_sub; + zval *name; zval *this_ptr = getThis(); ZVAL_UNDEF(&name_sub); @@ -1006,7 +1012,8 @@ PHP_METHOD(Phalcon_Di_Di, offsetSet) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *name, name_sub, *definition, definition_sub; + zval name_sub, definition_sub; + zval *name, *definition; zval *this_ptr = getThis(); ZVAL_UNDEF(&name_sub); @@ -1036,7 +1043,8 @@ PHP_METHOD(Phalcon_Di_Di, offsetUnset) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *name, name_sub; + zval name_sub; + zval *name; zval *this_ptr = getThis(); ZVAL_UNDEF(&name_sub); @@ -1223,7 +1231,7 @@ PHP_METHOD(Phalcon_Di_Di, set) zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("services"), &name, &_0); zephir_read_property(&_2, this_ptr, ZEND_STRL("services"), PH_NOISY_CC | PH_READONLY); - zephir_array_fetch(&_3, &_2, &name, PH_NOISY | PH_READONLY, "phalcon/Di/Di.zep", 547); + zephir_array_fetch(&_3, &_2, &name, PH_NOISY | PH_READONLY, "phalcon/Di/Di.zep", 552); RETURN_CTOR(&_3); } diff --git a/ext/phalcon/di/di.zep.h b/ext/phalcon/di/di.zep.h index 33f3042c063..40be02f13f3 100644 --- a/ext/phalcon/di/di.zep.h +++ b/ext/phalcon/di/di.zep.h @@ -100,7 +100,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_di_di_has, 0, 1, _IS_BOO ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_di_di_offsetget, 0, 0, 1) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_di_di_offsetget, 0, 1, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_di_di_offsetget, 0, 1, IS_NULL, 0) +#endif ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() diff --git a/ext/phalcon/filter/sanitize/stringval.zep.c b/ext/phalcon/filter/sanitize/stringval.zep.c index e9ffd139928..f33bd4d997e 100644 --- a/ext/phalcon/filter/sanitize/stringval.zep.c +++ b/ext/phalcon/filter/sanitize/stringval.zep.c @@ -12,8 +12,11 @@ #include #include "kernel/main.h" -#include "kernel/fcall.h" +#include "kernel/string.h" #include "kernel/memory.h" +#include "kernel/fcall.h" +#include "kernel/operators.h" +#include "kernel/array.h" #include "kernel/object.h" @@ -26,8 +29,6 @@ * file that was distributed with this source code. */ /** - * Phalcon\Filter\Sanitize\String - * * Sanitizes a value to string */ ZEPHIR_INIT_CLASS(Phalcon_Filter_Sanitize_StringVal) @@ -40,17 +41,27 @@ ZEPHIR_INIT_CLASS(Phalcon_Filter_Sanitize_StringVal) /** * @param mixed $input The text to sanitize * - * @return string + * @return string|false */ PHP_METHOD(Phalcon_Filter_Sanitize_StringVal, __invoke) { + zval _7, _8; + zval _2; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *input, input_sub, _0; + zval *input = NULL, input_sub, _0, _1, _3, _4, _5, _6; zval *this_ptr = getThis(); ZVAL_UNDEF(&input_sub); ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_4); + ZVAL_UNDEF(&_5); + ZVAL_UNDEF(&_6); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_7); + ZVAL_UNDEF(&_8); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -61,11 +72,45 @@ PHP_METHOD(Phalcon_Filter_Sanitize_StringVal, __invoke) ZEPHIR_MM_GROW(); zephir_fetch_params(1, 1, 0, &input); + ZEPHIR_SEPARATE_PARAM(input); - ZVAL_LONG(&_0, 513); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 300, input, &_0); + if (Z_TYPE_P(input) == IS_ARRAY) { + RETURN_MM_BOOL(0); + } + ZVAL_LONG(&_0, 0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 259, &_0); + zephir_check_call_status(); + zephir_cast_to_string(&_2, input); + ZEPHIR_INIT_VAR(&_3); + ZVAL_STRING(&_3, ""); + ZEPHIR_INIT_NVAR(input); + zephir_fast_str_replace(input, &_1, &_3, &_2); + ZEPHIR_INIT_VAR(&_4); + ZVAL_STRING(&_4, "/<[^>]*>?/"); + ZEPHIR_INIT_VAR(&_5); + ZVAL_STRING(&_5, ""); + ZEPHIR_CALL_FUNCTION(&_6, "preg_replace", NULL, 50, &_4, &_5, input); zephir_check_call_status(); - RETURN_MM(); + ZEPHIR_CPY_WRT(input, &_6); + ZEPHIR_INIT_VAR(&_7); + zephir_create_array(&_7, 2, 0); + ZEPHIR_INIT_NVAR(&_4); + ZVAL_STRING(&_4, "'"); + zephir_array_fast_append(&_7, &_4); + ZEPHIR_INIT_NVAR(&_4); + ZVAL_STRING(&_4, "\""); + zephir_array_fast_append(&_7, &_4); + ZEPHIR_INIT_VAR(&_8); + zephir_create_array(&_8, 2, 0); + ZEPHIR_INIT_NVAR(&_4); + ZVAL_STRING(&_4, "'"); + zephir_array_fast_append(&_8, &_4); + ZEPHIR_INIT_NVAR(&_4); + ZVAL_STRING(&_4, """); + zephir_array_fast_append(&_8, &_4); + ZEPHIR_INIT_NVAR(&_4); + zephir_fast_str_replace(&_4, &_7, &_8, input); + RETURN_CCTOR(&_4); } diff --git a/ext/phalcon/filter/validation/abstractvalidator.zep.c b/ext/phalcon/filter/validation/abstractvalidator.zep.c index fafb97becf2..67330d23551 100644 --- a/ext/phalcon/filter/validation/abstractvalidator.zep.c +++ b/ext/phalcon/filter/validation/abstractvalidator.zep.c @@ -489,14 +489,15 @@ PHP_METHOD(Phalcon_Filter_Validation_AbstractValidator, prepareCode) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *field_param = NULL, code, _0, _1$$3; + zval *field_param = NULL, code, _0, _1, _2$$3; zval field; zval *this_ptr = getThis(); ZVAL_UNDEF(&field); ZVAL_UNDEF(&code); ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1$$3); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2$$3); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -520,11 +521,12 @@ PHP_METHOD(Phalcon_Filter_Validation_AbstractValidator, prepareCode) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "code"); - ZEPHIR_CALL_METHOD(&code, this_ptr, "getoption", NULL, 0, &_0); + ZVAL_LONG(&_1, 0); + ZEPHIR_CALL_METHOD(&code, this_ptr, "getoption", NULL, 0, &_0, &_1); zephir_check_call_status(); if (Z_TYPE_P(&code) == IS_ARRAY) { - zephir_array_fetch(&_1$$3, &code, &field, PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/AbstractValidator.zep", 188); - ZEPHIR_CPY_WRT(&code, &_1$$3); + zephir_array_fetch(&_2$$3, &code, &field, PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/AbstractValidator.zep", 188); + ZEPHIR_CPY_WRT(&code, &_2$$3); } RETURN_CCTOR(&code); } diff --git a/ext/phalcon/filter/validation/abstractvalidator.zep.h b/ext/phalcon/filter/validation/abstractvalidator.zep.h index 3b02c6a831e..2f82a22868d 100644 --- a/ext/phalcon/filter/validation/abstractvalidator.zep.h +++ b/ext/phalcon/filter/validation/abstractvalidator.zep.h @@ -61,7 +61,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_abstra ZEND_ARG_INFO(0, field) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_abstractvalidator_preparecode, 0, 1, IS_LONG, 1) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_abstractvalidator_preparecode, 0, 1, IS_LONG, 0) ZEND_ARG_TYPE_INFO(0, field, IS_STRING, 0) ZEND_END_ARG_INFO() diff --git a/ext/phalcon/forms/form.zep.h b/ext/phalcon/forms/form.zep.h index 432dd0a2e32..ad501f307ea 100644 --- a/ext/phalcon/forms/form.zep.h +++ b/ext/phalcon/forms/form.zep.h @@ -82,7 +82,11 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_forms_form_count, 0, 0, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_forms_form_current, 0, 0, 0) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_forms_form_current, 0, 0, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_forms_form_current, 0, 0, IS_NULL, 0) +#endif ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_forms_form_get, 0, 1, Phalcon\\Forms\\Element\\ElementInterface, 0) @@ -227,11 +231,7 @@ ZEPHIR_INIT_FUNCS(phalcon_forms_form_method_entry) { PHP_ME(Phalcon_Forms_Form, bind, arginfo_phalcon_forms_form_bind, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Forms_Form, clear, arginfo_phalcon_forms_form_clear, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Forms_Form, count, arginfo_phalcon_forms_form_count, ZEND_ACC_PUBLIC) -#if PHP_VERSION_ID >= 80000 PHP_ME(Phalcon_Forms_Form, current, arginfo_phalcon_forms_form_current, ZEND_ACC_PUBLIC) -#else - PHP_ME(Phalcon_Forms_Form, current, NULL, ZEND_ACC_PUBLIC) -#endif PHP_ME(Phalcon_Forms_Form, get, arginfo_phalcon_forms_form_get, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Forms_Form, getAction, arginfo_phalcon_forms_form_getaction, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Forms_Form, getAttributes, arginfo_phalcon_forms_form_getattributes, ZEND_ACC_PUBLIC) diff --git a/ext/phalcon/html/link/evolvablelink.zep.c b/ext/phalcon/html/link/evolvablelink.zep.c index 5575cb70d90..457a3504720 100644 --- a/ext/phalcon/html/link/evolvablelink.zep.c +++ b/ext/phalcon/html/link/evolvablelink.zep.c @@ -37,7 +37,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Html_Link_EvolvableLink) { ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Html\\Link, EvolvableLink, phalcon, html_link_evolvablelink, phalcon_html_link_link_ce, phalcon_html_link_evolvablelink_method_entry, 0); - zend_class_implements(phalcon_html_link_evolvablelink_ce, 1, zephir_get_internal_ce(SL("psr\\link\\evolvablelinkinterface"))); + zend_class_implements(phalcon_html_link_evolvablelink_ce, 1, zephir_get_internal_ce(SL("psrext\\link\\evolvablelinkinterface"))); return SUCCESS; } diff --git a/ext/phalcon/html/link/evolvablelinkprovider.zep.c b/ext/phalcon/html/link/evolvablelinkprovider.zep.c index 0ea82dcd006..e7310492566 100644 --- a/ext/phalcon/html/link/evolvablelinkprovider.zep.c +++ b/ext/phalcon/html/link/evolvablelinkprovider.zep.c @@ -35,7 +35,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Html_Link_EvolvableLinkProvider) { ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Html\\Link, EvolvableLinkProvider, phalcon, html_link_evolvablelinkprovider, phalcon_html_link_linkprovider_ce, phalcon_html_link_evolvablelinkprovider_method_entry, 0); - zend_class_implements(phalcon_html_link_evolvablelinkprovider_ce, 1, zephir_get_internal_ce(SL("psr\\link\\evolvablelinkproviderinterface"))); + zend_class_implements(phalcon_html_link_evolvablelinkprovider_ce, 1, zephir_get_internal_ce(SL("psrext\\link\\evolvablelinkproviderinterface"))); return SUCCESS; } @@ -46,7 +46,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Html_Link_EvolvableLinkProvider) * normally without errors. The link is present if link is === identical * to a link object already in the collection. * - * @param LinkInterface link + * @param \Psr\Link\LinkInterface link * A link object that should be included in this collection. * * @return static @@ -64,7 +64,7 @@ PHP_METHOD(Phalcon_Html_Link_EvolvableLinkProvider, withLink) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(link, zephir_get_internal_ce(SL("psr\\link\\linkinterface"))) + Z_PARAM_OBJECT_OF_CLASS(link, zephir_get_internal_ce(SL("psrext\\link\\linkinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -110,7 +110,7 @@ PHP_METHOD(Phalcon_Html_Link_EvolvableLinkProvider, withoutLink) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(link, zephir_get_internal_ce(SL("psr\\link\\linkinterface"))) + Z_PARAM_OBJECT_OF_CLASS(link, zephir_get_internal_ce(SL("psrext\\link\\linkinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/html/link/evolvablelinkprovider.zep.h b/ext/phalcon/html/link/evolvablelinkprovider.zep.h index 89c2836fc50..72eea3d07f2 100644 --- a/ext/phalcon/html/link/evolvablelinkprovider.zep.h +++ b/ext/phalcon/html/link/evolvablelinkprovider.zep.h @@ -7,11 +7,11 @@ PHP_METHOD(Phalcon_Html_Link_EvolvableLinkProvider, withLink); PHP_METHOD(Phalcon_Html_Link_EvolvableLinkProvider, withoutLink); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_html_link_evolvablelinkprovider_withlink, 0, 0, 1) - ZEND_ARG_OBJ_INFO(0, link, Psr\\Link\\LinkInterface, 0) + ZEND_ARG_OBJ_INFO(0, link, PsrExt\\Link\\LinkInterface, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_html_link_evolvablelinkprovider_withoutlink, 0, 0, 1) - ZEND_ARG_OBJ_INFO(0, link, Psr\\Link\\LinkInterface, 0) + ZEND_ARG_OBJ_INFO(0, link, PsrExt\\Link\\LinkInterface, 0) ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_html_link_evolvablelinkprovider_method_entry) { diff --git a/ext/phalcon/html/link/link.zep.c b/ext/phalcon/html/link/link.zep.c index 8ce4be4e6e0..fef3347cff3 100644 --- a/ext/phalcon/html/link/link.zep.c +++ b/ext/phalcon/html/link/link.zep.c @@ -55,7 +55,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Html_Link_Link) * @var bool */ zend_declare_property_bool(phalcon_html_link_link_ce, SL("templated"), 0, ZEND_ACC_PROTECTED); - zend_class_implements(phalcon_html_link_link_ce, 1, zephir_get_internal_ce(SL("psr\\link\\linkinterface"))); + zend_class_implements(phalcon_html_link_link_ce, 1, zephir_get_internal_ce(SL("psrext\\link\\linkinterface"))); return SUCCESS; } diff --git a/ext/phalcon/html/link/linkprovider.zep.c b/ext/phalcon/html/link/linkprovider.zep.c index a594168aeaf..f5281819f4b 100644 --- a/ext/phalcon/html/link/linkprovider.zep.c +++ b/ext/phalcon/html/link/linkprovider.zep.c @@ -40,7 +40,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Html_Link_LinkProvider) zend_declare_property_null(phalcon_html_link_linkprovider_ce, SL("links"), ZEND_ACC_PROTECTED); phalcon_html_link_linkprovider_ce->create_object = zephir_init_properties_Phalcon_Html_Link_LinkProvider; - zend_class_implements(phalcon_html_link_linkprovider_ce, 1, zephir_get_internal_ce(SL("psr\\link\\linkproviderinterface"))); + zend_class_implements(phalcon_html_link_linkprovider_ce, 1, zephir_get_internal_ce(SL("psrext\\link\\linkproviderinterface"))); return SUCCESS; } @@ -88,7 +88,7 @@ PHP_METHOD(Phalcon_Html_Link_LinkProvider, __construct) { ZEPHIR_INIT_NVAR(&link); ZVAL_COPY(&link, _0); - if (zephir_is_instance_of(&link, SL("Psr\\Link\\LinkInterface"))) { + if (zephir_is_instance_of(&link, SL("PsrExt\\Link\\LinkInterface"))) { ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "getkey", &_3, 0, &link); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("links"), &_2$$4, &link); @@ -105,7 +105,7 @@ PHP_METHOD(Phalcon_Html_Link_LinkProvider, __construct) } ZEPHIR_CALL_METHOD(&link, &links, "current", NULL, 0); zephir_check_call_status(); - if (zephir_is_instance_of(&link, SL("Psr\\Link\\LinkInterface"))) { + if (zephir_is_instance_of(&link, SL("PsrExt\\Link\\LinkInterface"))) { ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "getkey", &_3, 0, &link); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("links"), &_4$$6, &link); @@ -227,7 +227,7 @@ PHP_METHOD(Phalcon_Html_Link_LinkProvider, getKey) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(link, zephir_get_internal_ce(SL("psr\\link\\linkinterface"))) + Z_PARAM_OBJECT_OF_CLASS(link, zephir_get_internal_ce(SL("psrext\\link\\linkinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/html/link/linkprovider.zep.h b/ext/phalcon/html/link/linkprovider.zep.h index a5503012ac8..c968a54a46b 100644 --- a/ext/phalcon/html/link/linkprovider.zep.h +++ b/ext/phalcon/html/link/linkprovider.zep.h @@ -25,7 +25,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_html_link_linkprovider_getlinksbyrel, 0, ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_link_linkprovider_getkey, 0, 1, IS_STRING, 0) - ZEND_ARG_OBJ_INFO(0, link, Psr\\Link\\LinkInterface, 0) + ZEND_ARG_OBJ_INFO(0, link, PsrExt\\Link\\LinkInterface, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_html_link_linkprovider_zephir_init_properties_phalcon_html_link_linkprovider, 0, 0, 0) diff --git a/ext/phalcon/http/message/abstractmessage.zep.c b/ext/phalcon/http/message/abstractmessage.zep.c index fcc8798e1f8..143b1975395 100644 --- a/ext/phalcon/http/message/abstractmessage.zep.c +++ b/ext/phalcon/http/message/abstractmessage.zep.c @@ -394,7 +394,7 @@ PHP_METHOD(Phalcon_Http_Message_AbstractMessage, withBody) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(body, zephir_get_internal_ce(SL("psr\\http\\message\\streaminterface"))) + Z_PARAM_OBJECT_OF_CLASS(body, zephir_get_internal_ce(SL("psrext\\http\\message\\streaminterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -952,7 +952,7 @@ PHP_METHOD(Phalcon_Http_Message_AbstractMessage, getUriHost) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(uri, zephir_get_internal_ce(SL("psr\\http\\message\\uriinterface"))) + Z_PARAM_OBJECT_OF_CLASS(uri, zephir_get_internal_ce(SL("psrext\\http\\message\\uriinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1127,7 +1127,7 @@ PHP_METHOD(Phalcon_Http_Message_AbstractMessage, processBody) _0 = Z_TYPE_P(body) == IS_OBJECT; if (_0) { - _0 = zephir_is_instance_of(body, SL("Psr\\Http\\Message\\StreamInterface")); + _0 = zephir_is_instance_of(body, SL("PsrExt\\Http\\Message\\StreamInterface")); } if (UNEXPECTED(_0)) { RETVAL_ZVAL(body, 1, 0); diff --git a/ext/phalcon/http/message/abstractmessage.zep.h b/ext/phalcon/http/message/abstractmessage.zep.h index 4feed21f6d7..9834bcfc81e 100644 --- a/ext/phalcon/http/message/abstractmessage.zep.h +++ b/ext/phalcon/http/message/abstractmessage.zep.h @@ -55,7 +55,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_abstractmessage_withaddedhea ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_abstractmessage_withbody, 0, 0, 1) - ZEND_ARG_OBJ_INFO(0, body, Psr\\Http\\Message\\StreamInterface, 0) + ZEND_ARG_OBJ_INFO(0, body, PsrExt\\Http\\Message\\StreamInterface, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_abstractmessage_withheader, 0, 0, 2) @@ -90,14 +90,14 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_abstractmes ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_abstractmessage_geturihost, 0, 1, IS_STRING, 0) - ZEND_ARG_OBJ_INFO(0, uri, Psr\\Http\\Message\\UriInterface, 0) + ZEND_ARG_OBJ_INFO(0, uri, PsrExt\\Http\\Message\\UriInterface, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_abstractmessage_populateheadercollection, 0, 1, Phalcon\\Support\\Collection\\CollectionInterface, 0) ZEND_ARG_ARRAY_INFO(0, headers, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_abstractmessage_processbody, 0, 0, Psr\\Http\\Message\\StreamInterface, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_abstractmessage_processbody, 0, 0, PsrExt\\Http\\Message\\StreamInterface, 0) ZEND_ARG_INFO(0, body) ZEND_ARG_TYPE_INFO(0, mode, IS_STRING, 0) ZEND_END_ARG_INFO() diff --git a/ext/phalcon/http/message/abstractrequest.zep.c b/ext/phalcon/http/message/abstractrequest.zep.c index 53001b60c13..0d9dc01d862 100644 --- a/ext/phalcon/http/message/abstractrequest.zep.c +++ b/ext/phalcon/http/message/abstractrequest.zep.c @@ -313,7 +313,7 @@ PHP_METHOD(Phalcon_Http_Message_AbstractRequest, withUri) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(uri, zephir_get_internal_ce(SL("psr\\http\\message\\uriinterface"))) + Z_PARAM_OBJECT_OF_CLASS(uri, zephir_get_internal_ce(SL("psrext\\http\\message\\uriinterface"))) Z_PARAM_OPTIONAL Z_PARAM_ZVAL(preserveHost) ZEND_PARSE_PARAMETERS_END(); @@ -454,7 +454,7 @@ PHP_METHOD(Phalcon_Http_Message_AbstractRequest, processUri) _0 = Z_TYPE_P(uri) == IS_OBJECT; if (_0) { - _0 = zephir_is_instance_of(uri, SL("Psr\\Http\\Message\\UriInterface")); + _0 = zephir_is_instance_of(uri, SL("PsrExt\\Http\\Message\\UriInterface")); } if (UNEXPECTED(_0)) { RETVAL_ZVAL(uri, 1, 0); diff --git a/ext/phalcon/http/message/abstractrequest.zep.h b/ext/phalcon/http/message/abstractrequest.zep.h index c03186e4f47..d299cb914d9 100644 --- a/ext/phalcon/http/message/abstractrequest.zep.h +++ b/ext/phalcon/http/message/abstractrequest.zep.h @@ -30,7 +30,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_abstractrequest_withrequestt ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_abstractrequest_withuri, 0, 0, 1) - ZEND_ARG_OBJ_INFO(0, uri, Psr\\Http\\Message\\UriInterface, 0) + ZEND_ARG_OBJ_INFO(0, uri, PsrExt\\Http\\Message\\UriInterface, 0) ZEND_ARG_INFO(0, preserveHost) ZEND_END_ARG_INFO() @@ -38,7 +38,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_abstractreq ZEND_ARG_INFO(0, method) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_abstractrequest_processuri, 0, 1, Psr\\Http\\Message\\UriInterface, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_abstractrequest_processuri, 0, 1, PsrExt\\Http\\Message\\UriInterface, 0) ZEND_ARG_INFO(0, uri) ZEND_END_ARG_INFO() diff --git a/ext/phalcon/http/message/request.zep.c b/ext/phalcon/http/message/request.zep.c index 66ad0ae49ac..8c04eb2a73d 100644 --- a/ext/phalcon/http/message/request.zep.c +++ b/ext/phalcon/http/message/request.zep.c @@ -37,7 +37,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Message_Request) { ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Http\\Message, Request, phalcon, http_message_request, phalcon_http_message_abstractrequest_ce, phalcon_http_message_request_method_entry, ZEND_ACC_FINAL_CLASS); - zend_class_implements(phalcon_http_message_request_ce, 1, zephir_get_internal_ce(SL("psr\\http\\message\\requestinterface"))); + zend_class_implements(phalcon_http_message_request_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\message\\requestinterface"))); return SUCCESS; } diff --git a/ext/phalcon/http/message/requestfactory.zep.c b/ext/phalcon/http/message/requestfactory.zep.c index 0638a4deeda..6891aa54353 100644 --- a/ext/phalcon/http/message/requestfactory.zep.c +++ b/ext/phalcon/http/message/requestfactory.zep.c @@ -39,7 +39,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Message_RequestFactory) { ZEPHIR_REGISTER_CLASS(Phalcon\\Http\\Message, RequestFactory, phalcon, http_message_requestfactory, phalcon_http_message_requestfactory_method_entry, ZEND_ACC_FINAL_CLASS); - zend_class_implements(phalcon_http_message_requestfactory_ce, 1, zephir_get_internal_ce(SL("psr\\http\\message\\requestfactoryinterface"))); + zend_class_implements(phalcon_http_message_requestfactory_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\message\\requestfactoryinterface"))); return SUCCESS; } diff --git a/ext/phalcon/http/message/requestfactory.zep.h b/ext/phalcon/http/message/requestfactory.zep.h index fec3923638f..a4200444ade 100644 --- a/ext/phalcon/http/message/requestfactory.zep.h +++ b/ext/phalcon/http/message/requestfactory.zep.h @@ -5,7 +5,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Message_RequestFactory); PHP_METHOD(Phalcon_Http_Message_RequestFactory, createRequest); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_requestfactory_createrequest, 0, 2, Psr\\Http\\Message\\RequestInterface, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_requestfactory_createrequest, 0, 2, PsrExt\\Http\\Message\\RequestInterface, 0) ZEND_ARG_TYPE_INFO(0, method, IS_STRING, 0) ZEND_ARG_INFO(0, uri) ZEND_END_ARG_INFO() diff --git a/ext/phalcon/http/message/response.zep.c b/ext/phalcon/http/message/response.zep.c index 2428b0b79a6..4140e1b583c 100644 --- a/ext/phalcon/http/message/response.zep.c +++ b/ext/phalcon/http/message/response.zep.c @@ -65,7 +65,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Message_Response) * @var int */ zend_declare_property_long(phalcon_http_message_response_ce, SL("statusCode"), 200, ZEND_ACC_PROTECTED); - zend_class_implements(phalcon_http_message_response_ce, 1, zephir_get_internal_ce(SL("psr\\http\\message\\responseinterface"))); + zend_class_implements(phalcon_http_message_response_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\message\\responseinterface"))); zend_class_implements(phalcon_http_message_response_ce, 1, phalcon_http_message_responsestatuscodeinterface_ce); return SUCCESS; } diff --git a/ext/phalcon/http/message/responsefactory.zep.c b/ext/phalcon/http/message/responsefactory.zep.c index 24b15f409bf..050809fc64b 100644 --- a/ext/phalcon/http/message/responsefactory.zep.c +++ b/ext/phalcon/http/message/responsefactory.zep.c @@ -37,7 +37,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Message_ResponseFactory) { ZEPHIR_REGISTER_CLASS(Phalcon\\Http\\Message, ResponseFactory, phalcon, http_message_responsefactory, phalcon_http_message_responsefactory_method_entry, ZEND_ACC_FINAL_CLASS); - zend_class_implements(phalcon_http_message_responsefactory_ce, 1, zephir_get_internal_ce(SL("psr\\http\\message\\responsefactoryinterface"))); + zend_class_implements(phalcon_http_message_responsefactory_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\message\\responsefactoryinterface"))); return SUCCESS; } diff --git a/ext/phalcon/http/message/responsefactory.zep.h b/ext/phalcon/http/message/responsefactory.zep.h index 70698bad98a..5b7aad9fad4 100644 --- a/ext/phalcon/http/message/responsefactory.zep.h +++ b/ext/phalcon/http/message/responsefactory.zep.h @@ -5,7 +5,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Message_ResponseFactory); PHP_METHOD(Phalcon_Http_Message_ResponseFactory, createResponse); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_responsefactory_createresponse, 0, 0, Psr\\Http\\Message\\ResponseInterface, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_responsefactory_createresponse, 0, 0, PsrExt\\Http\\Message\\ResponseInterface, 0) ZEND_ARG_TYPE_INFO(0, code, IS_LONG, 0) ZEND_ARG_TYPE_INFO(0, reasonPhrase, IS_STRING, 0) ZEND_END_ARG_INFO() diff --git a/ext/phalcon/http/message/serverrequest.zep.c b/ext/phalcon/http/message/serverrequest.zep.c index cb4a098f5af..346e7a95892 100644 --- a/ext/phalcon/http/message/serverrequest.zep.c +++ b/ext/phalcon/http/message/serverrequest.zep.c @@ -105,7 +105,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Message_ServerRequest) zend_declare_property_null(phalcon_http_message_serverrequest_ce, SL("uploadedFiles"), ZEND_ACC_PROTECTED); phalcon_http_message_serverrequest_ce->create_object = zephir_init_properties_Phalcon_Http_Message_ServerRequest; - zend_class_implements(phalcon_http_message_serverrequest_ce, 1, zephir_get_internal_ce(SL("psr\\http\\message\\serverrequestinterface"))); + zend_class_implements(phalcon_http_message_serverrequest_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\message\\serverrequestinterface"))); return SUCCESS; } @@ -801,7 +801,7 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequest, checkUploadedFiles) } else { _3$$5 = Z_TYPE_P(&file) == IS_OBJECT; if (_3$$5) { - _3$$5 = zephir_is_instance_of(&file, SL("Psr\\Http\\Message\\UploadedFileInterface")); + _3$$5 = zephir_is_instance_of(&file, SL("PsrExt\\Http\\Message\\UploadedFileInterface")); } if (UNEXPECTED(!(_3$$5))) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Invalid uploaded file", "phalcon/Http/Message/ServerRequest.zep", 350); @@ -826,7 +826,7 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequest, checkUploadedFiles) } else { _4$$9 = Z_TYPE_P(&file) == IS_OBJECT; if (_4$$9) { - _4$$9 = zephir_is_instance_of(&file, SL("Psr\\Http\\Message\\UploadedFileInterface")); + _4$$9 = zephir_is_instance_of(&file, SL("PsrExt\\Http\\Message\\UploadedFileInterface")); } if (UNEXPECTED(!(_4$$9))) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Invalid uploaded file", "phalcon/Http/Message/ServerRequest.zep", 350); diff --git a/ext/phalcon/http/message/serverrequestfactory.zep.c b/ext/phalcon/http/message/serverrequestfactory.zep.c index beb63aa59c6..e15d93aca6b 100644 --- a/ext/phalcon/http/message/serverrequestfactory.zep.c +++ b/ext/phalcon/http/message/serverrequestfactory.zep.c @@ -41,7 +41,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Message_ServerRequestFactory) { ZEPHIR_REGISTER_CLASS(Phalcon\\Http\\Message, ServerRequestFactory, phalcon, http_message_serverrequestfactory, phalcon_http_message_serverrequestfactory_method_entry, 0); - zend_class_implements(phalcon_http_message_serverrequestfactory_ce, 1, zephir_get_internal_ce(SL("psr\\http\\message\\serverrequestfactoryinterface"))); + zend_class_implements(phalcon_http_message_serverrequestfactory_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\message\\serverrequestfactoryinterface"))); zend_class_implements(phalcon_http_message_serverrequestfactory_ce, 1, phalcon_http_message_requestmethodinterface_ce); return SUCCESS; } @@ -1373,7 +1373,7 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseUploadedFiles) ZEPHIR_CPY_WRT(&key, &_4$$3); _5$$3 = Z_TYPE_P(&file) == IS_OBJECT; if (_5$$3) { - _5$$3 = zephir_is_instance_of(&file, SL("Psr\\Http\\Message\\UploadedFileInterface")); + _5$$3 = zephir_is_instance_of(&file, SL("PsrExt\\Http\\Message\\UploadedFileInterface")); } if (UNEXPECTED(_5$$3)) { ZEPHIR_CALL_METHOD(NULL, &collection, "set", &_6, 42, &key, &file); @@ -1418,7 +1418,7 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseUploadedFiles) ZEPHIR_CPY_WRT(&key, &_12$$7); _13$$7 = Z_TYPE_P(&file) == IS_OBJECT; if (_13$$7) { - _13$$7 = zephir_is_instance_of(&file, SL("Psr\\Http\\Message\\UploadedFileInterface")); + _13$$7 = zephir_is_instance_of(&file, SL("PsrExt\\Http\\Message\\UploadedFileInterface")); } if (UNEXPECTED(_13$$7)) { ZEPHIR_CALL_METHOD(NULL, &collection, "set", &_6, 42, &key, &file); diff --git a/ext/phalcon/http/message/serverrequestfactory.zep.h b/ext/phalcon/http/message/serverrequestfactory.zep.h index 05a4b1b265f..09c21bb3a6a 100644 --- a/ext/phalcon/http/message/serverrequestfactory.zep.h +++ b/ext/phalcon/http/message/serverrequestfactory.zep.h @@ -21,7 +21,7 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseServer); PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseUploadedFiles); PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseUri); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_serverrequestfactory_createserverrequest, 0, 2, Psr\\Http\\Message\\ServerRequestInterface, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_serverrequestfactory_createserverrequest, 0, 2, PsrExt\\Http\\Message\\ServerRequestInterface, 0) ZEND_ARG_TYPE_INFO(0, method, IS_STRING, 0) ZEND_ARG_INFO(0, uri) #if PHP_VERSION_ID >= 80000 diff --git a/ext/phalcon/http/message/stream.zep.c b/ext/phalcon/http/message/stream.zep.c index c37b142bcb6..f9a22066b91 100644 --- a/ext/phalcon/http/message/stream.zep.c +++ b/ext/phalcon/http/message/stream.zep.c @@ -49,7 +49,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Message_Stream) * @var resource | string */ zend_declare_property_null(phalcon_http_message_stream_ce, SL("stream"), ZEND_ACC_PROTECTED); - zend_class_implements(phalcon_http_message_stream_ce, 1, zephir_get_internal_ce(SL("psr\\http\\message\\streaminterface"))); + zend_class_implements(phalcon_http_message_stream_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\message\\streaminterface"))); return SUCCESS; } diff --git a/ext/phalcon/http/message/streamfactory.zep.c b/ext/phalcon/http/message/streamfactory.zep.c index 3d71e0bae56..da35f817684 100644 --- a/ext/phalcon/http/message/streamfactory.zep.c +++ b/ext/phalcon/http/message/streamfactory.zep.c @@ -40,7 +40,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Message_StreamFactory) { ZEPHIR_REGISTER_CLASS(Phalcon\\Http\\Message, StreamFactory, phalcon, http_message_streamfactory, phalcon_http_message_streamfactory_method_entry, ZEND_ACC_FINAL_CLASS); - zend_class_implements(phalcon_http_message_streamfactory_ce, 1, zephir_get_internal_ce(SL("psr\\http\\message\\streamfactoryinterface"))); + zend_class_implements(phalcon_http_message_streamfactory_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\message\\streamfactoryinterface"))); return SUCCESS; } diff --git a/ext/phalcon/http/message/streamfactory.zep.h b/ext/phalcon/http/message/streamfactory.zep.h index ef993540613..f2a3cb9dd91 100644 --- a/ext/phalcon/http/message/streamfactory.zep.h +++ b/ext/phalcon/http/message/streamfactory.zep.h @@ -7,16 +7,16 @@ PHP_METHOD(Phalcon_Http_Message_StreamFactory, createStream); PHP_METHOD(Phalcon_Http_Message_StreamFactory, createStreamFromFile); PHP_METHOD(Phalcon_Http_Message_StreamFactory, createStreamFromResource); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_streamfactory_createstream, 0, 0, Psr\\Http\\Message\\StreamInterface, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_streamfactory_createstream, 0, 0, PsrExt\\Http\\Message\\StreamInterface, 0) ZEND_ARG_TYPE_INFO(0, content, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_streamfactory_createstreamfromfile, 0, 1, Psr\\Http\\Message\\StreamInterface, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_streamfactory_createstreamfromfile, 0, 1, PsrExt\\Http\\Message\\StreamInterface, 0) ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, mode, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_streamfactory_createstreamfromresource, 0, 1, Psr\\Http\\Message\\StreamInterface, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_streamfactory_createstreamfromresource, 0, 1, PsrExt\\Http\\Message\\StreamInterface, 0) ZEND_ARG_INFO(0, phpResource) ZEND_END_ARG_INFO() diff --git a/ext/phalcon/http/message/uploadedfile.zep.c b/ext/phalcon/http/message/uploadedfile.zep.c index f7a12889867..5a52b99c829 100644 --- a/ext/phalcon/http/message/uploadedfile.zep.c +++ b/ext/phalcon/http/message/uploadedfile.zep.c @@ -111,7 +111,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Message_UploadedFile) * @var StreamInterface|string|null */ zend_declare_property_null(phalcon_http_message_uploadedfile_ce, SL("stream"), ZEND_ACC_PRIVATE); - zend_class_implements(phalcon_http_message_uploadedfile_ce, 1, zephir_get_internal_ce(SL("psr\\http\\message\\uploadedfileinterface"))); + zend_class_implements(phalcon_http_message_uploadedfile_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\message\\uploadedfileinterface"))); return SUCCESS; } @@ -323,7 +323,7 @@ PHP_METHOD(Phalcon_Http_Message_UploadedFile, getStream) } ZEPHIR_OBS_VAR(&_5); zephir_read_property(&_5, this_ptr, ZEND_STRL("stream"), PH_NOISY_CC); - if (UNEXPECTED(!(zephir_is_instance_of(&_5, SL("Psr\\Http\\Message\\StreamInterface"))))) { + if (UNEXPECTED(!(zephir_is_instance_of(&_5, SL("PsrExt\\Http\\Message\\StreamInterface"))))) { ZEPHIR_INIT_VAR(&_6$$5); object_init_ex(&_6$$5, phalcon_http_message_stream_ce); zephir_read_property(&_7$$5, this_ptr, ZEND_STRL("fileName"), PH_NOISY_CC | PH_READONLY); @@ -574,7 +574,7 @@ PHP_METHOD(Phalcon_Http_Message_UploadedFile, checkStream) zephir_update_property_zval(this_ptr, ZEND_STRL("stream"), &_1$$5); break; } - if (_0$$3 == (zephir_is_instance_of(stream, SL("Psr\\Http\\Message\\StreamInterface")))) { + if (_0$$3 == (zephir_is_instance_of(stream, SL("PsrExt\\Http\\Message\\StreamInterface")))) { zephir_update_property_zval(this_ptr, ZEND_STRL("stream"), stream); break; } diff --git a/ext/phalcon/http/message/uploadedfilefactory.zep.c b/ext/phalcon/http/message/uploadedfilefactory.zep.c index 6cd3265968a..86a98c666ae 100644 --- a/ext/phalcon/http/message/uploadedfilefactory.zep.c +++ b/ext/phalcon/http/message/uploadedfilefactory.zep.c @@ -37,7 +37,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Message_UploadedFileFactory) { ZEPHIR_REGISTER_CLASS(Phalcon\\Http\\Message, UploadedFileFactory, phalcon, http_message_uploadedfilefactory, phalcon_http_message_uploadedfilefactory_method_entry, ZEND_ACC_FINAL_CLASS); - zend_class_implements(phalcon_http_message_uploadedfilefactory_ce, 1, zephir_get_internal_ce(SL("psr\\http\\message\\uploadedfilefactoryinterface"))); + zend_class_implements(phalcon_http_message_uploadedfilefactory_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\message\\uploadedfilefactoryinterface"))); return SUCCESS; } @@ -75,7 +75,7 @@ PHP_METHOD(Phalcon_Http_Message_UploadedFileFactory, createUploadedFile) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 5) - Z_PARAM_OBJECT_OF_CLASS(stream, zephir_get_internal_ce(SL("psr\\http\\message\\streaminterface"))) + Z_PARAM_OBJECT_OF_CLASS(stream, zephir_get_internal_ce(SL("psrext\\http\\message\\streaminterface"))) Z_PARAM_OPTIONAL Z_PARAM_LONG_OR_NULL(size, is_null_true) Z_PARAM_LONG(error) diff --git a/ext/phalcon/http/message/uploadedfilefactory.zep.h b/ext/phalcon/http/message/uploadedfilefactory.zep.h index 39a79c07213..48a6dcfb2b4 100644 --- a/ext/phalcon/http/message/uploadedfilefactory.zep.h +++ b/ext/phalcon/http/message/uploadedfilefactory.zep.h @@ -5,8 +5,8 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Message_UploadedFileFactory); PHP_METHOD(Phalcon_Http_Message_UploadedFileFactory, createUploadedFile); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_uploadedfilefactory_createuploadedfile, 0, 1, Psr\\Http\\Message\\UploadedFileInterface, 0) - ZEND_ARG_OBJ_INFO(0, stream, Psr\\Http\\Message\\StreamInterface, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_uploadedfilefactory_createuploadedfile, 0, 1, PsrExt\\Http\\Message\\UploadedFileInterface, 0) + ZEND_ARG_OBJ_INFO(0, stream, PsrExt\\Http\\Message\\StreamInterface, 0) ZEND_ARG_TYPE_INFO(0, size, IS_LONG, 1) ZEND_ARG_TYPE_INFO(0, error, IS_LONG, 0) ZEND_ARG_TYPE_INFO(0, clientFilename, IS_STRING, 1) diff --git a/ext/phalcon/http/message/uri.zep.c b/ext/phalcon/http/message/uri.zep.c index 40a7f172d5c..e2bf343b52a 100644 --- a/ext/phalcon/http/message/uri.zep.c +++ b/ext/phalcon/http/message/uri.zep.c @@ -113,7 +113,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Message_Uri) * @var string */ zend_declare_property_string(phalcon_http_message_uri_ce, SL("user"), "", ZEND_ACC_PROTECTED); - zend_class_implements(phalcon_http_message_uri_ce, 1, zephir_get_internal_ce(SL("psr\\http\\message\\uriinterface"))); + zend_class_implements(phalcon_http_message_uri_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\message\\uriinterface"))); return SUCCESS; } diff --git a/ext/phalcon/http/message/urifactory.zep.c b/ext/phalcon/http/message/urifactory.zep.c index a944ce204a3..edbe7078c94 100644 --- a/ext/phalcon/http/message/urifactory.zep.c +++ b/ext/phalcon/http/message/urifactory.zep.c @@ -39,7 +39,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Message_UriFactory) { ZEPHIR_REGISTER_CLASS(Phalcon\\Http\\Message, UriFactory, phalcon, http_message_urifactory, phalcon_http_message_urifactory_method_entry, ZEND_ACC_FINAL_CLASS); - zend_class_implements(phalcon_http_message_urifactory_ce, 1, zephir_get_internal_ce(SL("psr\\http\\message\\urifactoryinterface"))); + zend_class_implements(phalcon_http_message_urifactory_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\message\\urifactoryinterface"))); return SUCCESS; } diff --git a/ext/phalcon/http/message/urifactory.zep.h b/ext/phalcon/http/message/urifactory.zep.h index e9182f32b23..f693c931f70 100644 --- a/ext/phalcon/http/message/urifactory.zep.h +++ b/ext/phalcon/http/message/urifactory.zep.h @@ -5,7 +5,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Message_UriFactory); PHP_METHOD(Phalcon_Http_Message_UriFactory, createUri); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_urifactory_createuri, 0, 0, Psr\\Http\\Message\\UriInterface, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_urifactory_createuri, 0, 0, PsrExt\\Http\\Message\\UriInterface, 0) ZEND_ARG_TYPE_INFO(0, uri, IS_STRING, 0) ZEND_END_ARG_INFO() diff --git a/ext/phalcon/http/request/file.zep.c b/ext/phalcon/http/request/file.zep.c index f012ca91e57..fd3be290a11 100644 --- a/ext/phalcon/http/request/file.zep.c +++ b/ext/phalcon/http/request/file.zep.c @@ -240,7 +240,7 @@ PHP_METHOD(Phalcon_Http_Request_File, getRealType) ZVAL_LONG(&_0, 16); ZEPHIR_CALL_FUNCTION(&finfo, "finfo_open", NULL, 327, &_0); zephir_check_call_status(); - if (Z_TYPE_P(&finfo) != IS_RESOURCE) { + if (ZEPHIR_IS_FALSE_IDENTICAL(&finfo)) { RETURN_MM_STRING(""); } zephir_read_property(&_0, this_ptr, ZEND_STRL("tmp"), PH_NOISY_CC | PH_READONLY); diff --git a/ext/phalcon/http/server/abstractmiddleware.zep.c b/ext/phalcon/http/server/abstractmiddleware.zep.c index 858cfc6a72b..3bd71888d10 100644 --- a/ext/phalcon/http/server/abstractmiddleware.zep.c +++ b/ext/phalcon/http/server/abstractmiddleware.zep.c @@ -33,7 +33,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Server_AbstractMiddleware) { ZEPHIR_REGISTER_CLASS(Phalcon\\Http\\Server, AbstractMiddleware, phalcon, http_server_abstractmiddleware, phalcon_http_server_abstractmiddleware_method_entry, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); - zend_class_implements(phalcon_http_server_abstractmiddleware_ce, 1, zephir_get_internal_ce(SL("psr\\http\\server\\middlewareinterface"))); + zend_class_implements(phalcon_http_server_abstractmiddleware_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\server\\middlewareinterface"))); return SUCCESS; } diff --git a/ext/phalcon/http/server/abstractmiddleware.zep.h b/ext/phalcon/http/server/abstractmiddleware.zep.h index f6e7abee178..1e44fc87825 100644 --- a/ext/phalcon/http/server/abstractmiddleware.zep.h +++ b/ext/phalcon/http/server/abstractmiddleware.zep.h @@ -5,9 +5,9 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Server_AbstractMiddleware); PHP_METHOD(Phalcon_Http_Server_AbstractMiddleware, process); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_server_abstractmiddleware_process, 0, 2, Psr\\Http\\Message\\ResponseInterface, 0) - ZEND_ARG_OBJ_INFO(0, request, Psr\\Http\\Message\\ServerRequestInterface, 0) - ZEND_ARG_OBJ_INFO(0, handler, Psr\\Http\\Server\\RequestHandlerInterface, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_server_abstractmiddleware_process, 0, 2, PsrExt\\Http\\Message\\ResponseInterface, 0) + ZEND_ARG_OBJ_INFO(0, request, PsrExt\\Http\\Message\\ServerRequestInterface, 0) + ZEND_ARG_OBJ_INFO(0, handler, PsrExt\\Http\\Server\\RequestHandlerInterface, 0) ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_http_server_abstractmiddleware_method_entry) { diff --git a/ext/phalcon/http/server/abstractrequesthandler.zep.c b/ext/phalcon/http/server/abstractrequesthandler.zep.c index 9b73ffa1c0b..166f2d38a37 100644 --- a/ext/phalcon/http/server/abstractrequesthandler.zep.c +++ b/ext/phalcon/http/server/abstractrequesthandler.zep.c @@ -32,7 +32,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Server_AbstractRequestHandler) { ZEPHIR_REGISTER_CLASS(Phalcon\\Http\\Server, AbstractRequestHandler, phalcon, http_server_abstractrequesthandler, phalcon_http_server_abstractrequesthandler_method_entry, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); - zend_class_implements(phalcon_http_server_abstractrequesthandler_ce, 1, zephir_get_internal_ce(SL("psr\\http\\server\\requesthandlerinterface"))); + zend_class_implements(phalcon_http_server_abstractrequesthandler_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\server\\requesthandlerinterface"))); return SUCCESS; } diff --git a/ext/phalcon/http/server/abstractrequesthandler.zep.h b/ext/phalcon/http/server/abstractrequesthandler.zep.h index 6ffb062b983..03f9edefab2 100644 --- a/ext/phalcon/http/server/abstractrequesthandler.zep.h +++ b/ext/phalcon/http/server/abstractrequesthandler.zep.h @@ -5,8 +5,8 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Server_AbstractRequestHandler); PHP_METHOD(Phalcon_Http_Server_AbstractRequestHandler, handle); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_server_abstractrequesthandler_handle, 0, 1, Psr\\Http\\Message\\ResponseInterface, 0) - ZEND_ARG_OBJ_INFO(0, request, Psr\\Http\\Message\\ServerRequestInterface, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_server_abstractrequesthandler_handle, 0, 1, PsrExt\\Http\\Message\\ResponseInterface, 0) + ZEND_ARG_OBJ_INFO(0, request, PsrExt\\Http\\Message\\ServerRequestInterface, 0) ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_http_server_abstractrequesthandler_method_entry) { diff --git a/ext/phalcon/logger/logger.zep.c b/ext/phalcon/logger/logger.zep.c index dcf40794c3a..e2c594b2623 100644 --- a/ext/phalcon/logger/logger.zep.c +++ b/ext/phalcon/logger/logger.zep.c @@ -97,7 +97,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Logger) zephir_declare_class_constant_long(phalcon_logger_logger_ce, SL("WARNING"), 4); - zend_class_implements(phalcon_logger_logger_ce, 1, zephir_get_internal_ce(SL("psr\\log\\loggerinterface"))); + zend_class_implements(phalcon_logger_logger_ce, 1, zephir_get_internal_ce(SL("psrext\\log\\loggerinterface"))); return SUCCESS; } diff --git a/ext/phalcon/messages/messages.zep.c b/ext/phalcon/messages/messages.zep.c index c8fed37eed7..d9f7fc9c7be 100644 --- a/ext/phalcon/messages/messages.zep.c +++ b/ext/phalcon/messages/messages.zep.c @@ -429,7 +429,8 @@ PHP_METHOD(Phalcon_Messages_Messages, next) */ PHP_METHOD(Phalcon_Messages_Messages, offsetExists) { - zval *index, index_sub, _0; + zval index_sub, _0; + zval *index; zval *this_ptr = getThis(); ZVAL_UNDEF(&index_sub); @@ -461,7 +462,8 @@ PHP_METHOD(Phalcon_Messages_Messages, offsetExists) PHP_METHOD(Phalcon_Messages_Messages, offsetGet) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *index, index_sub, message, returnValue, _0; + zval index_sub, message, returnValue, _0; + zval *index; zval *this_ptr = getThis(); ZVAL_UNDEF(&index_sub); @@ -500,11 +502,14 @@ PHP_METHOD(Phalcon_Messages_Messages, offsetGet) */ PHP_METHOD(Phalcon_Messages_Messages, offsetSet) { - zval *index, index_sub, *message, message_sub; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval index_sub, message_sub, _0; + zval *index, *message; zval *this_ptr = getThis(); ZVAL_UNDEF(&index_sub); ZVAL_UNDEF(&message_sub); + ZVAL_UNDEF(&_0); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) @@ -514,14 +519,18 @@ PHP_METHOD(Phalcon_Messages_Messages, offsetSet) #endif - zephir_fetch_params_without_memory_grow(2, 0, &index, &message); + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 2, 0, &index, &message); - if (Z_TYPE_P(message) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_messages_exception_ce, "The message must be an object", "phalcon/Messages/Messages.zep", 241); + ZEPHIR_INIT_VAR(&_0); + zephir_gettype(&_0, message); + if (!ZEPHIR_IS_STRING(&_0, "object")) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_messages_exception_ce, "The message must be an object", "phalcon/Messages/Messages.zep", 241); return; } zephir_update_property_array(this_ptr, SL("messages"), index, message); + ZEPHIR_MM_RESTORE(); } /** @@ -535,7 +544,8 @@ PHP_METHOD(Phalcon_Messages_Messages, offsetUnset) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *index, index_sub, _0, _1$$3, _2$$3; + zval index_sub, _0, _1$$3, _2$$3; + zval *index; zval *this_ptr = getThis(); ZVAL_UNDEF(&index_sub); diff --git a/ext/phalcon/messages/messages.zep.h b/ext/phalcon/messages/messages.zep.h index c64b597390a..63991220055 100644 --- a/ext/phalcon/messages/messages.zep.h +++ b/ext/phalcon/messages/messages.zep.h @@ -58,7 +58,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_messages_offset ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_messages_messages_offsetget, 0, 0, 1) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_messages_offsetget, 0, 1, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_messages_offsetget, 0, 1, IS_NULL, 0) +#endif ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() diff --git a/ext/phalcon/mvc/micro.zep.c b/ext/phalcon/mvc/micro.zep.c index f03b10d3c25..a1feb0a575c 100644 --- a/ext/phalcon/mvc/micro.zep.c +++ b/ext/phalcon/mvc/micro.zep.c @@ -1754,28 +1754,31 @@ PHP_METHOD(Phalcon_Mvc_Micro, notFound) /** * Check if a service is registered in the internal services container using * the array syntax + * + * @param mixed offset */ PHP_METHOD(Phalcon_Mvc_Micro, offsetExists) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *alias, alias_sub; + zval offset_sub; + zval *offset; zval *this_ptr = getThis(); - ZVAL_UNDEF(&alias_sub); + ZVAL_UNDEF(&offset_sub); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(alias) + Z_PARAM_ZVAL(offset) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &alias); + zephir_fetch_params(1, 1, 0, &offset); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "hasservice", NULL, 0, alias); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "hasservice", NULL, 0, offset); zephir_check_call_status(); RETURN_MM(); } @@ -1789,28 +1792,31 @@ PHP_METHOD(Phalcon_Mvc_Micro, offsetExists) * $app["request"] * ); *``` + * + * @param mixed offset */ PHP_METHOD(Phalcon_Mvc_Micro, offsetGet) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *alias, alias_sub; + zval offset_sub; + zval *offset; zval *this_ptr = getThis(); - ZVAL_UNDEF(&alias_sub); + ZVAL_UNDEF(&offset_sub); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(alias) + Z_PARAM_ZVAL(offset) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &alias); + zephir_fetch_params(1, 1, 0, &offset); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getservice", NULL, 0, alias); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getservice", NULL, 0, offset); zephir_check_call_status(); RETURN_MM(); } @@ -1827,25 +1833,26 @@ PHP_METHOD(Phalcon_Mvc_Micro, offsetSet) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *alias, alias_sub, *definition, definition_sub; + zval offset_sub, value_sub; + zval *offset, *value; zval *this_ptr = getThis(); - ZVAL_UNDEF(&alias_sub); - ZVAL_UNDEF(&definition_sub); + ZVAL_UNDEF(&offset_sub); + ZVAL_UNDEF(&value_sub); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_ZVAL(alias) - Z_PARAM_ZVAL(definition) + Z_PARAM_ZVAL(offset) + Z_PARAM_ZVAL(value) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 2, 0, &alias, &definition); + zephir_fetch_params(1, 2, 0, &offset, &value); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "setservice", NULL, 0, alias, definition); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setservice", NULL, 0, offset, value); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -1858,34 +1865,36 @@ PHP_METHOD(Phalcon_Mvc_Micro, offsetUnset) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *alias, alias_sub, container, _0; + zval offset_sub, _0, _2, _1$$3; + zval *offset; zval *this_ptr = getThis(); - ZVAL_UNDEF(&alias_sub); - ZVAL_UNDEF(&container); + ZVAL_UNDEF(&offset_sub); ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_1$$3); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(alias) + Z_PARAM_ZVAL(offset) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &alias); + zephir_fetch_params(1, 1, 0, &offset); zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CPY_WRT(&container, &_0); - if (Z_TYPE_P(&container) != IS_OBJECT) { - ZEPHIR_INIT_NVAR(&container); - object_init_ex(&container, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 492); + if (Z_TYPE_P(&_0) == IS_NULL) { + ZEPHIR_INIT_VAR(&_1$$3); + object_init_ex(&_1$$3, phalcon_di_factorydefault_ce); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 492); zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container); + zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &_1$$3); } - ZEPHIR_CALL_METHOD(NULL, &container, "remove", NULL, 497, alias); + zephir_read_property(&_2, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(NULL, &_2, "remove", NULL, 0, offset); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -2297,7 +2306,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, setService) } else { ZVAL_BOOL(&_0, 0); } - ZEPHIR_RETURN_CALL_METHOD(&container, "set", NULL, 498, &serviceName, definition, &_0); + ZEPHIR_RETURN_CALL_METHOD(&container, "set", NULL, 497, &serviceName, definition, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/mvc/micro.zep.h b/ext/phalcon/mvc/micro.zep.h index 8502a09313c..1f07723c876 100644 --- a/ext/phalcon/mvc/micro.zep.h +++ b/ext/phalcon/mvc/micro.zep.h @@ -138,22 +138,26 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_micro_notfound, 0, 1, ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_offsetexists, 0, 1, _IS_BOOL, 0) - ZEND_ARG_INFO(0, alias) + ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_micro_offsetget, 0, 0, 1) - ZEND_ARG_INFO(0, alias) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_offsetget, 0, 1, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_offsetget, 0, 1, IS_NULL, 0) +#endif + ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_offsetset, 0, 2, IS_VOID, 0) - ZEND_ARG_INFO(0, alias) - ZEND_ARG_INFO(0, definition) + ZEND_ARG_INFO(0, offset) + ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_offsetunset, 0, 1, IS_VOID, 0) - ZEND_ARG_INFO(0, alias) + ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_micro_options, 0, 2, Phalcon\\Mvc\\Router\\RouteInterface, 0) diff --git a/ext/phalcon/mvc/model.zep.c b/ext/phalcon/mvc/model.zep.c index 1079d324eea..952b9e85314 100644 --- a/ext/phalcon/mvc/model.zep.c +++ b/ext/phalcon/mvc/model.zep.c @@ -288,7 +288,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __call) zephir_get_arrval(&arguments, arguments_param); - ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 499, &method, &arguments); + ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 498, &method, &arguments); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&records)) { RETURN_CCTOR(&records); @@ -354,7 +354,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __callStatic) zephir_get_arrval(&arguments, arguments_param); - ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 499, &method, &arguments); + ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 498, &method, &arguments); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&records)) { RETURN_CCTOR(&records); @@ -696,7 +696,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __set) } } - ZEPHIR_CALL_METHOD(&_14, this_ptr, "possiblesetter", NULL, 500, &property, value); + ZEPHIR_CALL_METHOD(&_14, this_ptr, "possiblesetter", NULL, 499, &property, value); zephir_check_call_status(); if (zephir_is_true(&_14)) { RETVAL_ZVAL(value, 1, 0); @@ -1015,7 +1015,7 @@ PHP_METHOD(Phalcon_Mvc_Model, assign) _7$$12 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_7$$12) { - ZEPHIR_CALL_SELF(&_8$$13, "caseinsensitivecolumnmap", &_9, 501, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_8$$13, "caseinsensitivecolumnmap", &_9, 500, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_8$$13); } @@ -1047,7 +1047,7 @@ PHP_METHOD(Phalcon_Mvc_Model, assign) } _13$$18 = zephir_is_true(&disableAssignSetters); if (!(_13$$18)) { - ZEPHIR_CALL_METHOD(&_14$$18, this_ptr, "possiblesetter", &_15, 500, &attributeField, &value); + ZEPHIR_CALL_METHOD(&_14$$18, this_ptr, "possiblesetter", &_15, 499, &attributeField, &value); zephir_check_call_status(); _13$$18 = !zephir_is_true(&_14$$18); } @@ -1072,7 +1072,7 @@ PHP_METHOD(Phalcon_Mvc_Model, assign) _16$$22 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_16$$22) { - ZEPHIR_CALL_SELF(&_17$$23, "caseinsensitivecolumnmap", &_9, 501, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_17$$23, "caseinsensitivecolumnmap", &_9, 500, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_17$$23); } @@ -1104,7 +1104,7 @@ PHP_METHOD(Phalcon_Mvc_Model, assign) } _20$$28 = zephir_is_true(&disableAssignSetters); if (!(_20$$28)) { - ZEPHIR_CALL_METHOD(&_21$$28, this_ptr, "possiblesetter", &_15, 500, &attributeField, &value); + ZEPHIR_CALL_METHOD(&_21$$28, this_ptr, "possiblesetter", &_15, 499, &attributeField, &value); zephir_check_call_status(); _20$$28 = !zephir_is_true(&_21$$28); } @@ -1718,7 +1718,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate) _4$$7 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_4$$7) { - ZEPHIR_CALL_SELF(&_5$$8, "caseinsensitivecolumnmap", &_6, 501, columnMap, &key); + ZEPHIR_CALL_SELF(&_5$$8, "caseinsensitivecolumnmap", &_6, 500, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_5$$8); } @@ -1770,7 +1770,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate) _10$$16 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_10$$16) { - ZEPHIR_CALL_SELF(&_11$$17, "caseinsensitivecolumnmap", &_6, 501, columnMap, &key); + ZEPHIR_CALL_SELF(&_11$$17, "caseinsensitivecolumnmap", &_6, 500, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_11$$17); } @@ -2022,7 +2022,7 @@ PHP_METHOD(Phalcon_Mvc_Model, create) ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "getwriteconnection", NULL, 502); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getwriteconnection", NULL, 501); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, this_ptr, "has", NULL, 0, &metaData, &_1); zephir_check_call_status(); @@ -2121,7 +2121,7 @@ PHP_METHOD(Phalcon_Mvc_Model, delete) ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 502); + ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 501); zephir_check_call_status(); ZEPHIR_INIT_ZVAL_NREF(_0); ZVAL_LONG(&_0, 3); @@ -2130,7 +2130,7 @@ PHP_METHOD(Phalcon_Mvc_Model, delete) array_init(&_1); zephir_update_property_zval(this_ptr, ZEND_STRL("errorMessages"), &_1); if (ZEPHIR_GLOBAL(orm).virtual_foreign_keys) { - ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "checkforeignkeysreverserestrict", NULL, 503); + ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "checkforeignkeysreverserestrict", NULL, 502); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&_2$$3)) { RETURN_MM_BOOL(0); @@ -2292,9 +2292,9 @@ PHP_METHOD(Phalcon_Mvc_Model, delete) RETURN_MM_BOOL(1); } } - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 504); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 503); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 505); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 504); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); @@ -2309,7 +2309,7 @@ PHP_METHOD(Phalcon_Mvc_Model, delete) ZEPHIR_CALL_METHOD(&success, &writeConnection, "delete", NULL, 0, &table, &_27, &values, &bindTypes); zephir_check_call_status(); if (ZEPHIR_GLOBAL(orm).virtual_foreign_keys) { - ZEPHIR_CALL_METHOD(&_28$$25, this_ptr, "checkforeignkeysreversecascade", NULL, 506); + ZEPHIR_CALL_METHOD(&_28$$25, this_ptr, "checkforeignkeysreversecascade", NULL, 505); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&_28$$25)) { RETURN_MM_BOOL(0); @@ -2349,7 +2349,7 @@ PHP_METHOD(Phalcon_Mvc_Model, dump) ZEPHIR_MM_GROW(); - ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 507, this_ptr); + ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 506, this_ptr); zephir_check_call_status(); RETURN_MM(); } @@ -2571,7 +2571,7 @@ PHP_METHOD(Phalcon_Mvc_Model, find) } else { ZEPHIR_CPY_WRT(¶ms, parameters); } - ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_0, 508, ¶ms); + ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_0, 507, ¶ms); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&resultset, &query, "execute", NULL, 0); zephir_check_call_status(); @@ -2722,7 +2722,7 @@ PHP_METHOD(Phalcon_Mvc_Model, findFirst) return; } ZVAL_LONG(&_3, 1); - ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_2, 508, ¶ms, &_3); + ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_2, 507, ¶ms, &_3); zephir_check_call_status(); ZVAL_BOOL(&_3, 1); ZEPHIR_CALL_METHOD(NULL, &query, "setuniquerow", NULL, 0, &_3); @@ -3615,7 +3615,7 @@ PHP_METHOD(Phalcon_Mvc_Model, hasChanged) RETURN_MM_BOOL(zephir_fast_in_array(fieldName, &changedFields)); } if (Z_TYPE_P(fieldName) == IS_ARRAY) { - ZEPHIR_CALL_FUNCTION(&intersect, "array_intersect", NULL, 509, fieldName, &changedFields); + ZEPHIR_CALL_FUNCTION(&intersect, "array_intersect", NULL, 508, fieldName, &changedFields); zephir_check_call_status(); if (allFields) { RETURN_MM_BOOL(ZEPHIR_IS_EQUAL(&intersect, fieldName)); @@ -3688,7 +3688,7 @@ PHP_METHOD(Phalcon_Mvc_Model, hasUpdated) RETURN_MM_BOOL(zephir_fast_in_array(fieldName, &updatedFields)); } if (Z_TYPE_P(fieldName) == IS_ARRAY) { - ZEPHIR_CALL_FUNCTION(&intersect, "array_intersect", NULL, 509, fieldName, &updatedFields); + ZEPHIR_CALL_FUNCTION(&intersect, "array_intersect", NULL, 508, fieldName, &updatedFields); zephir_check_call_status(); if (allFields) { RETURN_MM_BOOL(ZEPHIR_IS_EQUAL(&intersect, fieldName)); @@ -3903,12 +3903,12 @@ PHP_METHOD(Phalcon_Mvc_Model, query) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 510, container); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 509, container); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_3); zephir_get_called_class(&_3); - ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 511, &_3); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 510, &_3); zephir_check_call_status(); RETURN_CCTOR(&criteria); } @@ -4008,13 +4008,13 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh) } ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 0); + ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 511); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("modelsManager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_1); - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 504); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 503); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 505); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 504); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); @@ -4173,7 +4173,7 @@ PHP_METHOD(Phalcon_Mvc_Model, save) ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 502); + ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 501); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "prepareSave"); @@ -4189,9 +4189,9 @@ PHP_METHOD(Phalcon_Mvc_Model, save) RETURN_MM_BOOL(0); } } - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 504); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 503); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 505); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 504); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); @@ -4201,7 +4201,7 @@ PHP_METHOD(Phalcon_Mvc_Model, save) } else { ZEPHIR_CPY_WRT(&table, &source); } - ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 0); + ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 511); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&exists, this_ptr, "has", NULL, 0, &metaData, &readConnection); zephir_check_call_status(); @@ -4853,7 +4853,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) _4$$4 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_4$$4) { - ZEPHIR_CALL_SELF(&_5$$6, "caseinsensitivecolumnmap", &_6, 501, columnMap, &key); + ZEPHIR_CALL_SELF(&_5$$6, "caseinsensitivecolumnmap", &_6, 500, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_5$$6); } @@ -4912,7 +4912,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) _12$$12 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_12$$12) { - ZEPHIR_CALL_SELF(&_13$$14, "caseinsensitivecolumnmap", &_6, 501, columnMap, &key); + ZEPHIR_CALL_SELF(&_13$$14, "caseinsensitivecolumnmap", &_6, 500, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_13$$14); } @@ -5333,7 +5333,7 @@ PHP_METHOD(Phalcon_Mvc_Model, toArray) _3$$4 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_3$$4) { - ZEPHIR_CALL_SELF(&_4$$5, "caseinsensitivecolumnmap", &_5, 501, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_4$$5, "caseinsensitivecolumnmap", &_5, 500, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_4$$5); } @@ -5384,7 +5384,7 @@ PHP_METHOD(Phalcon_Mvc_Model, toArray) _9$$14 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_9$$14) { - ZEPHIR_CALL_SELF(&_10$$15, "caseinsensitivecolumnmap", &_5, 501, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_10$$15, "caseinsensitivecolumnmap", &_5, 500, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_10$$15); } @@ -5464,7 +5464,7 @@ PHP_METHOD(Phalcon_Mvc_Model, update) if (zephir_is_true(&_0)) { ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getreadconnection", NULL, 0); + ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getreadconnection", NULL, 511); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "has", NULL, 0, &metaData, &_2$$3); zephir_check_call_status(); @@ -6590,9 +6590,9 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert) ZEPHIR_CALL_METHOD(&sequenceName, this_ptr, "getsequencename", NULL, 0); zephir_check_call_status(); } else { - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 505); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 504); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 504); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 503); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&sequenceName); if (ZEPHIR_IS_EMPTY(&schema)) { @@ -7432,9 +7432,9 @@ PHP_METHOD(Phalcon_Mvc_Model, has) zephir_read_property(&_22$$27, this_ptr, ZEND_STRL("uniqueTypes"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&uniqueTypes, &_22$$27); } - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 504); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 503); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 505); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 504); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); @@ -10979,6 +10979,39 @@ PHP_METHOD(Phalcon_Mvc_Model, caseInsensitiveColumnMap) RETURN_MM(); } +PHP_METHOD(Phalcon_Mvc_Model, __serialize) +{ + zval *this_ptr = getThis(); + + + + array_init(return_value); + return; +} + +PHP_METHOD(Phalcon_Mvc_Model, __unserialize) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *data_param = NULL; + zval data; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&data); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_ARRAY(data) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &data_param); + zephir_get_arrval(&data, data_param); + + +} + zend_object *zephir_init_properties_Phalcon_Mvc_Model(zend_class_entry *class_type) { zval _0, _2, _4, _6, _8, _10, _1$$3, _3$$4, _5$$5, _7$$6, _9$$7, _11$$8; diff --git a/ext/phalcon/mvc/model.zep.h b/ext/phalcon/mvc/model.zep.h index 384daf12eb5..a6b41f10bf5 100644 --- a/ext/phalcon/mvc/model.zep.h +++ b/ext/phalcon/mvc/model.zep.h @@ -102,6 +102,8 @@ PHP_METHOD(Phalcon_Mvc_Model, useDynamicUpdate); PHP_METHOD(Phalcon_Mvc_Model, validate); PHP_METHOD(Phalcon_Mvc_Model, validationHasFailed); PHP_METHOD(Phalcon_Mvc_Model, caseInsensitiveColumnMap); +PHP_METHOD(Phalcon_Mvc_Model, __serialize); +PHP_METHOD(Phalcon_Mvc_Model, __unserialize); zend_object *zephir_init_properties_Phalcon_Mvc_Model(zend_class_entry *class_type); ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_gettransaction, 0, 0, IS_NULL, 1) @@ -310,9 +312,15 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_serialize, 0, 0, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_unserialize, 0, 0, 1) - ZEND_ARG_INFO(0, data) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_unserialize, 0, 1, IS_VOID, 0) + ZEND_ARG_TYPE_INFO(0, serialized, IS_STRING, 0) +ZEND_END_ARG_INFO() +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_unserialize, 0, 1, IS_VOID, 0) + ZEND_ARG_INFO(0, serialized) ZEND_END_ARG_INFO() +#endif ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_setconnectionservice, 0, 1, IS_VOID, 0) @@ -547,6 +555,14 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_caseinsensitiv ZEND_ARG_INFO(0, key) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model___serialize, 0, 0, IS_ARRAY, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model___unserialize, 0, 1, IS_VOID, 0) + + ZEND_ARG_ARRAY_INFO(0, data, 0) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_zephir_init_properties_phalcon_mvc_model, 0, 0, 0) ZEND_END_ARG_INFO() @@ -654,5 +670,7 @@ ZEPHIR_INIT_FUNCS(phalcon_mvc_model_method_entry) { PHP_ME(Phalcon_Mvc_Model, validate, arginfo_phalcon_mvc_model_validate, ZEND_ACC_PROTECTED) PHP_ME(Phalcon_Mvc_Model, validationHasFailed, arginfo_phalcon_mvc_model_validationhasfailed, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model, caseInsensitiveColumnMap, arginfo_phalcon_mvc_model_caseinsensitivecolumnmap, ZEND_ACC_PRIVATE|ZEND_ACC_STATIC) + PHP_ME(Phalcon_Mvc_Model, __serialize, arginfo_phalcon_mvc_model___serialize, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Model, __unserialize, arginfo_phalcon_mvc_model___unserialize, ZEND_ACC_PUBLIC) PHP_FE_END }; diff --git a/ext/phalcon/mvc/model/criteria.zep.c b/ext/phalcon/mvc/model/criteria.zep.c index 133f68fd9cc..2ac147a7ef9 100644 --- a/ext/phalcon/mvc/model/criteria.zep.c +++ b/ext/phalcon/mvc/model/criteria.zep.c @@ -783,7 +783,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, fromInput) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 510, container); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 509, container); zephir_check_call_status(); if (zephir_fast_count_int(&conditions)) { ZEPHIR_INIT_VAR(&_16$$16); @@ -795,7 +795,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, fromInput) ZEPHIR_CALL_METHOD(NULL, &criteria, "bind", NULL, 0, &bind); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 511, &modelName); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 510, &modelName); zephir_check_call_status(); RETURN_CCTOR(&criteria); } diff --git a/ext/phalcon/mvc/model/query.zep.c b/ext/phalcon/mvc/model/query.zep.c index f46958629d5..5542d790f8b 100644 --- a/ext/phalcon/mvc/model/query.zep.c +++ b/ext/phalcon/mvc/model/query.zep.c @@ -100,7 +100,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Model_Query) */ zend_declare_property_null(phalcon_mvc_model_query_ce, SL("bindTypes"), ZEND_ACC_PROTECTED); /** - * @var \Psr\SimpleCache\CacheInterface|null + * @var \PsrExt\SimpleCache\CacheInterface|null */ zend_declare_property_null(phalcon_mvc_model_query_ce, SL("cache"), ZEND_ACC_PROTECTED); /** @@ -438,7 +438,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, execute) zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&cache, &_1$$3, "getshared", NULL, 0, &cacheService); zephir_check_call_status(); - if (UNEXPECTED(!((zephir_is_instance_of(&cache, SL("Psr\\SimpleCache\\CacheInterface")))))) { + if (UNEXPECTED(!((zephir_is_instance_of(&cache, SL("PsrExt\\SimpleCache\\CacheInterface")))))) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cache service must be an object implementing Psr\\SimpleCache\\CacheInterface", "phalcon/Mvc/Model/Query.zep", 301); return; } diff --git a/ext/phalcon/mvc/model/resultset.zep.c b/ext/phalcon/mvc/model/resultset.zep.c index 1fa1c514719..06ba9bbc614 100644 --- a/ext/phalcon/mvc/model/resultset.zep.c +++ b/ext/phalcon/mvc/model/resultset.zep.c @@ -170,7 +170,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, __construct) ZEND_PARSE_PARAMETERS_START(1, 2) Z_PARAM_ZVAL(result) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(cache, zephir_get_internal_ce(SL("psr\\simplecache\\cacheinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(cache, zephir_get_internal_ce(SL("psrext\\simplecache\\cacheinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -679,7 +679,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, offsetGet) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *index, index_sub, _0; + zval index_sub, _0; + zval *index; zval *this_ptr = getThis(); ZVAL_UNDEF(&index_sub); @@ -713,7 +714,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, offsetGet) */ PHP_METHOD(Phalcon_Mvc_Model_Resultset, offsetExists) { - zval *index, index_sub, _0; + zval index_sub, _0; + zval *index; zval *this_ptr = getThis(); ZVAL_UNDEF(&index_sub); @@ -741,7 +743,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, offsetExists) */ PHP_METHOD(Phalcon_Mvc_Model_Resultset, offsetSet) { - zval *index, index_sub, *value, value_sub; + zval index_sub, value_sub; + zval *index, *value; zval *this_ptr = getThis(); ZVAL_UNDEF(&index_sub); @@ -767,7 +770,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, offsetSet) */ PHP_METHOD(Phalcon_Mvc_Model_Resultset, offsetUnset) { - zval *offset, offset_sub; + zval offset_sub; + zval *offset; zval *this_ptr = getThis(); ZVAL_UNDEF(&offset_sub); diff --git a/ext/phalcon/mvc/model/resultset.zep.h b/ext/phalcon/mvc/model/resultset.zep.h index a470ea84a3b..8778005f648 100644 --- a/ext/phalcon/mvc/model/resultset.zep.h +++ b/ext/phalcon/mvc/model/resultset.zep.h @@ -31,7 +31,7 @@ zend_object *zephir_init_properties_Phalcon_Mvc_Model_Resultset(zend_class_entry ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset___construct, 0, 0, 1) ZEND_ARG_INFO(0, result) - ZEND_ARG_OBJ_INFO(0, cache, Psr\\SimpleCache\\CacheInterface, 1) + ZEND_ARG_OBJ_INFO(0, cache, PsrExt\\SimpleCache\\CacheInterface, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_count, 0, 0, IS_LONG, 0) @@ -45,7 +45,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_filt ZEND_ARG_INFO(0, filter) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_model_resultset_getcache, 0, 0, Psr\\SimpleCache\\CacheInterface, 1) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_model_resultset_getcache, 0, 0, PsrExt\\SimpleCache\\CacheInterface, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset_getfirst, 0, 0, 0) @@ -75,7 +75,11 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_next, 0, 0, IS_VOID, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset_offsetget, 0, 0, 1) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_offsetget, 0, 1, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_offsetget, 0, 1, IS_NULL, 0) +#endif ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() diff --git a/ext/phalcon/mvc/model/resultset/complex.zep.c b/ext/phalcon/mvc/model/resultset/complex.zep.c index e3945721a8c..4add21b5061 100644 --- a/ext/phalcon/mvc/model/resultset/complex.zep.c +++ b/ext/phalcon/mvc/model/resultset/complex.zep.c @@ -31,8 +31,6 @@ * file that was distributed with this source code. */ /** - * Phalcon\Mvc\Model\Resultset\Complex - * * Complex resultsets may include complete objects and scalar values. * This class builds every complex row as it is required */ @@ -56,8 +54,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Model_Resultset_Complex) } /** - * Phalcon\Mvc\Model\Resultset\Complex constructor - * * @param array columnTypes * @param ResultInterface|null result * @param CacheInterface|null cache @@ -80,7 +76,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, __construct) Z_PARAM_ZVAL(columnTypes) Z_PARAM_OPTIONAL Z_PARAM_OBJECT_OF_CLASS_OR_NULL(result, phalcon_db_resultinterface_ce) - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(cache, zephir_get_internal_ce(SL("psr\\simplecache\\cacheinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(cache, zephir_get_internal_ce(SL("psrext\\simplecache\\cacheinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -210,7 +206,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) dirtyState = 0; zephir_read_property(&_1, this_ptr, ZEND_STRL("columnTypes"), PH_NOISY_CC | PH_READONLY); - zephir_is_iterable(&_1, 0, "phalcon/Mvc/Model/Resultset/Complex.zep", 267); + zephir_is_iterable(&_1, 0, "phalcon/Mvc/Model/Resultset/Complex.zep", 255); if (Z_TYPE_P(&_1) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_1), _4, _5, _2) { @@ -223,21 +219,21 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) ZEPHIR_INIT_NVAR(&column); ZVAL_COPY(&column, _2); if (UNEXPECTED(Z_TYPE_P(&column) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Column type is corrupt", "phalcon/Mvc/Model/Resultset/Complex.zep", 139); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Column type is corrupt", "phalcon/Mvc/Model/Resultset/Complex.zep", 135); return; } ZEPHIR_OBS_NVAR(&type); - zephir_array_fetch_string(&type, &column, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 142); + zephir_array_fetch_string(&type, &column, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 138); if (ZEPHIR_IS_STRING(&type, "object")) { ZEPHIR_OBS_NVAR(&source); - zephir_array_fetch_string(&source, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 148); + zephir_array_fetch_string(&source, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 144); ZEPHIR_OBS_NVAR(&attributes); - zephir_array_fetch_string(&attributes, &column, SL("attributes"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 149); + zephir_array_fetch_string(&attributes, &column, SL("attributes"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 145); ZEPHIR_OBS_NVAR(&columnMap); - zephir_array_fetch_string(&columnMap, &column, SL("columnMap"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 150); + zephir_array_fetch_string(&columnMap, &column, SL("columnMap"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 146); ZEPHIR_INIT_NVAR(&rowModel); array_init(&rowModel); - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Resultset/Complex.zep", 168); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Resultset/Complex.zep", 164); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _6$$11) { @@ -246,7 +242,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) ZEPHIR_OBS_NVAR(&columnValue); ZEPHIR_INIT_NVAR(&_8$$12); ZEPHIR_CONCAT_SVSV(&_8$$12, "_", &source, "_", &attribute); - zephir_array_fetch(&columnValue, &row, &_8$$12, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 161); + zephir_array_fetch(&columnValue, &row, &_8$$12, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 157); zephir_array_update_zval(&rowModel, &attribute, &columnValue, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -263,7 +259,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) ZEPHIR_OBS_NVAR(&columnValue); ZEPHIR_INIT_NVAR(&_9$$13); ZEPHIR_CONCAT_SVSV(&_9$$13, "_", &source, "_", &attribute); - zephir_array_fetch(&columnValue, &row, &_9$$13, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 161); + zephir_array_fetch(&columnValue, &row, &_9$$13, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 157); zephir_array_update_zval(&rowModel, &attribute, &columnValue, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0); zephir_check_call_status(); @@ -279,22 +275,22 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) } if (ZEPHIR_GLOBAL(orm).late_state_binding) { ZEPHIR_OBS_NVAR(&_10$$16); - zephir_array_fetch_string(&_10$$16, &column, SL("instance"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 178); + zephir_array_fetch_string(&_10$$16, &column, SL("instance"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 172); if (zephir_instance_of_ev(&_10$$16, phalcon_mvc_model_ce)) { - zephir_array_fetch_string(&_11$$17, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 179); + zephir_array_fetch_string(&_11$$17, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 173); ZEPHIR_INIT_NVAR(&modelName); zephir_get_class(&modelName, &_11$$17, 0); } else { ZEPHIR_INIT_NVAR(&modelName); ZVAL_STRING(&modelName, "Phalcon\\Mvc\\Model"); } - zephir_array_fetch_string(&_12$$16, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 185); + zephir_array_fetch_string(&_12$$16, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 179); ZVAL_LONG(&_13$$16, dirtyState); _14$$16 = zephir_fetch_class(&modelName); ZEPHIR_CALL_CE_STATIC(&value, _14$$16, "cloneresultmap", NULL, 0, &_12$$16, &rowModel, &columnMap, &_13$$16, &keepSnapshots); zephir_check_call_status(); } else { - zephir_array_fetch_string(&_16$$19, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 199); + zephir_array_fetch_string(&_16$$19, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 191); ZVAL_LONG(&_17$$19, dirtyState); ZEPHIR_CALL_CE_STATIC(&value, phalcon_mvc_model_ce, "cloneresultmap", &_15, 0, &_16$$19, &rowModel, &columnMap, &_17$$19, &keepSnapshots); zephir_check_call_status(); @@ -307,12 +303,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) } while(0); ZEPHIR_OBS_NVAR(&attribute); - zephir_array_fetch_string(&attribute, &column, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 223); + zephir_array_fetch_string(&attribute, &column, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 215); } else { ZEPHIR_OBS_NVAR(&sqlAlias); if (zephir_array_isset_string_fetch(&sqlAlias, &column, SL("sqlAlias"), 0)) { ZEPHIR_OBS_NVAR(&value); - zephir_array_fetch(&value, &row, &sqlAlias, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 231); + zephir_array_fetch(&value, &row, &sqlAlias, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 221); } else { ZEPHIR_OBS_NVAR(&value); zephir_array_isset_fetch(&value, &row, &alias, 0); @@ -354,21 +350,21 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) ZEPHIR_CALL_METHOD(&column, &_1, "current", NULL, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&column) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Column type is corrupt", "phalcon/Mvc/Model/Resultset/Complex.zep", 139); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Column type is corrupt", "phalcon/Mvc/Model/Resultset/Complex.zep", 135); return; } ZEPHIR_OBS_NVAR(&type); - zephir_array_fetch_string(&type, &column, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 142); + zephir_array_fetch_string(&type, &column, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 138); if (ZEPHIR_IS_STRING(&type, "object")) { ZEPHIR_OBS_NVAR(&source); - zephir_array_fetch_string(&source, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 148); + zephir_array_fetch_string(&source, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 144); ZEPHIR_OBS_NVAR(&attributes); - zephir_array_fetch_string(&attributes, &column, SL("attributes"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 149); + zephir_array_fetch_string(&attributes, &column, SL("attributes"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 145); ZEPHIR_OBS_NVAR(&columnMap); - zephir_array_fetch_string(&columnMap, &column, SL("columnMap"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 150); + zephir_array_fetch_string(&columnMap, &column, SL("columnMap"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 146); ZEPHIR_INIT_NVAR(&rowModel); array_init(&rowModel); - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Resultset/Complex.zep", 168); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Resultset/Complex.zep", 164); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _21$$31) { @@ -377,7 +373,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) ZEPHIR_OBS_NVAR(&columnValue); ZEPHIR_INIT_NVAR(&_23$$32); ZEPHIR_CONCAT_SVSV(&_23$$32, "_", &source, "_", &attribute); - zephir_array_fetch(&columnValue, &row, &_23$$32, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 161); + zephir_array_fetch(&columnValue, &row, &_23$$32, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 157); zephir_array_update_zval(&rowModel, &attribute, &columnValue, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -394,7 +390,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) ZEPHIR_OBS_NVAR(&columnValue); ZEPHIR_INIT_NVAR(&_24$$33); ZEPHIR_CONCAT_SVSV(&_24$$33, "_", &source, "_", &attribute); - zephir_array_fetch(&columnValue, &row, &_24$$33, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 161); + zephir_array_fetch(&columnValue, &row, &_24$$33, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 157); zephir_array_update_zval(&rowModel, &attribute, &columnValue, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0); zephir_check_call_status(); @@ -410,22 +406,22 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) } if (ZEPHIR_GLOBAL(orm).late_state_binding) { ZEPHIR_OBS_NVAR(&_25$$36); - zephir_array_fetch_string(&_25$$36, &column, SL("instance"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 178); + zephir_array_fetch_string(&_25$$36, &column, SL("instance"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 172); if (zephir_instance_of_ev(&_25$$36, phalcon_mvc_model_ce)) { - zephir_array_fetch_string(&_26$$37, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 179); + zephir_array_fetch_string(&_26$$37, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 173); ZEPHIR_INIT_NVAR(&modelName); zephir_get_class(&modelName, &_26$$37, 0); } else { ZEPHIR_INIT_NVAR(&modelName); ZVAL_STRING(&modelName, "Phalcon\\Mvc\\Model"); } - zephir_array_fetch_string(&_27$$36, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 185); + zephir_array_fetch_string(&_27$$36, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 179); ZVAL_LONG(&_28$$36, dirtyState); _29$$36 = zephir_fetch_class(&modelName); ZEPHIR_CALL_CE_STATIC(&value, _29$$36, "cloneresultmap", NULL, 0, &_27$$36, &rowModel, &columnMap, &_28$$36, &keepSnapshots); zephir_check_call_status(); } else { - zephir_array_fetch_string(&_30$$39, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 199); + zephir_array_fetch_string(&_30$$39, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 191); ZVAL_LONG(&_31$$39, dirtyState); ZEPHIR_CALL_CE_STATIC(&value, phalcon_mvc_model_ce, "cloneresultmap", &_15, 0, &_30$$39, &rowModel, &columnMap, &_31$$39, &keepSnapshots); zephir_check_call_status(); @@ -438,12 +434,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) } while(0); ZEPHIR_OBS_NVAR(&attribute); - zephir_array_fetch_string(&attribute, &column, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 223); + zephir_array_fetch_string(&attribute, &column, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 215); } else { ZEPHIR_OBS_NVAR(&sqlAlias); if (zephir_array_isset_string_fetch(&sqlAlias, &column, SL("sqlAlias"), 0)) { ZEPHIR_OBS_NVAR(&value); - zephir_array_fetch(&value, &row, &sqlAlias, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 231); + zephir_array_fetch(&value, &row, &sqlAlias, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 221); } else { ZEPHIR_OBS_NVAR(&value); zephir_array_isset_fetch(&value, &row, &alias, 0); @@ -513,7 +509,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, toArray) } ZEPHIR_CALL_METHOD(¤t, this_ptr, "current", &_2, 0); zephir_check_call_status(); - zephir_array_append(&records, ¤t, PH_SEPARATE, "phalcon/Mvc/Model/Resultset/Complex.zep", 287); + zephir_array_append(&records, ¤t, PH_SEPARATE, "phalcon/Mvc/Model/Resultset/Complex.zep", 275); ZEPHIR_CALL_METHOD(NULL, this_ptr, "next", &_3, 0); zephir_check_call_status(); } @@ -560,7 +556,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, serialize) ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_1, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Complex.zep", 316); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Complex.zep", 304); return; } ZEPHIR_INIT_VAR(&_3); @@ -643,7 +639,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, unserialize) ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_0, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Complex.zep", 361); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Complex.zep", 349); return; } ZEPHIR_INIT_VAR(&_2); @@ -665,21 +661,54 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, unserialize) zephir_check_call_status(); } if (UNEXPECTED(Z_TYPE_P(&resultset) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid serialization data", "phalcon/Mvc/Model/Resultset/Complex.zep", 374); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid serialization data", "phalcon/Mvc/Model/Resultset/Complex.zep", 362); return; } - zephir_array_fetch_string(&_5, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 377); + zephir_array_fetch_string(&_5, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 365); zephir_update_property_zval(this_ptr, ZEND_STRL("rows"), &_5); - zephir_array_fetch_string(&_6, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 378); + zephir_array_fetch_string(&_6, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 366); ZEPHIR_INIT_ZVAL_NREF(_7); ZVAL_LONG(&_7, zephir_fast_count_int(&_6)); zephir_update_property_zval(this_ptr, ZEND_STRL("count"), &_7); - zephir_array_fetch_string(&_8, &resultset, SL("cache"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 379); + zephir_array_fetch_string(&_8, &resultset, SL("cache"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 367); zephir_update_property_zval(this_ptr, ZEND_STRL("cache"), &_8); - zephir_array_fetch_string(&_9, &resultset, SL("columnTypes"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 380); + zephir_array_fetch_string(&_9, &resultset, SL("columnTypes"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 368); zephir_update_property_zval(this_ptr, ZEND_STRL("columnTypes"), &_9); - zephir_array_fetch_string(&_10, &resultset, SL("hydrateMode"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 381); + zephir_array_fetch_string(&_10, &resultset, SL("hydrateMode"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 369); zephir_update_property_zval(this_ptr, ZEND_STRL("hydrateMode"), &_10); ZEPHIR_MM_RESTORE(); } +PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, __serialize) +{ + zval *this_ptr = getThis(); + + + + array_init(return_value); + return; +} + +PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, __unserialize) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *data_param = NULL; + zval data; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&data); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_ARRAY(data) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &data_param); + zephir_get_arrval(&data, data_param); + + +} + diff --git a/ext/phalcon/mvc/model/resultset/complex.zep.h b/ext/phalcon/mvc/model/resultset/complex.zep.h index 1eaa8a13efb..c9d332a021d 100644 --- a/ext/phalcon/mvc/model/resultset/complex.zep.h +++ b/ext/phalcon/mvc/model/resultset/complex.zep.h @@ -8,14 +8,20 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current); PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, toArray); PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, serialize); PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, unserialize); +PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, __serialize); +PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, __unserialize); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex___construct, 0, 0, 1) ZEND_ARG_INFO(0, columnTypes) ZEND_ARG_OBJ_INFO(0, result, Phalcon\\Db\\ResultInterface, 1) - ZEND_ARG_OBJ_INFO(0, cache, Psr\\SimpleCache\\CacheInterface, 1) + ZEND_ARG_OBJ_INFO(0, cache, PsrExt\\SimpleCache\\CacheInterface, 1) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex_current, 0, 0, 0) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex_current, 0, 0, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex_current, 0, 0, IS_NULL, 0) +#endif ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex_toarray, 0, 0, IS_ARRAY, 0) @@ -29,15 +35,21 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_comp ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex___serialize, 0, 0, IS_ARRAY, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex___unserialize, 0, 1, IS_VOID, 0) + + ZEND_ARG_ARRAY_INFO(0, data, 0) +ZEND_END_ARG_INFO() + ZEPHIR_INIT_FUNCS(phalcon_mvc_model_resultset_complex_method_entry) { PHP_ME(Phalcon_Mvc_Model_Resultset_Complex, __construct, arginfo_phalcon_mvc_model_resultset_complex___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) -#if PHP_VERSION_ID >= 80000 PHP_ME(Phalcon_Mvc_Model_Resultset_Complex, current, arginfo_phalcon_mvc_model_resultset_complex_current, ZEND_ACC_FINAL|ZEND_ACC_PUBLIC) -#else - PHP_ME(Phalcon_Mvc_Model_Resultset_Complex, current, NULL, ZEND_ACC_FINAL|ZEND_ACC_PUBLIC) -#endif PHP_ME(Phalcon_Mvc_Model_Resultset_Complex, toArray, arginfo_phalcon_mvc_model_resultset_complex_toarray, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model_Resultset_Complex, serialize, arginfo_phalcon_mvc_model_resultset_complex_serialize, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model_Resultset_Complex, unserialize, arginfo_phalcon_mvc_model_resultset_complex_unserialize, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Model_Resultset_Complex, __serialize, arginfo_phalcon_mvc_model_resultset_complex___serialize, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Model_Resultset_Complex, __unserialize, arginfo_phalcon_mvc_model_resultset_complex___unserialize, ZEND_ACC_PUBLIC) PHP_FE_END }; diff --git a/ext/phalcon/mvc/model/resultset/simple.zep.c b/ext/phalcon/mvc/model/resultset/simple.zep.c index d816a38635e..79f2cba6343 100644 --- a/ext/phalcon/mvc/model/resultset/simple.zep.c +++ b/ext/phalcon/mvc/model/resultset/simple.zep.c @@ -30,8 +30,6 @@ * file that was distributed with this source code. */ /** - * Phalcon\Mvc\Model\Resultset\Simple - * * Simple resultsets only contains a complete objects * This class builds every complete object as it is required */ @@ -55,8 +53,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Model_Resultset_Simple) } /** - * Phalcon\Mvc\Model\Resultset\Simple constructor - * * @param array columnMap * @param ModelInterface|Row model * @param \Phalcon\Db\ResultInterface|false result @@ -86,7 +82,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, __construct) Z_PARAM_ZVAL(model) Z_PARAM_ZVAL(result) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(cache, zephir_get_internal_ce(SL("psr\\simplecache\\cacheinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(cache, zephir_get_internal_ce(SL("psrext\\simplecache\\cacheinterface"))) Z_PARAM_BOOL(keepSnapshots) ZEND_PARSE_PARAMETERS_END(); #endif @@ -303,7 +299,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) ZEPHIR_INIT_VAR(&renamedRecords); array_init(&renamedRecords); if (Z_TYPE_P(&records) == IS_ARRAY) { - zephir_is_iterable(&records, 0, "phalcon/Mvc/Model/Resultset/Simple.zep", 241); + zephir_is_iterable(&records, 0, "phalcon/Mvc/Model/Resultset/Simple.zep", 237); if (Z_TYPE_P(&records) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&records), _4$$7) { @@ -311,7 +307,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) ZVAL_COPY(&record, _4$$7); ZEPHIR_INIT_NVAR(&renamed); array_init(&renamed); - zephir_is_iterable(&record, 0, "phalcon/Mvc/Model/Resultset/Simple.zep", 239); + zephir_is_iterable(&record, 0, "phalcon/Mvc/Model/Resultset/Simple.zep", 235); if (Z_TYPE_P(&record) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&record), _8$$8, _9$$8, _6$$8) { @@ -331,7 +327,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) ZEPHIR_CONCAT_SVS(&_11$$10, "Column '", &key, "' is not part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_10$$10, "__construct", &_12, 31, &_11$$10); zephir_check_call_status(); - zephir_throw_exception_debug(&_10$$10, "phalcon/Mvc/Model/Resultset/Simple.zep", 222); + zephir_throw_exception_debug(&_10$$10, "phalcon/Mvc/Model/Resultset/Simple.zep", 218); ZEPHIR_MM_RESTORE(); return; } @@ -344,7 +340,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) ZEPHIR_CONCAT_SVS(&_14$$12, "Column '", &key, "' is not part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_13$$12, "__construct", &_12, 31, &_14$$12); zephir_check_call_status(); - zephir_throw_exception_debug(&_13$$12, "phalcon/Mvc/Model/Resultset/Simple.zep", 229); + zephir_throw_exception_debug(&_13$$12, "phalcon/Mvc/Model/Resultset/Simple.zep", 225); ZEPHIR_MM_RESTORE(); return; } @@ -372,7 +368,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) ZEPHIR_CONCAT_SVS(&_16$$14, "Column '", &key, "' is not part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_15$$14, "__construct", &_12, 31, &_16$$14); zephir_check_call_status(); - zephir_throw_exception_debug(&_15$$14, "phalcon/Mvc/Model/Resultset/Simple.zep", 222); + zephir_throw_exception_debug(&_15$$14, "phalcon/Mvc/Model/Resultset/Simple.zep", 218); ZEPHIR_MM_RESTORE(); return; } @@ -385,7 +381,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) ZEPHIR_CONCAT_SVS(&_18$$16, "Column '", &key, "' is not part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_17$$16, "__construct", &_12, 31, &_18$$16); zephir_check_call_status(); - zephir_throw_exception_debug(&_17$$16, "phalcon/Mvc/Model/Resultset/Simple.zep", 229); + zephir_throw_exception_debug(&_17$$16, "phalcon/Mvc/Model/Resultset/Simple.zep", 225); ZEPHIR_MM_RESTORE(); return; } @@ -397,7 +393,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) } ZEPHIR_INIT_NVAR(&value); ZEPHIR_INIT_NVAR(&key); - zephir_array_append(&renamedRecords, &renamed, PH_SEPARATE, "phalcon/Mvc/Model/Resultset/Simple.zep", 239); + zephir_array_append(&renamedRecords, &renamed, PH_SEPARATE, "phalcon/Mvc/Model/Resultset/Simple.zep", 235); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &records, "rewind", NULL, 0); @@ -412,7 +408,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&renamed); array_init(&renamed); - zephir_is_iterable(&record, 0, "phalcon/Mvc/Model/Resultset/Simple.zep", 239); + zephir_is_iterable(&record, 0, "phalcon/Mvc/Model/Resultset/Simple.zep", 235); if (Z_TYPE_P(&record) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&record), _21$$17, _22$$17, _19$$17) { @@ -432,7 +428,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) ZEPHIR_CONCAT_SVS(&_24$$19, "Column '", &key, "' is not part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_23$$19, "__construct", &_12, 31, &_24$$19); zephir_check_call_status(); - zephir_throw_exception_debug(&_23$$19, "phalcon/Mvc/Model/Resultset/Simple.zep", 222); + zephir_throw_exception_debug(&_23$$19, "phalcon/Mvc/Model/Resultset/Simple.zep", 218); ZEPHIR_MM_RESTORE(); return; } @@ -445,7 +441,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) ZEPHIR_CONCAT_SVS(&_26$$21, "Column '", &key, "' is not part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_25$$21, "__construct", &_12, 31, &_26$$21); zephir_check_call_status(); - zephir_throw_exception_debug(&_25$$21, "phalcon/Mvc/Model/Resultset/Simple.zep", 229); + zephir_throw_exception_debug(&_25$$21, "phalcon/Mvc/Model/Resultset/Simple.zep", 225); ZEPHIR_MM_RESTORE(); return; } @@ -473,7 +469,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) ZEPHIR_CONCAT_SVS(&_28$$23, "Column '", &key, "' is not part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_27$$23, "__construct", &_12, 31, &_28$$23); zephir_check_call_status(); - zephir_throw_exception_debug(&_27$$23, "phalcon/Mvc/Model/Resultset/Simple.zep", 222); + zephir_throw_exception_debug(&_27$$23, "phalcon/Mvc/Model/Resultset/Simple.zep", 218); ZEPHIR_MM_RESTORE(); return; } @@ -486,7 +482,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) ZEPHIR_CONCAT_SVS(&_30$$25, "Column '", &key, "' is not part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_29$$25, "__construct", &_12, 31, &_30$$25); zephir_check_call_status(); - zephir_throw_exception_debug(&_29$$25, "phalcon/Mvc/Model/Resultset/Simple.zep", 229); + zephir_throw_exception_debug(&_29$$25, "phalcon/Mvc/Model/Resultset/Simple.zep", 225); ZEPHIR_MM_RESTORE(); return; } @@ -498,7 +494,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) } ZEPHIR_INIT_NVAR(&value); ZEPHIR_INIT_NVAR(&key); - zephir_array_append(&renamedRecords, &renamed, PH_SEPARATE, "phalcon/Mvc/Model/Resultset/Simple.zep", 239); + zephir_array_append(&renamedRecords, &renamed, PH_SEPARATE, "phalcon/Mvc/Model/Resultset/Simple.zep", 235); ZEPHIR_CALL_METHOD(NULL, &records, "next", NULL, 0); zephir_check_call_status(); } @@ -538,7 +534,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, serialize) ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_0, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Simple.zep", 262); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Simple.zep", 258); return; } ZEPHIR_INIT_VAR(&data); @@ -626,7 +622,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, unserialize) ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_0, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Simple.zep", 300); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Simple.zep", 296); return; } ZEPHIR_INIT_VAR(&_2); @@ -648,22 +644,22 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, unserialize) zephir_check_call_status(); } if (UNEXPECTED(Z_TYPE_P(&resultset) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid serialization data", "phalcon/Mvc/Model/Resultset/Simple.zep", 313); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid serialization data", "phalcon/Mvc/Model/Resultset/Simple.zep", 309); return; } - zephir_array_fetch_string(&_5, &resultset, SL("model"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 316); + zephir_array_fetch_string(&_5, &resultset, SL("model"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 312); zephir_update_property_zval(this_ptr, ZEND_STRL("model"), &_5); - zephir_array_fetch_string(&_6, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 317); + zephir_array_fetch_string(&_6, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 313); zephir_update_property_zval(this_ptr, ZEND_STRL("rows"), &_6); - zephir_array_fetch_string(&_7, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 318); + zephir_array_fetch_string(&_7, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 314); ZEPHIR_INIT_ZVAL_NREF(_8); ZVAL_LONG(&_8, zephir_fast_count_int(&_7)); zephir_update_property_zval(this_ptr, ZEND_STRL("count"), &_8); - zephir_array_fetch_string(&_9, &resultset, SL("cache"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 319); + zephir_array_fetch_string(&_9, &resultset, SL("cache"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 315); zephir_update_property_zval(this_ptr, ZEND_STRL("cache"), &_9); - zephir_array_fetch_string(&_10, &resultset, SL("columnMap"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 320); + zephir_array_fetch_string(&_10, &resultset, SL("columnMap"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 316); zephir_update_property_zval(this_ptr, ZEND_STRL("columnMap"), &_10); - zephir_array_fetch_string(&_11, &resultset, SL("hydrateMode"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 321); + zephir_array_fetch_string(&_11, &resultset, SL("hydrateMode"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 317); zephir_update_property_zval(this_ptr, ZEND_STRL("hydrateMode"), &_11); if (zephir_array_isset_string_fetch(&keepSnapshots, &resultset, SL("keepSnapshots"), 1)) { zephir_update_property_zval(this_ptr, ZEND_STRL("keepSnapshots"), &keepSnapshots); @@ -671,3 +667,36 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, unserialize) ZEPHIR_MM_RESTORE(); } +PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, __serialize) +{ + zval *this_ptr = getThis(); + + + + array_init(return_value); + return; +} + +PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, __unserialize) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *data_param = NULL; + zval data; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&data); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_ARRAY(data) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &data_param); + zephir_get_arrval(&data, data_param); + + +} + diff --git a/ext/phalcon/mvc/model/resultset/simple.zep.h b/ext/phalcon/mvc/model/resultset/simple.zep.h index 023b2e294ce..6399ed88b07 100644 --- a/ext/phalcon/mvc/model/resultset/simple.zep.h +++ b/ext/phalcon/mvc/model/resultset/simple.zep.h @@ -8,12 +8,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, current); PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray); PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, serialize); PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, unserialize); +PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, __serialize); +PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, __unserialize); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset_simple___construct, 0, 0, 3) ZEND_ARG_INFO(0, columnMap) ZEND_ARG_INFO(0, model) ZEND_ARG_INFO(0, result) - ZEND_ARG_OBJ_INFO(0, cache, Psr\\SimpleCache\\CacheInterface, 1) + ZEND_ARG_OBJ_INFO(0, cache, PsrExt\\SimpleCache\\CacheInterface, 1) ZEND_ARG_TYPE_INFO(0, keepSnapshots, _IS_BOOL, 0) ZEND_END_ARG_INFO() @@ -32,11 +34,21 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_simp ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_simple___serialize, 0, 0, IS_ARRAY, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_simple___unserialize, 0, 1, IS_VOID, 0) + + ZEND_ARG_ARRAY_INFO(0, data, 0) +ZEND_END_ARG_INFO() + ZEPHIR_INIT_FUNCS(phalcon_mvc_model_resultset_simple_method_entry) { PHP_ME(Phalcon_Mvc_Model_Resultset_Simple, __construct, arginfo_phalcon_mvc_model_resultset_simple___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) PHP_ME(Phalcon_Mvc_Model_Resultset_Simple, current, arginfo_phalcon_mvc_model_resultset_simple_current, ZEND_ACC_FINAL|ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model_Resultset_Simple, toArray, arginfo_phalcon_mvc_model_resultset_simple_toarray, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model_Resultset_Simple, serialize, arginfo_phalcon_mvc_model_resultset_simple_serialize, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model_Resultset_Simple, unserialize, arginfo_phalcon_mvc_model_resultset_simple_unserialize, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Model_Resultset_Simple, __serialize, arginfo_phalcon_mvc_model_resultset_simple___serialize, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Model_Resultset_Simple, __unserialize, arginfo_phalcon_mvc_model_resultset_simple___unserialize, ZEND_ACC_PUBLIC) PHP_FE_END }; diff --git a/ext/phalcon/mvc/model/resultsetinterface.zep.h b/ext/phalcon/mvc/model/resultsetinterface.zep.h index 399cb4117d2..023f73bf6d5 100644 --- a/ext/phalcon/mvc/model/resultsetinterface.zep.h +++ b/ext/phalcon/mvc/model/resultsetinterface.zep.h @@ -11,7 +11,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultsetinter ZEND_ARG_INFO(0, filter) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_model_resultsetinterface_getcache, 0, 0, Psr\\SimpleCache\\CacheInterface, 1) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_model_resultsetinterface_getcache, 0, 0, PsrExt\\SimpleCache\\CacheInterface, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultsetinterface_getfirst, 0, 0, 0) diff --git a/ext/phalcon/mvc/model/row.zep.c b/ext/phalcon/mvc/model/row.zep.c index bb8d9fc2de7..87cb8e6f620 100644 --- a/ext/phalcon/mvc/model/row.zep.c +++ b/ext/phalcon/mvc/model/row.zep.c @@ -16,10 +16,10 @@ #include "kernel/fcall.h" #include "kernel/object.h" #include "kernel/memory.h" -#include "kernel/array.h" +#include "kernel/operators.h" #include "kernel/exception.h" +#include "kernel/array.h" #include "ext/spl/spl_exceptions.h" -#include "kernel/operators.h" /** @@ -31,8 +31,6 @@ * file that was distributed with this source code. */ /** - * Phalcon\Mvc\Model\Row - * * This component allows Phalcon\Mvc\Model to return rows without an associated entity. * This objects implements the ArrayAccess interface to allow access the object as object->x or array[x]. */ @@ -75,11 +73,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Row, jsonSerialize) PHP_METHOD(Phalcon_Mvc_Model_Row, offsetGet) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *index, index_sub, value; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval index_sub, _0, _1; + zval *index; zval *this_ptr = getThis(); ZVAL_UNDEF(&index_sub); - ZVAL_UNDEF(&value); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -92,12 +93,15 @@ PHP_METHOD(Phalcon_Mvc_Model_Row, offsetGet) zephir_fetch_params(1, 1, 0, &index); - ZEPHIR_OBS_VAR(&value); - if (UNEXPECTED(!(zephir_fetch_property_zval(&value, this_ptr, index, PH_SILENT_CC)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The index does not exist in the row", "phalcon/Mvc/Model/Row.zep", 46); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "offsetexists", NULL, 0, index); + zephir_check_call_status(); + if (!(zephir_is_true(&_0))) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The index does not exist in the row", "phalcon/Mvc/Model/Row.zep", 42); return; } - RETURN_CCTOR(&value); + ZEPHIR_OBS_VAR(&_1); + zephir_read_property_zval(&_1, this_ptr, index, PH_NOISY_CC); + RETURN_CCTOR(&_1); } /** @@ -107,7 +111,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Row, offsetGet) */ PHP_METHOD(Phalcon_Mvc_Model_Row, offsetExists) { - zval *index, index_sub; + zval index_sub; + zval *index; zval *this_ptr = getThis(); ZVAL_UNDEF(&index_sub); @@ -133,7 +138,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Row, offsetExists) */ PHP_METHOD(Phalcon_Mvc_Model_Row, offsetSet) { - zval *index, index_sub, *value, value_sub; + zval index_sub, value_sub; + zval *index, *value; zval *this_ptr = getThis(); ZVAL_UNDEF(&index_sub); @@ -150,7 +156,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Row, offsetSet) zephir_fetch_params_without_memory_grow(2, 0, &index, &value); - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Row is an immutable ArrayAccess object", "phalcon/Mvc/Model/Row.zep", 70); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Row is an immutable ArrayAccess object", "phalcon/Mvc/Model/Row.zep", 66); return; } @@ -161,7 +167,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Row, offsetSet) */ PHP_METHOD(Phalcon_Mvc_Model_Row, offsetUnset) { - zval *offset, offset_sub; + zval offset_sub; + zval *offset; zval *this_ptr = getThis(); ZVAL_UNDEF(&offset_sub); @@ -176,7 +183,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Row, offsetUnset) zephir_fetch_params_without_memory_grow(1, 0, &offset); - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Row is an immutable ArrayAccess object", "phalcon/Mvc/Model/Row.zep", 80); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Row is an immutable ArrayAccess object", "phalcon/Mvc/Model/Row.zep", 76); return; } @@ -263,7 +270,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Row, toArray) ZEPHIR_MM_GROW(); - ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 507, this_ptr); + ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 506, this_ptr); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/mvc/model/row.zep.h b/ext/phalcon/mvc/model/row.zep.h index 7f5528140a3..226a0668038 100644 --- a/ext/phalcon/mvc/model/row.zep.h +++ b/ext/phalcon/mvc/model/row.zep.h @@ -16,7 +16,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Row, writeAttribute); ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_row_jsonserialize, 0, 0, IS_ARRAY, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_row_offsetget, 0, 0, 1) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_row_offsetget, 0, 1, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_row_offsetget, 0, 1, IS_NULL, 0) +#endif ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() diff --git a/ext/phalcon/session/adapter/abstractadapter.zep.c b/ext/phalcon/session/adapter/abstractadapter.zep.c index b7faf30e793..adb81b13f79 100644 --- a/ext/phalcon/session/adapter/abstractadapter.zep.c +++ b/ext/phalcon/session/adapter/abstractadapter.zep.c @@ -99,22 +99,26 @@ PHP_METHOD(Phalcon_Session_Adapter_AbstractAdapter, destroy) /** * Garbage Collector + * + * @param int $maxlifetime + * @return false|int */ PHP_METHOD(Phalcon_Session_Adapter_AbstractAdapter, gc) { - zval *maxlifetime, maxlifetime_sub; + zval *maxlifetime_param = NULL; + zend_long maxlifetime; zval *this_ptr = getThis(); - ZVAL_UNDEF(&maxlifetime_sub); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(maxlifetime) + Z_PARAM_LONG(maxlifetime) ZEND_PARSE_PARAMETERS_END(); #endif - zephir_fetch_params_without_memory_grow(1, 0, &maxlifetime); + zephir_fetch_params_without_memory_grow(1, 0, &maxlifetime_param); + maxlifetime = zephir_get_intval(maxlifetime_param); RETURN_BOOL(1); diff --git a/ext/phalcon/session/adapter/abstractadapter.zep.h b/ext/phalcon/session/adapter/abstractadapter.zep.h index d2ab59a8270..45be8c40575 100644 --- a/ext/phalcon/session/adapter/abstractadapter.zep.h +++ b/ext/phalcon/session/adapter/abstractadapter.zep.h @@ -18,9 +18,19 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_session_adapter_abstract ZEND_ARG_INFO(0, sessionId) ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 80100 +ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_phalcon_session_adapter_abstractadapter_gc, 0, 1, MAY_BE_LONG|MAY_BE_FALSE) + ZEND_ARG_TYPE_INFO(0, maxlifetime, IS_LONG, 0) +ZEND_END_ARG_INFO() +#elif PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_session_adapter_abstractadapter_gc, 0, 0, 1) + ZEND_ARG_TYPE_INFO(0, maxlifetime, IS_LONG, 0) +ZEND_END_ARG_INFO() +#else ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_session_adapter_abstractadapter_gc, 0, 0, 1) - ZEND_ARG_INFO(0, maxlifetime) + ZEND_ARG_INFO(0, maxlifetime) ZEND_END_ARG_INFO() +#endif ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_session_adapter_abstractadapter_read, 0, 1, IS_STRING, 0) ZEND_ARG_INFO(0, sessionId) diff --git a/ext/phalcon/session/adapter/noop.zep.c b/ext/phalcon/session/adapter/noop.zep.c index 8446c8009fb..d3caec7c274 100644 --- a/ext/phalcon/session/adapter/noop.zep.c +++ b/ext/phalcon/session/adapter/noop.zep.c @@ -162,22 +162,26 @@ PHP_METHOD(Phalcon_Session_Adapter_Noop, destroy) /** * Garbage Collector + * + * @param int $maxlifetime + * @return false|int */ PHP_METHOD(Phalcon_Session_Adapter_Noop, gc) { - zval *maxlifetime, maxlifetime_sub; + zval *maxlifetime_param = NULL; + zend_long maxlifetime; zval *this_ptr = getThis(); - ZVAL_UNDEF(&maxlifetime_sub); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(maxlifetime) + Z_PARAM_LONG(maxlifetime) ZEND_PARSE_PARAMETERS_END(); #endif - zephir_fetch_params_without_memory_grow(1, 0, &maxlifetime); + zephir_fetch_params_without_memory_grow(1, 0, &maxlifetime_param); + maxlifetime = zephir_get_intval(maxlifetime_param); RETURN_BOOL(1); diff --git a/ext/phalcon/session/adapter/noop.zep.h b/ext/phalcon/session/adapter/noop.zep.h index 99a7eb8d6b0..6b9adde87c8 100644 --- a/ext/phalcon/session/adapter/noop.zep.h +++ b/ext/phalcon/session/adapter/noop.zep.h @@ -28,9 +28,19 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_session_adapter_noop_des ZEND_ARG_INFO(0, sessionId) ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 80100 +ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_phalcon_session_adapter_noop_gc, 0, 1, MAY_BE_LONG|MAY_BE_FALSE) + ZEND_ARG_TYPE_INFO(0, maxlifetime, IS_LONG, 0) +ZEND_END_ARG_INFO() +#elif PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_session_adapter_noop_gc, 0, 0, 1) - ZEND_ARG_INFO(0, maxlifetime) + ZEND_ARG_TYPE_INFO(0, maxlifetime, IS_LONG, 0) ZEND_END_ARG_INFO() +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_session_adapter_noop_gc, 0, 0, 1) + ZEND_ARG_INFO(0, maxlifetime) +ZEND_END_ARG_INFO() +#endif ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_session_adapter_noop_read, 0, 1, IS_STRING, 0) ZEND_ARG_INFO(0, sessionId) diff --git a/ext/phalcon/session/adapter/stream.zep.c b/ext/phalcon/session/adapter/stream.zep.c index 45828885940..fc0929ad7d8 100644 --- a/ext/phalcon/session/adapter/stream.zep.c +++ b/ext/phalcon/session/adapter/stream.zep.c @@ -190,17 +190,19 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, destroy) /** * Garbage Collector + * + * @param int $maxlifetime + * @return false|int */ PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) { zend_bool _6$$3, _9$$3, _12$$5, _14$$5; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zephir_fcall_cache_entry *_8 = NULL, *_11 = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *maxlifetime, maxlifetime_sub, file, pattern, time, _0, _1, _2, _3, *_4, _5, _7$$3, _10$$3, _13$$5, _15$$5; + zval *maxlifetime_param = NULL, file, pattern, time, _0, _1, _2, _3, *_4, _5, _7$$3, _10$$3, _13$$5, _15$$5; + zend_long maxlifetime, ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); - ZVAL_UNDEF(&maxlifetime_sub); ZVAL_UNDEF(&file); ZVAL_UNDEF(&pattern); ZVAL_UNDEF(&time); @@ -216,13 +218,14 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(maxlifetime) + Z_PARAM_LONG(maxlifetime) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &maxlifetime); + zephir_fetch_params(1, 1, 0, &maxlifetime_param); + maxlifetime = zephir_get_intval(maxlifetime_param); zephir_read_property(&_0, this_ptr, ZEND_STRL("path"), PH_NOISY_CC | PH_READONLY); @@ -232,10 +235,10 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) ZEPHIR_INIT_VAR(&_2); zephir_time(&_2); ZEPHIR_INIT_VAR(&time); - zephir_sub_function(&time, &_2, maxlifetime); + ZVAL_LONG(&time, (zephir_get_numberval(&_2) - maxlifetime)); ZEPHIR_CALL_FUNCTION(&_3, "glob", NULL, 0, &pattern); zephir_check_call_status(); - zephir_is_iterable(&_3, 0, "phalcon/Session/Adapter/Stream.zep", 108); + zephir_is_iterable(&_3, 0, "phalcon/Session/Adapter/Stream.zep", 111); if (Z_TYPE_P(&_3) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_3), _4) { @@ -752,3 +755,4 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, phpIsWritable) zephir_check_call_status(); RETURN_MM(); } + diff --git a/ext/phalcon/session/adapter/stream.zep.h b/ext/phalcon/session/adapter/stream.zep.h index d70591dcf52..134fca2c9b0 100644 --- a/ext/phalcon/session/adapter/stream.zep.h +++ b/ext/phalcon/session/adapter/stream.zep.h @@ -30,9 +30,19 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_session_adapter_stream_d ZEND_ARG_INFO(0, sessionId) ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 80100 +ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_phalcon_session_adapter_stream_gc, 0, 1, MAY_BE_LONG|MAY_BE_FALSE) + ZEND_ARG_TYPE_INFO(0, maxlifetime, IS_LONG, 0) +ZEND_END_ARG_INFO() +#elif PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_session_adapter_stream_gc, 0, 0, 1) - ZEND_ARG_INFO(0, maxlifetime) + ZEND_ARG_TYPE_INFO(0, maxlifetime, IS_LONG, 0) ZEND_END_ARG_INFO() +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_session_adapter_stream_gc, 0, 0, 1) + ZEND_ARG_INFO(0, maxlifetime) +ZEND_END_ARG_INFO() +#endif ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_session_adapter_stream_open, 0, 2, _IS_BOOL, 0) ZEND_ARG_INFO(0, savePath) diff --git a/ext/phalcon/storage/adapter/apcu.zep.c b/ext/phalcon/storage/adapter/apcu.zep.c index 15b823d2533..08a88bbe319 100644 --- a/ext/phalcon/storage/adapter/apcu.zep.c +++ b/ext/phalcon/storage/adapter/apcu.zep.c @@ -863,3 +863,4 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuStore) zephir_check_call_status(); RETURN_MM(); } + diff --git a/ext/phalcon/storage/serializer/abstractserializer.zep.c b/ext/phalcon/storage/serializer/abstractserializer.zep.c index 287892ec8f4..9fa7c63a26f 100644 --- a/ext/phalcon/storage/serializer/abstractserializer.zep.c +++ b/ext/phalcon/storage/serializer/abstractserializer.zep.c @@ -168,3 +168,36 @@ PHP_METHOD(Phalcon_Storage_Serializer_AbstractSerializer, isSerializable) RETURN_BOOL(!(_1)); } +PHP_METHOD(Phalcon_Storage_Serializer_AbstractSerializer, __serialize) +{ + zval *this_ptr = getThis(); + + + + array_init(return_value); + return; +} + +PHP_METHOD(Phalcon_Storage_Serializer_AbstractSerializer, __unserialize) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *data_param = NULL; + zval data; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&data); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_ARRAY(data) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &data_param); + zephir_get_arrval(&data, data_param); + + +} + diff --git a/ext/phalcon/storage/serializer/abstractserializer.zep.h b/ext/phalcon/storage/serializer/abstractserializer.zep.h index c5921805589..85fc59b50bb 100644 --- a/ext/phalcon/storage/serializer/abstractserializer.zep.h +++ b/ext/phalcon/storage/serializer/abstractserializer.zep.h @@ -8,6 +8,8 @@ PHP_METHOD(Phalcon_Storage_Serializer_AbstractSerializer, getData); PHP_METHOD(Phalcon_Storage_Serializer_AbstractSerializer, isSuccess); PHP_METHOD(Phalcon_Storage_Serializer_AbstractSerializer, setData); PHP_METHOD(Phalcon_Storage_Serializer_AbstractSerializer, isSerializable); +PHP_METHOD(Phalcon_Storage_Serializer_AbstractSerializer, __serialize); +PHP_METHOD(Phalcon_Storage_Serializer_AbstractSerializer, __unserialize); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_abstractserializer___construct, 0, 0, 0) ZEND_ARG_INFO(0, data) @@ -28,6 +30,14 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_abstr ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_abstractserializer___serialize, 0, 0, IS_ARRAY, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_abstractserializer___unserialize, 0, 1, IS_VOID, 0) + + ZEND_ARG_ARRAY_INFO(0, data, 0) +ZEND_END_ARG_INFO() + ZEPHIR_INIT_FUNCS(phalcon_storage_serializer_abstractserializer_method_entry) { PHP_ME(Phalcon_Storage_Serializer_AbstractSerializer, __construct, arginfo_phalcon_storage_serializer_abstractserializer___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) #if PHP_VERSION_ID >= 80000 @@ -38,5 +48,7 @@ ZEPHIR_INIT_FUNCS(phalcon_storage_serializer_abstractserializer_method_entry) { PHP_ME(Phalcon_Storage_Serializer_AbstractSerializer, isSuccess, arginfo_phalcon_storage_serializer_abstractserializer_issuccess, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Storage_Serializer_AbstractSerializer, setData, arginfo_phalcon_storage_serializer_abstractserializer_setdata, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Storage_Serializer_AbstractSerializer, isSerializable, arginfo_phalcon_storage_serializer_abstractserializer_isserializable, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Storage_Serializer_AbstractSerializer, __serialize, arginfo_phalcon_storage_serializer_abstractserializer___serialize, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Storage_Serializer_AbstractSerializer, __unserialize, arginfo_phalcon_storage_serializer_abstractserializer___unserialize, ZEND_ACC_PUBLIC) PHP_FE_END }; diff --git a/ext/phalcon/storage/serializer/base64.zep.c b/ext/phalcon/storage/serializer/base64.zep.c index 786bad5cdba..a56ed7df20a 100644 --- a/ext/phalcon/storage/serializer/base64.zep.c +++ b/ext/phalcon/storage/serializer/base64.zep.c @@ -76,10 +76,11 @@ PHP_METHOD(Phalcon_Storage_Serializer_Base64, unserialize) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *data, data_sub, __$true, __$false, result, _0; + zval *data_param = NULL, __$true, __$false, result, _0; + zval data; zval *this_ptr = getThis(); - ZVAL_UNDEF(&data_sub); + ZVAL_UNDEF(&data); ZVAL_BOOL(&__$true, 1); ZVAL_BOOL(&__$false, 0); ZVAL_UNDEF(&result); @@ -87,21 +88,22 @@ PHP_METHOD(Phalcon_Storage_Serializer_Base64, unserialize) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(data) + Z_PARAM_STR(data) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &data); + zephir_fetch_params(1, 1, 0, &data_param); + zephir_get_strval(&data, data_param); - if (Z_TYPE_P(data) != IS_STRING) { + if (1 != 1) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Data for the unserializer must of type string", "phalcon/Storage/Serializer/Base64.zep", 47); return; } ZVAL_BOOL(&_0, 1); - ZEPHIR_CALL_METHOD(&result, this_ptr, "phpbase64decode", NULL, 0, data, &_0); + ZEPHIR_CALL_METHOD(&result, this_ptr, "phpbase64decode", NULL, 0, &data, &_0); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_IS_FALSE_IDENTICAL(&result))) { if (0) { @@ -160,3 +162,4 @@ PHP_METHOD(Phalcon_Storage_Serializer_Base64, phpBase64Decode) zephir_check_call_status(); RETURN_MM(); } + diff --git a/ext/phalcon/storage/serializer/base64.zep.h b/ext/phalcon/storage/serializer/base64.zep.h index db588a01d24..fc6c36350a3 100644 --- a/ext/phalcon/storage/serializer/base64.zep.h +++ b/ext/phalcon/storage/serializer/base64.zep.h @@ -10,10 +10,15 @@ PHP_METHOD(Phalcon_Storage_Serializer_Base64, phpBase64Decode); ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_base64_serialize, 0, 0, IS_STRING, 0) ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_base64_unserialize, 0, 1, IS_VOID, 0) - - ZEND_ARG_INFO(0, data) + ZEND_ARG_TYPE_INFO(0, serialized, IS_STRING, 0) +ZEND_END_ARG_INFO() +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_base64_unserialize, 0, 1, IS_VOID, 0) + ZEND_ARG_INFO(0, serialized) ZEND_END_ARG_INFO() +#endif ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_base64_phpbase64decode, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0) diff --git a/ext/phalcon/storage/serializer/igbinary.zep.c b/ext/phalcon/storage/serializer/igbinary.zep.c index 3487ed2c2d9..f46ddedeb37 100644 --- a/ext/phalcon/storage/serializer/igbinary.zep.c +++ b/ext/phalcon/storage/serializer/igbinary.zep.c @@ -88,10 +88,11 @@ PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, unserialize) zend_bool _8$$4; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *data, data_sub, __$false, __$true, result, version, _0, _1$$4, _2$$4, _3$$4, _4$$5, _5$$5, _6$$6, _7$$6; + zval *data_param = NULL, __$false, __$true, result, version, _0, _1$$4, _2$$4, _3$$4, _4$$5, _5$$5, _6$$6, _7$$6; + zval data; zval *this_ptr = getThis(); - ZVAL_UNDEF(&data_sub); + ZVAL_UNDEF(&data); ZVAL_BOOL(&__$false, 0); ZVAL_BOOL(&__$true, 1); ZVAL_UNDEF(&result); @@ -107,19 +108,20 @@ PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, unserialize) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(data) + Z_PARAM_STR(data) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &data); + zephir_fetch_params(1, 1, 0, &data_param); + zephir_get_strval(&data, data_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "isserializable", NULL, 0, data); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "isserializable", NULL, 0, &data); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); + zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &data); } else { ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 87); zephir_check_call_status(); @@ -145,7 +147,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, unserialize) ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 89, &_6$$6, &_7$$6); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&result, this_ptr, "dounserialize", NULL, 0, data); + ZEPHIR_CALL_METHOD(&result, this_ptr, "dounserialize", NULL, 0, &data); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 91); zephir_check_call_status(); diff --git a/ext/phalcon/storage/serializer/igbinary.zep.h b/ext/phalcon/storage/serializer/igbinary.zep.h index 9c64f3eaefb..4f388c5afc0 100644 --- a/ext/phalcon/storage/serializer/igbinary.zep.h +++ b/ext/phalcon/storage/serializer/igbinary.zep.h @@ -12,10 +12,15 @@ PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, doUnserialize); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_igbinary_serialize, 0, 0, 0) ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_igbinary_unserialize, 0, 1, IS_VOID, 0) - - ZEND_ARG_INFO(0, data) + ZEND_ARG_TYPE_INFO(0, serialized, IS_STRING, 0) +ZEND_END_ARG_INFO() +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_igbinary_unserialize, 0, 1, IS_VOID, 0) + ZEND_ARG_INFO(0, serialized) ZEND_END_ARG_INFO() +#endif ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_igbinary_phpigbinaryserialize, 0, 1, IS_STRING, 1) ZEND_ARG_INFO(0, value) diff --git a/ext/phalcon/storage/serializer/json.zep.c b/ext/phalcon/storage/serializer/json.zep.c index 9601787c6b0..429a61de487 100644 --- a/ext/phalcon/storage/serializer/json.zep.c +++ b/ext/phalcon/storage/serializer/json.zep.c @@ -104,30 +104,32 @@ PHP_METHOD(Phalcon_Storage_Serializer_Json, unserialize) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *data, data_sub, _0, _1$$4; + zval *data_param = NULL, _0, _1$$4; + zval data; zval *this_ptr = getThis(); - ZVAL_UNDEF(&data_sub); + ZVAL_UNDEF(&data); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1$$4); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(data) + Z_PARAM_STR(data) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &data); + zephir_fetch_params(1, 1, 0, &data_param); + zephir_get_strval(&data, data_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "isserializable", NULL, 0, data); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "isserializable", NULL, 0, &data); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); + zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &data); } else { - ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "getdecode", NULL, 0, data); + ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "getdecode", NULL, 0, &data); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &_1$$4); } diff --git a/ext/phalcon/storage/serializer/json.zep.h b/ext/phalcon/storage/serializer/json.zep.h index 5ebf3f20e59..732da81681a 100644 --- a/ext/phalcon/storage/serializer/json.zep.h +++ b/ext/phalcon/storage/serializer/json.zep.h @@ -11,10 +11,15 @@ PHP_METHOD(Phalcon_Storage_Serializer_Json, getEncode); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_json_serialize, 0, 0, 0) ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_json_unserialize, 0, 1, IS_VOID, 0) - - ZEND_ARG_INFO(0, data) + ZEND_ARG_TYPE_INFO(0, serialized, IS_STRING, 0) ZEND_END_ARG_INFO() +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_json_unserialize, 0, 1, IS_VOID, 0) + ZEND_ARG_INFO(0, serialized) +ZEND_END_ARG_INFO() +#endif ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_json_getdecode, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0) diff --git a/ext/phalcon/storage/serializer/memcachedigbinary.zep.c b/ext/phalcon/storage/serializer/memcachedigbinary.zep.c index f93a255960f..1b769cc7ae1 100644 --- a/ext/phalcon/storage/serializer/memcachedigbinary.zep.c +++ b/ext/phalcon/storage/serializer/memcachedigbinary.zep.c @@ -31,3 +31,4 @@ ZEPHIR_INIT_CLASS(Phalcon_Storage_Serializer_MemcachedIgbinary) return SUCCESS; } + diff --git a/ext/phalcon/storage/serializer/memcachedigbinary.zep.h b/ext/phalcon/storage/serializer/memcachedigbinary.zep.h index f6d22a16a15..0d0dd59c69d 100644 --- a/ext/phalcon/storage/serializer/memcachedigbinary.zep.h +++ b/ext/phalcon/storage/serializer/memcachedigbinary.zep.h @@ -2,3 +2,4 @@ extern zend_class_entry *phalcon_storage_serializer_memcachedigbinary_ce; ZEPHIR_INIT_CLASS(Phalcon_Storage_Serializer_MemcachedIgbinary); + diff --git a/ext/phalcon/storage/serializer/memcachedjson.zep.c b/ext/phalcon/storage/serializer/memcachedjson.zep.c index f35b62857b5..dea36fce11f 100644 --- a/ext/phalcon/storage/serializer/memcachedjson.zep.c +++ b/ext/phalcon/storage/serializer/memcachedjson.zep.c @@ -31,3 +31,4 @@ ZEPHIR_INIT_CLASS(Phalcon_Storage_Serializer_MemcachedJson) return SUCCESS; } + diff --git a/ext/phalcon/storage/serializer/memcachedjson.zep.h b/ext/phalcon/storage/serializer/memcachedjson.zep.h index 9f65da6e044..45b295f6c6d 100644 --- a/ext/phalcon/storage/serializer/memcachedjson.zep.h +++ b/ext/phalcon/storage/serializer/memcachedjson.zep.h @@ -2,3 +2,4 @@ extern zend_class_entry *phalcon_storage_serializer_memcachedjson_ce; ZEPHIR_INIT_CLASS(Phalcon_Storage_Serializer_MemcachedJson); + diff --git a/ext/phalcon/storage/serializer/memcachedphp.zep.c b/ext/phalcon/storage/serializer/memcachedphp.zep.c index ba131ee3a2d..12e041a7a39 100644 --- a/ext/phalcon/storage/serializer/memcachedphp.zep.c +++ b/ext/phalcon/storage/serializer/memcachedphp.zep.c @@ -31,3 +31,4 @@ ZEPHIR_INIT_CLASS(Phalcon_Storage_Serializer_MemcachedPhp) return SUCCESS; } + diff --git a/ext/phalcon/storage/serializer/memcachedphp.zep.h b/ext/phalcon/storage/serializer/memcachedphp.zep.h index 2e0d9dce123..4b3411105cf 100644 --- a/ext/phalcon/storage/serializer/memcachedphp.zep.h +++ b/ext/phalcon/storage/serializer/memcachedphp.zep.h @@ -2,3 +2,4 @@ extern zend_class_entry *phalcon_storage_serializer_memcachedphp_ce; ZEPHIR_INIT_CLASS(Phalcon_Storage_Serializer_MemcachedPhp); + diff --git a/ext/phalcon/storage/serializer/none.zep.c b/ext/phalcon/storage/serializer/none.zep.c index 9c92d5ba087..09d7b31f81e 100644 --- a/ext/phalcon/storage/serializer/none.zep.c +++ b/ext/phalcon/storage/serializer/none.zep.c @@ -13,6 +13,7 @@ #include "kernel/main.h" #include "kernel/object.h" +#include "kernel/operators.h" #include "kernel/memory.h" @@ -54,21 +55,26 @@ PHP_METHOD(Phalcon_Storage_Serializer_None, serialize) */ PHP_METHOD(Phalcon_Storage_Serializer_None, unserialize) { - zval *data, data_sub; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *data_param = NULL; + zval data; zval *this_ptr = getThis(); - ZVAL_UNDEF(&data_sub); + ZVAL_UNDEF(&data); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(data) + Z_PARAM_STR(data) ZEND_PARSE_PARAMETERS_END(); #endif - zephir_fetch_params_without_memory_grow(1, 0, &data); + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &data_param); + zephir_get_strval(&data, data_param); - zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); + zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &data); + ZEPHIR_MM_RESTORE(); } diff --git a/ext/phalcon/storage/serializer/none.zep.h b/ext/phalcon/storage/serializer/none.zep.h index e7ce6130577..346fa5e9ee8 100644 --- a/ext/phalcon/storage/serializer/none.zep.h +++ b/ext/phalcon/storage/serializer/none.zep.h @@ -6,13 +6,18 @@ ZEPHIR_INIT_CLASS(Phalcon_Storage_Serializer_None); PHP_METHOD(Phalcon_Storage_Serializer_None, serialize); PHP_METHOD(Phalcon_Storage_Serializer_None, unserialize); -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_none_serialize, 0, 0, IS_STRING, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_none_serialize, 0, 0, IS_STRING, 1) ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_none_unserialize, 0, 1, IS_VOID, 0) - - ZEND_ARG_INFO(0, data) + ZEND_ARG_TYPE_INFO(0, serialized, IS_STRING, 0) +ZEND_END_ARG_INFO() +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_none_unserialize, 0, 1, IS_VOID, 0) + ZEND_ARG_INFO(0, serialized) ZEND_END_ARG_INFO() +#endif ZEPHIR_INIT_FUNCS(phalcon_storage_serializer_none_method_entry) { PHP_ME(Phalcon_Storage_Serializer_None, serialize, arginfo_phalcon_storage_serializer_none_serialize, ZEND_ACC_PUBLIC) diff --git a/ext/phalcon/storage/serializer/php.zep.c b/ext/phalcon/storage/serializer/php.zep.c index 40aa30eefe9..8c2057e0555 100644 --- a/ext/phalcon/storage/serializer/php.zep.c +++ b/ext/phalcon/storage/serializer/php.zep.c @@ -76,10 +76,11 @@ PHP_METHOD(Phalcon_Storage_Serializer_Php, unserialize) zend_bool _8$$4; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *data, data_sub, __$false, __$true, result, version, _0, _1$$4, _2$$4, _3$$4, _4$$6, _5$$6, _6$$7, _7$$7; + zval *data_param = NULL, __$false, __$true, result, version, _0, _1$$4, _2$$4, _3$$4, _4$$6, _5$$6, _6$$7, _7$$7; + zval data; zval *this_ptr = getThis(); - ZVAL_UNDEF(&data_sub); + ZVAL_UNDEF(&data); ZVAL_BOOL(&__$false, 0); ZVAL_BOOL(&__$true, 1); ZVAL_UNDEF(&result); @@ -95,21 +96,22 @@ PHP_METHOD(Phalcon_Storage_Serializer_Php, unserialize) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(data) + Z_PARAM_STR(data) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &data); + zephir_fetch_params(1, 1, 0, &data_param); + zephir_get_strval(&data, data_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "isserializable", NULL, 0, data); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "isserializable", NULL, 0, &data); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); + zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &data); } else { - if (Z_TYPE_P(data) != IS_STRING) { + if (1 != 1) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Data for the unserializer must of type string", "phalcon/Storage/Serializer/Php.zep", 46); return; } @@ -137,7 +139,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Php, unserialize) ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 89, &_6$$7, &_7$$7); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&result, this_ptr, "phpunserialize", NULL, 0, data); + ZEPHIR_CALL_METHOD(&result, this_ptr, "phpunserialize", NULL, 0, &data); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 91); zephir_check_call_status(); diff --git a/ext/phalcon/storage/serializer/php.zep.h b/ext/phalcon/storage/serializer/php.zep.h index 11abd306a11..1aadb57bebb 100644 --- a/ext/phalcon/storage/serializer/php.zep.h +++ b/ext/phalcon/storage/serializer/php.zep.h @@ -10,10 +10,15 @@ PHP_METHOD(Phalcon_Storage_Serializer_Php, phpUnserialize); ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_php_serialize, 0, 0, IS_STRING, 0) ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_php_unserialize, 0, 1, IS_VOID, 0) - - ZEND_ARG_INFO(0, data) + ZEND_ARG_TYPE_INFO(0, serialized, IS_STRING, 0) +ZEND_END_ARG_INFO() +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_php_unserialize, 0, 1, IS_VOID, 0) + ZEND_ARG_INFO(0, serialized) ZEND_END_ARG_INFO() +#endif ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_php_phpunserialize, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0) diff --git a/ext/phalcon/storage/serializer/redisigbinary.zep.c b/ext/phalcon/storage/serializer/redisigbinary.zep.c index 4f73a025bf4..bb84cf4320c 100644 --- a/ext/phalcon/storage/serializer/redisigbinary.zep.c +++ b/ext/phalcon/storage/serializer/redisigbinary.zep.c @@ -31,3 +31,4 @@ ZEPHIR_INIT_CLASS(Phalcon_Storage_Serializer_RedisIgbinary) return SUCCESS; } + diff --git a/ext/phalcon/storage/serializer/redisigbinary.zep.h b/ext/phalcon/storage/serializer/redisigbinary.zep.h index 6cab26a977d..47a238fd48b 100644 --- a/ext/phalcon/storage/serializer/redisigbinary.zep.h +++ b/ext/phalcon/storage/serializer/redisigbinary.zep.h @@ -2,3 +2,4 @@ extern zend_class_entry *phalcon_storage_serializer_redisigbinary_ce; ZEPHIR_INIT_CLASS(Phalcon_Storage_Serializer_RedisIgbinary); + diff --git a/ext/phalcon/storage/serializer/redisjson.zep.c b/ext/phalcon/storage/serializer/redisjson.zep.c index 63641a23391..a76c46bf9e4 100644 --- a/ext/phalcon/storage/serializer/redisjson.zep.c +++ b/ext/phalcon/storage/serializer/redisjson.zep.c @@ -31,3 +31,4 @@ ZEPHIR_INIT_CLASS(Phalcon_Storage_Serializer_RedisJson) return SUCCESS; } + diff --git a/ext/phalcon/storage/serializer/redisjson.zep.h b/ext/phalcon/storage/serializer/redisjson.zep.h index 66df36d6e08..c0ba3747945 100644 --- a/ext/phalcon/storage/serializer/redisjson.zep.h +++ b/ext/phalcon/storage/serializer/redisjson.zep.h @@ -2,3 +2,4 @@ extern zend_class_entry *phalcon_storage_serializer_redisjson_ce; ZEPHIR_INIT_CLASS(Phalcon_Storage_Serializer_RedisJson); + diff --git a/ext/phalcon/storage/serializer/redismsgpack.zep.c b/ext/phalcon/storage/serializer/redismsgpack.zep.c index 646e471af48..435d8afe019 100644 --- a/ext/phalcon/storage/serializer/redismsgpack.zep.c +++ b/ext/phalcon/storage/serializer/redismsgpack.zep.c @@ -31,3 +31,4 @@ ZEPHIR_INIT_CLASS(Phalcon_Storage_Serializer_RedisMsgpack) return SUCCESS; } + diff --git a/ext/phalcon/storage/serializer/redismsgpack.zep.h b/ext/phalcon/storage/serializer/redismsgpack.zep.h index 2d1b6da6b66..4f2cb1dcd0f 100644 --- a/ext/phalcon/storage/serializer/redismsgpack.zep.h +++ b/ext/phalcon/storage/serializer/redismsgpack.zep.h @@ -2,3 +2,4 @@ extern zend_class_entry *phalcon_storage_serializer_redismsgpack_ce; ZEPHIR_INIT_CLASS(Phalcon_Storage_Serializer_RedisMsgpack); + diff --git a/ext/phalcon/storage/serializer/redisnone.zep.c b/ext/phalcon/storage/serializer/redisnone.zep.c index 7241eafb3f6..84b81d55912 100644 --- a/ext/phalcon/storage/serializer/redisnone.zep.c +++ b/ext/phalcon/storage/serializer/redisnone.zep.c @@ -31,3 +31,4 @@ ZEPHIR_INIT_CLASS(Phalcon_Storage_Serializer_RedisNone) return SUCCESS; } + diff --git a/ext/phalcon/storage/serializer/redisnone.zep.h b/ext/phalcon/storage/serializer/redisnone.zep.h index daf7d30dd8f..bad2a9552fa 100644 --- a/ext/phalcon/storage/serializer/redisnone.zep.h +++ b/ext/phalcon/storage/serializer/redisnone.zep.h @@ -2,3 +2,4 @@ extern zend_class_entry *phalcon_storage_serializer_redisnone_ce; ZEPHIR_INIT_CLASS(Phalcon_Storage_Serializer_RedisNone); + diff --git a/ext/phalcon/storage/serializer/redisphp.zep.c b/ext/phalcon/storage/serializer/redisphp.zep.c index 54473078cdd..602dfd55613 100644 --- a/ext/phalcon/storage/serializer/redisphp.zep.c +++ b/ext/phalcon/storage/serializer/redisphp.zep.c @@ -31,3 +31,4 @@ ZEPHIR_INIT_CLASS(Phalcon_Storage_Serializer_RedisPhp) return SUCCESS; } + diff --git a/ext/phalcon/storage/serializer/redisphp.zep.h b/ext/phalcon/storage/serializer/redisphp.zep.h index 64a87656273..6a6ef994a33 100644 --- a/ext/phalcon/storage/serializer/redisphp.zep.h +++ b/ext/phalcon/storage/serializer/redisphp.zep.h @@ -2,3 +2,4 @@ extern zend_class_entry *phalcon_storage_serializer_redisphp_ce; ZEPHIR_INIT_CLASS(Phalcon_Storage_Serializer_RedisPhp); + diff --git a/ext/phalcon/storage/serializer/serializerinterface.zep.c b/ext/phalcon/storage/serializer/serializerinterface.zep.c index b9ee266462a..f32d2e1b9b6 100644 --- a/ext/phalcon/storage/serializer/serializerinterface.zep.c +++ b/ext/phalcon/storage/serializer/serializerinterface.zep.c @@ -20,11 +20,6 @@ * For the full copyright and license information, please view the LICENSE.txt * file that was distributed with this source code. */ -/** - * Interface SerializerInterface - * - * @package Phalcon\Storage\Serializer - */ ZEPHIR_INIT_CLASS(Phalcon_Storage_Serializer_SerializerInterface) { ZEPHIR_REGISTER_INTERFACE(Phalcon\\Storage\\Serializer, SerializerInterface, phalcon, storage_serializer_serializerinterface, phalcon_storage_serializer_serializerinterface_method_entry); diff --git a/ext/phalcon/support/collection.zep.c b/ext/phalcon/support/collection.zep.c index 437a7ccf2b6..7721fa60b90 100644 --- a/ext/phalcon/support/collection.zep.c +++ b/ext/phalcon/support/collection.zep.c @@ -661,7 +661,8 @@ PHP_METHOD(Phalcon_Support_Collection, offsetExists) zval _0; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *element = NULL, element_sub; + zval element_sub; + zval *element = NULL; zval *this_ptr = getThis(); ZVAL_UNDEF(&element_sub); @@ -676,7 +677,6 @@ PHP_METHOD(Phalcon_Support_Collection, offsetExists) ZEPHIR_MM_GROW(); zephir_fetch_params(1, 1, 0, &element); - ZEPHIR_SEPARATE_PARAM(element); zephir_cast_to_string(&_0, element); @@ -695,7 +695,8 @@ PHP_METHOD(Phalcon_Support_Collection, offsetGet) zval _0; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *element = NULL, element_sub; + zval element_sub; + zval *element = NULL; zval *this_ptr = getThis(); ZVAL_UNDEF(&element_sub); @@ -710,7 +711,6 @@ PHP_METHOD(Phalcon_Support_Collection, offsetGet) ZEPHIR_MM_GROW(); zephir_fetch_params(1, 1, 0, &element); - ZEPHIR_SEPARATE_PARAM(element); zephir_cast_to_string(&_0, element); @@ -729,7 +729,8 @@ PHP_METHOD(Phalcon_Support_Collection, offsetSet) zval _0; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *element = NULL, element_sub, *value, value_sub; + zval element_sub, value_sub; + zval *element = NULL, *value; zval *this_ptr = getThis(); ZVAL_UNDEF(&element_sub); @@ -746,7 +747,6 @@ PHP_METHOD(Phalcon_Support_Collection, offsetSet) ZEPHIR_MM_GROW(); zephir_fetch_params(1, 2, 0, &element, &value); - ZEPHIR_SEPARATE_PARAM(element); zephir_cast_to_string(&_0, element); @@ -765,7 +765,8 @@ PHP_METHOD(Phalcon_Support_Collection, offsetUnset) zval _0; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *element = NULL, element_sub; + zval element_sub; + zval *element = NULL; zval *this_ptr = getThis(); ZVAL_UNDEF(&element_sub); @@ -780,7 +781,6 @@ PHP_METHOD(Phalcon_Support_Collection, offsetUnset) ZEPHIR_MM_GROW(); zephir_fetch_params(1, 1, 0, &element); - ZEPHIR_SEPARATE_PARAM(element); zephir_cast_to_string(&_0, element); @@ -965,37 +965,76 @@ PHP_METHOD(Phalcon_Support_Collection, toJson) */ PHP_METHOD(Phalcon_Support_Collection, unserialize) { - zval _0; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *serialized = NULL, serialized_sub, data; + zval *serialized_param = NULL, data; + zval serialized; zval *this_ptr = getThis(); - ZVAL_UNDEF(&serialized_sub); + ZVAL_UNDEF(&serialized); ZVAL_UNDEF(&data); - ZVAL_UNDEF(&_0); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(serialized) + Z_PARAM_STR(serialized) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &serialized); - ZEPHIR_SEPARATE_PARAM(serialized); + zephir_fetch_params(1, 1, 0, &serialized_param); + zephir_get_strval(&serialized, serialized_param); - zephir_cast_to_string(&_0, serialized); - ZEPHIR_CPY_WRT(serialized, &_0); - ZEPHIR_CALL_FUNCTION(&data, "unserialize", NULL, 16, serialized); + ZEPHIR_CALL_FUNCTION(&data, "unserialize", NULL, 16, &serialized); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "init", NULL, 0, &data); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } +PHP_METHOD(Phalcon_Support_Collection, __serialize) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *this_ptr = getThis(); + + + + ZEPHIR_MM_GROW(); + + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "toarray", NULL, 0); + zephir_check_call_status(); + RETURN_MM(); +} + +PHP_METHOD(Phalcon_Support_Collection, __unserialize) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *data_param = NULL; + zval data; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&data); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_ARRAY(data) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &data_param); + zephir_get_arrval(&data, data_param); + + + ZEPHIR_CALL_METHOD(NULL, this_ptr, "init", NULL, 0, &data); + zephir_check_call_status(); + ZEPHIR_MM_RESTORE(); +} + /** * Internal method to set data */ diff --git a/ext/phalcon/support/collection.zep.h b/ext/phalcon/support/collection.zep.h index 49cf713ecee..b597fbecd35 100644 --- a/ext/phalcon/support/collection.zep.h +++ b/ext/phalcon/support/collection.zep.h @@ -27,6 +27,8 @@ PHP_METHOD(Phalcon_Support_Collection, serialize); PHP_METHOD(Phalcon_Support_Collection, toArray); PHP_METHOD(Phalcon_Support_Collection, toJson); PHP_METHOD(Phalcon_Support_Collection, unserialize); +PHP_METHOD(Phalcon_Support_Collection, __serialize); +PHP_METHOD(Phalcon_Support_Collection, __unserialize); PHP_METHOD(Phalcon_Support_Collection, setData); PHP_METHOD(Phalcon_Support_Collection, phpJsonEncode); PHP_METHOD(Phalcon_Support_Collection, processKey); @@ -102,7 +104,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_offse ZEND_ARG_INFO(0, element) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_support_collection_offsetget, 0, 0, 1) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_offsetget, 0, 1, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_offsetget, 0, 1, IS_NULL, 0) +#endif ZEND_ARG_INFO(0, element) ZEND_END_ARG_INFO() @@ -138,9 +144,22 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_tojso ZEND_ARG_TYPE_INFO(0, options, IS_LONG, 0) ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_unserialize, 0, 1, IS_VOID, 0) + ZEND_ARG_TYPE_INFO(0, serialized, IS_STRING, 0) +ZEND_END_ARG_INFO() +#else ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_unserialize, 0, 1, IS_VOID, 0) + ZEND_ARG_INFO(0, serialized) +ZEND_END_ARG_INFO() +#endif + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection___serialize, 0, 0, IS_ARRAY, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection___unserialize, 0, 1, IS_VOID, 0) - ZEND_ARG_INFO(0, serialized) + ZEND_ARG_ARRAY_INFO(0, data, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_setdata, 0, 2, IS_VOID, 0) @@ -187,6 +206,8 @@ ZEPHIR_INIT_FUNCS(phalcon_support_collection_method_entry) { PHP_ME(Phalcon_Support_Collection, toArray, arginfo_phalcon_support_collection_toarray, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Support_Collection, toJson, arginfo_phalcon_support_collection_tojson, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Support_Collection, unserialize, arginfo_phalcon_support_collection_unserialize, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Support_Collection, __serialize, arginfo_phalcon_support_collection___serialize, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Support_Collection, __unserialize, arginfo_phalcon_support_collection___unserialize, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Support_Collection, setData, arginfo_phalcon_support_collection_setdata, ZEND_ACC_PROTECTED) PHP_ME(Phalcon_Support_Collection, phpJsonEncode, arginfo_phalcon_support_collection_phpjsonencode, ZEND_ACC_PROTECTED) PHP_ME(Phalcon_Support_Collection, processKey, arginfo_phalcon_support_collection_processkey, ZEND_ACC_PROTECTED) diff --git a/ext/phalcon/support/debug/dump.zep.c b/ext/phalcon/support/debug/dump.zep.c index 6a6cd67f2b7..9cbc84faa6b 100644 --- a/ext/phalcon/support/debug/dump.zep.c +++ b/ext/phalcon/support/debug/dump.zep.c @@ -890,7 +890,7 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, output) ZEPHIR_CONCAT_VS(&_45$$11, &_44$$11, "[skipped]\n"); zephir_concat_self(&output, &_45$$11); } else if (_42$$9) { - ZEPHIR_CALL_FUNCTION(&_46$$12, "get_object_vars", NULL, 507, variable); + ZEPHIR_CALL_FUNCTION(&_46$$12, "get_object_vars", NULL, 506, variable); zephir_check_call_status(); zephir_is_iterable(&_46$$12, 0, "phalcon/Support/Debug/Dump.zep", 263); if (Z_TYPE_P(&_46$$12) == IS_ARRAY) { diff --git a/ext/phalcon/support/registry.zep.c b/ext/phalcon/support/registry.zep.c index 828a8676be9..eeab06d3bd3 100644 --- a/ext/phalcon/support/registry.zep.c +++ b/ext/phalcon/support/registry.zep.c @@ -539,7 +539,8 @@ PHP_METHOD(Phalcon_Support_Registry, offsetGet) zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zephir_fcall_cache_entry *_0 = NULL; - zval *element, element_sub; + zval element_sub; + zval *element; zval *this_ptr = getThis(); ZVAL_UNDEF(&element_sub); diff --git a/ext/phalcon/support/registry.zep.h b/ext/phalcon/support/registry.zep.h index 1f6e4b2c2d0..0f24b23d6b7 100644 --- a/ext/phalcon/support/registry.zep.h +++ b/ext/phalcon/support/registry.zep.h @@ -88,7 +88,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_registry_offsete ZEND_ARG_INFO(0, element) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_support_registry_offsetget, 0, 0, 1) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_registry_offsetget, 0, 1, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_registry_offsetget, 0, 1, IS_NULL, 0) +#endif ZEND_ARG_INFO(0, element) ZEND_END_ARG_INFO() diff --git a/ext/phalcon/tag.zep.c b/ext/phalcon/tag.zep.c index 857634cb640..36f74158950 100644 --- a/ext/phalcon/tag.zep.c +++ b/ext/phalcon/tag.zep.c @@ -2048,7 +2048,7 @@ PHP_METHOD(Phalcon_Tag, renderAttributes) ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&order), _2, _3, _0) { ZEPHIR_INIT_NVAR(&key); - if (_3 != NULL) { + if (_3 != NULL) { ZVAL_STR_COPY(&key, _3); } else { ZVAL_LONG(&key, _2); @@ -2088,7 +2088,7 @@ PHP_METHOD(Phalcon_Tag, renderAttributes) ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&attributes), _6, _7, _4) { ZEPHIR_INIT_NVAR(&key); - if (_7 != NULL) { + if (_7 != NULL) { ZVAL_STR_COPY(&key, _7); } else { ZVAL_LONG(&key, _6); @@ -2131,7 +2131,7 @@ PHP_METHOD(Phalcon_Tag, renderAttributes) ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&attrs), _11, _12, _9) { ZEPHIR_INIT_NVAR(&key); - if (_12 != NULL) { + if (_12 != NULL) { ZVAL_STR_COPY(&key, _12); } else { ZVAL_LONG(&key, _11); @@ -3487,3 +3487,4 @@ PHP_METHOD(Phalcon_Tag, inputFieldChecked) } RETURN_CCTOR(&code); } + diff --git a/ext/phalcon/translate/adapter/abstractadapter.zep.c b/ext/phalcon/translate/adapter/abstractadapter.zep.c index cc8c5217acf..a4305798b76 100644 --- a/ext/phalcon/translate/adapter/abstractadapter.zep.c +++ b/ext/phalcon/translate/adapter/abstractadapter.zep.c @@ -195,7 +195,8 @@ PHP_METHOD(Phalcon_Translate_Adapter_AbstractAdapter, offsetGet) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *translateKey, translateKey_sub; + zval translateKey_sub; + zval *translateKey; zval *this_ptr = getThis(); ZVAL_UNDEF(&translateKey_sub); diff --git a/ext/phalcon/translate/adapter/abstractadapter.zep.h b/ext/phalcon/translate/adapter/abstractadapter.zep.h index 41163a8a7d5..7814b8790a8 100644 --- a/ext/phalcon/translate/adapter/abstractadapter.zep.h +++ b/ext/phalcon/translate/adapter/abstractadapter.zep.h @@ -34,7 +34,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_abstra ZEND_ARG_INFO(0, translateKey) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_translate_adapter_abstractadapter_offsetget, 0, 0, 1) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_abstractadapter_offsetget, 0, 1, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_abstractadapter_offsetget, 0, 1, IS_NULL, 0) +#endif ZEND_ARG_INFO(0, translateKey) ZEND_END_ARG_INFO() diff --git a/ext/php_phalcon.h b/ext/php_phalcon.h index 7c90d409c0f..5bd542092b3 100644 --- a/ext/php_phalcon.h +++ b/ext/php_phalcon.h @@ -14,7 +14,7 @@ #define PHP_PHALCON_VERSION "5.0.0beta3" #define PHP_PHALCON_EXTNAME "phalcon" #define PHP_PHALCON_AUTHOR "Phalcon Team and contributors" -#define PHP_PHALCON_ZEPVERSION "0.15.2-5828ae2" +#define PHP_PHALCON_ZEPVERSION "0.16.0-$Id$" #define PHP_PHALCON_DESCRIPTION "Phalcon is a full stack PHP framework, delivered as a PHP extension, offering lower resource consumption and high performance." typedef struct _zephir_struct_db { From 1f911c05934bc13a6118a1cead4bb5e02f456930 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Mon, 21 Mar 2022 10:03:08 +0000 Subject: [PATCH 44/91] #15598 - Revert usage of default workflow --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index af599e3980b..00e61e920f3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -57,16 +57,16 @@ jobs: with: standard: ./phpcs.xml - # Generates stubs and validates with PSALM + # Generate stubs and validates with PSALM stubs: needs: setup_workflow - uses: zephir-lang/templates/.github/workflows/phalcon-stubs-zephir-composer.yml@main + uses: zephir-lang/templates/.github/workflows/phalcon-stubs.yml@main with: extensions: ${{ needs.setup_workflow.outputs.zephir_extensions }} generate: needs: setup_workflow - uses: zephir-lang/templates/.github/workflows/phalcon-pecl-zephir-composer.yml@main + uses: zephir-lang/templates/.github/workflows/phalcon-pecl.yml@main with: extensions: ${{ needs.setup_workflow.outputs.zephir_extensions }} php-version: '8.1' From 94112bfcc72549f475de2a5aa82470a707fd84c0 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Mon, 21 Mar 2022 10:10:28 +0000 Subject: [PATCH 45/91] Revert "#15598 - Revert usage of default workflow" This reverts commit 1f911c05934bc13a6118a1cead4bb5e02f456930. --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 00e61e920f3..af599e3980b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -57,16 +57,16 @@ jobs: with: standard: ./phpcs.xml - # Generate stubs and validates with PSALM + # Generates stubs and validates with PSALM stubs: needs: setup_workflow - uses: zephir-lang/templates/.github/workflows/phalcon-stubs.yml@main + uses: zephir-lang/templates/.github/workflows/phalcon-stubs-zephir-composer.yml@main with: extensions: ${{ needs.setup_workflow.outputs.zephir_extensions }} generate: needs: setup_workflow - uses: zephir-lang/templates/.github/workflows/phalcon-pecl.yml@main + uses: zephir-lang/templates/.github/workflows/phalcon-pecl-zephir-composer.yml@main with: extensions: ${{ needs.setup_workflow.outputs.zephir_extensions }} php-version: '8.1' From b73c4d2b82ffd2256fd988a25ac3f87a70ea6e0b Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 24 Apr 2022 15:13:01 +0100 Subject: [PATCH 46/91] #15598 - Change value of `defaultModule` property from `null` to empty string --- phalcon/Application/AbstractApplication.zep | 4 ++-- phalcon/Cli/Router.zep | 4 ++-- phalcon/Mvc/Router.zep | 4 ++-- phalcon/Mvc/Router/Annotations.zep | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/phalcon/Application/AbstractApplication.zep b/phalcon/Application/AbstractApplication.zep index a5286f3235c..eda9320e40e 100644 --- a/phalcon/Application/AbstractApplication.zep +++ b/phalcon/Application/AbstractApplication.zep @@ -26,9 +26,9 @@ abstract class AbstractApplication extends Injectable implements EventsAwareInte protected container = null; /** - * @var string|null + * @var string */ - protected defaultModule = null; + protected defaultModule = ""; /** * @var ManagerInterface|null diff --git a/phalcon/Cli/Router.zep b/phalcon/Cli/Router.zep index 6feddfa7f97..5253690a957 100644 --- a/phalcon/Cli/Router.zep +++ b/phalcon/Cli/Router.zep @@ -49,9 +49,9 @@ class Router extends AbstractInjectionAware protected defaultAction = null; /** - * @var string|null + * @var string */ - protected defaultModule = null; + protected defaultModule = ""; /** * @var array diff --git a/phalcon/Mvc/Router.zep b/phalcon/Mvc/Router.zep index cc54e887e8e..300a35aeed1 100644 --- a/phalcon/Mvc/Router.zep +++ b/phalcon/Mvc/Router.zep @@ -74,9 +74,9 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw protected defaultController = null; /** - * @var string|null + * @var string */ - protected defaultModule = null; + protected defaultModule = ""; /** * @var string|null diff --git a/phalcon/Mvc/Router/Annotations.zep b/phalcon/Mvc/Router/Annotations.zep index 23811d0a334..1a4ce69275c 100644 --- a/phalcon/Mvc/Router/Annotations.zep +++ b/phalcon/Mvc/Router/Annotations.zep @@ -180,6 +180,7 @@ class Annotations extends Router * Check if the scope has a module associated */ fetch moduleName, scope[2]; + let moduleName = moduleName !== null ? moduleName : ""; let sufixed = controllerName . controllerSuffix; From b71a706b36cd27aedb74828d72b1b4ef256b23a5 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 24 Apr 2022 15:14:39 +0100 Subject: [PATCH 47/91] #15598 - Adjust logic compatible with PHP8.1 --- phalcon/Mvc/Model/Resultset.zep | 2 +- phalcon/Mvc/Model/Resultset/Complex.zep | 15 ++++++++++++--- phalcon/Mvc/Model/Resultset/Simple.zep | 10 ++++++++++ 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/phalcon/Mvc/Model/Resultset.zep b/phalcon/Mvc/Model/Resultset.zep index 02af10c44b4..6ba27d176f6 100644 --- a/phalcon/Mvc/Model/Resultset.zep +++ b/phalcon/Mvc/Model/Resultset.zep @@ -491,7 +491,7 @@ abstract class Resultset /** * Gets row in a specific position of the resultset */ - public function offsetGet(var index) -> | bool + public function offsetGet(mixed index) -> mixed { if unlikely index >= this->count { throw new Exception("The index does not exist in the cursor"); diff --git a/phalcon/Mvc/Model/Resultset/Complex.zep b/phalcon/Mvc/Model/Resultset/Complex.zep index 5da80d89fb8..52a2536c4c9 100644 --- a/phalcon/Mvc/Model/Resultset/Complex.zep +++ b/phalcon/Mvc/Model/Resultset/Complex.zep @@ -67,7 +67,7 @@ class Complex extends Resultset implements ResultsetInterface /** * Returns current row in the resultset */ - final public function current() -> | bool + final public function current() -> mixed { var row, hydrateMode, eager, dirtyState, alias, activeRow, type, column, columnValue, value, attribute, source, attributes, columnMap, @@ -353,8 +353,7 @@ class Complex extends Resultset implements ResultsetInterface let this->disableHydration = true; let container = Di::getDefault(); - - if unlikely typeof container != "object" { + if container === null { throw new Exception( "The dependency injector container is not valid" ); @@ -379,4 +378,14 @@ class Complex extends Resultset implements ResultsetInterface this->columnTypes = resultset["columnTypes"], this->hydrateMode = resultset["hydrateMode"]; } + + public function __serialize() -> array + { + return []; + } + + public function __unserialize(array data) -> void + { + // Nothing here + } } diff --git a/phalcon/Mvc/Model/Resultset/Simple.zep b/phalcon/Mvc/Model/Resultset/Simple.zep index bd1e7445706..b0c0e234cf4 100644 --- a/phalcon/Mvc/Model/Resultset/Simple.zep +++ b/phalcon/Mvc/Model/Resultset/Simple.zep @@ -323,4 +323,14 @@ class Simple extends Resultset let this->keepSnapshots = keepSnapshots; } } + + public function __serialize() -> array + { + return []; + } + + public function __unserialize(array data) -> void + { + // Nothing here + } } From 72b26526f568bc73f7d931f558e542ca813ca624 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 24 Apr 2022 15:50:19 +0100 Subject: [PATCH 48/91] #15598 - Adjust tests for PHP7.4 --- tests/cli/Cli/Router/HandleCest.php | 3 ++- tests/cli/Cli/Router/SetDefaultModuleCest.php | 2 +- tests/cli/Cli/Router/SetDefaultsCest.php | 3 ++- tests/unit/Application/GetSetDefaultModuleCest.php | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/cli/Cli/Router/HandleCest.php b/tests/cli/Cli/Router/HandleCest.php index ae2a375f8db..7172e83e6e4 100644 --- a/tests/cli/Cli/Router/HandleCest.php +++ b/tests/cli/Cli/Router/HandleCest.php @@ -35,7 +35,8 @@ public function cliRouterHandle(CliTester $I) $router->handle( [] ); - $I->assertNull( + $I->assertSame( + '', $router->getModuleName() ); $I->assertNull( diff --git a/tests/cli/Cli/Router/SetDefaultModuleCest.php b/tests/cli/Cli/Router/SetDefaultModuleCest.php index f1c0d745618..ee611d4d396 100644 --- a/tests/cli/Cli/Router/SetDefaultModuleCest.php +++ b/tests/cli/Cli/Router/SetDefaultModuleCest.php @@ -29,7 +29,7 @@ public function cliRouterSetDefaultModule(CliTester $I) $I->wantToTest('Cli\Router - setDefaultModule()'); $router = new Router(false); - $I->assertNull($router->getModuleName()); + $I->assertSame('', $router->getModuleName()); $router->handle(""); $I->assertNull($router->getModuleName()); $router->setDefaultModule("test"); diff --git a/tests/cli/Cli/Router/SetDefaultsCest.php b/tests/cli/Cli/Router/SetDefaultsCest.php index dbab3fb9b35..cd139b80229 100644 --- a/tests/cli/Cli/Router/SetDefaultsCest.php +++ b/tests/cli/Cli/Router/SetDefaultsCest.php @@ -32,7 +32,8 @@ public function cliRouterSetDefaults(CliTester $I) $router->handle( [] ); - $I->assertNull( + $I->assertSame( + '', $router->getModuleName() ); $I->assertNull( diff --git a/tests/unit/Application/GetSetDefaultModuleCest.php b/tests/unit/Application/GetSetDefaultModuleCest.php index e11e4a61442..46b4ed12adf 100644 --- a/tests/unit/Application/GetSetDefaultModuleCest.php +++ b/tests/unit/Application/GetSetDefaultModuleCest.php @@ -38,7 +38,7 @@ public function applicationGetSetDefaultModule(UnitTester $I) $application = new ApplicationFixture(); $actual = $application->getDefaultModule(); - $I->assertNull($actual); + $I->assertSame('', $actual); $application->setDefaultModule('admin'); $expected = 'admin'; From eccaffe06c18cc96822d528d6dabbc7d6ca0d202 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 24 Apr 2022 15:50:40 +0100 Subject: [PATCH 49/91] #15598 - Mass rename `PsrExt` to `Psr` --- phalcon/DataMapper/Pdo/Profiler/MemoryLogger.zep | 2 +- phalcon/DataMapper/Pdo/Profiler/Profiler.zep | 4 ++-- phalcon/DataMapper/Pdo/Profiler/ProfilerInterface.zep | 2 +- phalcon/Html/Link/Serializer/Header.zep | 2 +- phalcon/Http/Message/AbstractMessage.zep | 4 ++-- phalcon/Http/Message/AbstractRequest.zep | 2 +- phalcon/Http/Message/Request.zep | 6 +++--- phalcon/Http/Message/RequestFactory.zep | 6 +++--- phalcon/Http/Message/Response.zep | 2 +- phalcon/Http/Message/ResponseFactory.zep | 4 ++-- phalcon/Http/Message/ServerRequest.zep | 8 ++++---- phalcon/Http/Message/ServerRequestFactory.zep | 8 ++++---- phalcon/Http/Message/Stream.zep | 2 +- phalcon/Http/Message/StreamFactory.zep | 4 ++-- phalcon/Http/Message/UploadedFile.zep | 4 ++-- phalcon/Http/Message/UploadedFileFactory.zep | 6 +++--- phalcon/Http/Message/Uri.zep | 2 +- phalcon/Http/Message/UriFactory.zep | 4 ++-- phalcon/Http/Server/AbstractMiddleware.zep | 8 ++++---- phalcon/Http/Server/AbstractRequestHandler.zep | 6 +++--- 20 files changed, 43 insertions(+), 43 deletions(-) diff --git a/phalcon/DataMapper/Pdo/Profiler/MemoryLogger.zep b/phalcon/DataMapper/Pdo/Profiler/MemoryLogger.zep index 605f57dd57a..d9adbfafe22 100644 --- a/phalcon/DataMapper/Pdo/Profiler/MemoryLogger.zep +++ b/phalcon/DataMapper/Pdo/Profiler/MemoryLogger.zep @@ -15,7 +15,7 @@ namespace Phalcon\DataMapper\Pdo\Profiler; -use PsrExt\Log\AbstractLogger; +use Psr\Log\AbstractLogger; /** * A naive memory-based logger. diff --git a/phalcon/DataMapper/Pdo/Profiler/Profiler.zep b/phalcon/DataMapper/Pdo/Profiler/Profiler.zep index b7afbf81f7e..b0b478f3139 100644 --- a/phalcon/DataMapper/Pdo/Profiler/Profiler.zep +++ b/phalcon/DataMapper/Pdo/Profiler/Profiler.zep @@ -17,8 +17,8 @@ namespace Phalcon\DataMapper\Pdo\Profiler; use InvalidArgumentException; // @todo this will also be removed when traits are available use Phalcon\DataMapper\Pdo\Exception\Exception; -use PsrExt\Log\LoggerInterface; -use PsrExt\Log\LogLevel; +use Psr\Log\LoggerInterface; +use Psr\Log\LogLevel; /** * Sends query profiles to a logger. diff --git a/phalcon/DataMapper/Pdo/Profiler/ProfilerInterface.zep b/phalcon/DataMapper/Pdo/Profiler/ProfilerInterface.zep index c855d5fda93..c71ae1b4cda 100644 --- a/phalcon/DataMapper/Pdo/Profiler/ProfilerInterface.zep +++ b/phalcon/DataMapper/Pdo/Profiler/ProfilerInterface.zep @@ -15,7 +15,7 @@ namespace Phalcon\DataMapper\Pdo\Profiler; -use PsrExt\Log\LoggerInterface; +use Psr\Log\LoggerInterface; /** * Interface to send query profiles to a logger. diff --git a/phalcon/Html/Link/Serializer/Header.zep b/phalcon/Html/Link/Serializer/Header.zep index f21a3301ed6..9cb1a611fd4 100644 --- a/phalcon/Html/Link/Serializer/Header.zep +++ b/phalcon/Html/Link/Serializer/Header.zep @@ -10,7 +10,7 @@ namespace Phalcon\Html\Link\Serializer; -use PsrExt\Link\EvolvableLinkInterface; +use Psr\Link\EvolvableLinkInterface; /** * Class Phalcon\Http\Link\Serializer\Header diff --git a/phalcon/Http/Message/AbstractMessage.zep b/phalcon/Http/Message/AbstractMessage.zep index 1c2ea4725f7..5793596d047 100644 --- a/phalcon/Http/Message/AbstractMessage.zep +++ b/phalcon/Http/Message/AbstractMessage.zep @@ -17,8 +17,8 @@ namespace Phalcon\Http\Message; use Phalcon\Support\Collection; use Phalcon\Support\Collection\CollectionInterface; use Phalcon\Http\Message\Exception\InvalidArgumentException; -use PsrExt\Http\Message\StreamInterface; -use PsrExt\Http\Message\UriInterface; +use Psr\Http\Message\StreamInterface; +use Psr\Http\Message\UriInterface; /** * Message methods diff --git a/phalcon/Http/Message/AbstractRequest.zep b/phalcon/Http/Message/AbstractRequest.zep index 36dd2dc8647..3bf9f831111 100644 --- a/phalcon/Http/Message/AbstractRequest.zep +++ b/phalcon/Http/Message/AbstractRequest.zep @@ -15,7 +15,7 @@ namespace Phalcon\Http\Message; use Phalcon\Http\Message\Exception\InvalidArgumentException; -use PsrExt\Http\Message\UriInterface; +use Psr\Http\Message\UriInterface; /** * Request methods diff --git a/phalcon/Http/Message/Request.zep b/phalcon/Http/Message/Request.zep index e6bd432c797..0713c85cda0 100644 --- a/phalcon/Http/Message/Request.zep +++ b/phalcon/Http/Message/Request.zep @@ -16,9 +16,9 @@ namespace Phalcon\Http\Message; use Phalcon\Http\Message\Stream\Input; use Phalcon\Http\Message\AbstractRequest; -use PsrExt\Http\Message\RequestInterface; -use PsrExt\Http\Message\StreamInterface; -use PsrExt\Http\Message\UriInterface; +use Psr\Http\Message\RequestInterface; +use Psr\Http\Message\StreamInterface; +use Psr\Http\Message\UriInterface; /** * PSR-7 Request diff --git a/phalcon/Http/Message/RequestFactory.zep b/phalcon/Http/Message/RequestFactory.zep index 73c2ca57566..04d9ea2f891 100644 --- a/phalcon/Http/Message/RequestFactory.zep +++ b/phalcon/Http/Message/RequestFactory.zep @@ -14,9 +14,9 @@ namespace Phalcon\Http\Message; -use PsrExt\Http\Message\RequestInterface; -use PsrExt\Http\Message\RequestFactoryInterface; -use PsrExt\Http\Message\UriInterface; +use Psr\Http\Message\RequestInterface; +use Psr\Http\Message\RequestFactoryInterface; +use Psr\Http\Message\UriInterface; /** * PSR-17 RequestFactory diff --git a/phalcon/Http/Message/Response.zep b/phalcon/Http/Message/Response.zep index 318b6b89d33..bfba95189f8 100644 --- a/phalcon/Http/Message/Response.zep +++ b/phalcon/Http/Message/Response.zep @@ -16,7 +16,7 @@ namespace Phalcon\Http\Message; use Phalcon\Http\Message\AbstractMessage; use Phalcon\Http\Message\Exception\InvalidArgumentException; -use PsrExt\Http\Message\ResponseInterface; +use Psr\Http\Message\ResponseInterface; /** * PSR-7 Response diff --git a/phalcon/Http/Message/ResponseFactory.zep b/phalcon/Http/Message/ResponseFactory.zep index 0660e74b3a8..a7e8370ca84 100644 --- a/phalcon/Http/Message/ResponseFactory.zep +++ b/phalcon/Http/Message/ResponseFactory.zep @@ -14,8 +14,8 @@ namespace Phalcon\Http\Message; -use PsrExt\Http\Message\ResponseInterface; -use PsrExt\Http\Message\ResponseFactoryInterface; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ResponseFactoryInterface; /** * PSR-17 ResponseFactory diff --git a/phalcon/Http/Message/ServerRequest.zep b/phalcon/Http/Message/ServerRequest.zep index 775507e7680..c617e7446ae 100644 --- a/phalcon/Http/Message/ServerRequest.zep +++ b/phalcon/Http/Message/ServerRequest.zep @@ -18,10 +18,10 @@ use Phalcon\Support\Collection; use Phalcon\Support\Collection\CollectionInterface; use Phalcon\Http\Message\Exception\InvalidArgumentException; use Phalcon\Http\Message\Stream\Input; -use PsrExt\Http\Message\ServerRequestInterface; -use PsrExt\Http\Message\StreamInterface; -use PsrExt\Http\Message\UploadedFileInterface; -use PsrExt\Http\Message\UriInterface; +use Psr\Http\Message\ServerRequestInterface; +use Psr\Http\Message\StreamInterface; +use Psr\Http\Message\UploadedFileInterface; +use Psr\Http\Message\UriInterface; /** * PSR-7 ServerRequest diff --git a/phalcon/Http/Message/ServerRequestFactory.zep b/phalcon/Http/Message/ServerRequestFactory.zep index c3b967d4a61..f850a0a0f3f 100644 --- a/phalcon/Http/Message/ServerRequestFactory.zep +++ b/phalcon/Http/Message/ServerRequestFactory.zep @@ -17,10 +17,10 @@ namespace Phalcon\Http\Message; use Phalcon\Support\Collection; use Phalcon\Support\Collection\CollectionInterface; use Phalcon\Http\Message\Exception\InvalidArgumentException; -use PsrExt\Http\Message\ServerRequestFactoryInterface; -use PsrExt\Http\Message\ServerRequestInterface; -use PsrExt\Http\Message\UriInterface; -use PsrExt\Http\Message\UploadedFileInterface; +use Psr\Http\Message\ServerRequestFactoryInterface; +use Psr\Http\Message\ServerRequestInterface; +use Psr\Http\Message\UriInterface; +use Psr\Http\Message\UploadedFileInterface; /** * PSR-17 ServerRequestFactory diff --git a/phalcon/Http/Message/Stream.zep b/phalcon/Http/Message/Stream.zep index 433ce12633d..7e856b081e9 100644 --- a/phalcon/Http/Message/Stream.zep +++ b/phalcon/Http/Message/Stream.zep @@ -15,7 +15,7 @@ namespace Phalcon\Http\Message; use Exception; -use PsrExt\Http\Message\StreamInterface; +use Psr\Http\Message\StreamInterface; use RuntimeException; /** diff --git a/phalcon/Http/Message/StreamFactory.zep b/phalcon/Http/Message/StreamFactory.zep index 3e014c27ad0..7f7894bd5d6 100644 --- a/phalcon/Http/Message/StreamFactory.zep +++ b/phalcon/Http/Message/StreamFactory.zep @@ -15,8 +15,8 @@ namespace Phalcon\Http\Message; use Phalcon\Http\Message\Exception\InvalidArgumentException; -use PsrExt\Http\Message\StreamFactoryInterface; -use PsrExt\Http\Message\StreamInterface; +use Psr\Http\Message\StreamFactoryInterface; +use Psr\Http\Message\StreamInterface; /** * PSR-17 StreamFactory diff --git a/phalcon/Http/Message/UploadedFile.zep b/phalcon/Http/Message/UploadedFile.zep index fc84b0cdc80..054d60367a4 100644 --- a/phalcon/Http/Message/UploadedFile.zep +++ b/phalcon/Http/Message/UploadedFile.zep @@ -15,8 +15,8 @@ namespace Phalcon\Http\Message; use Phalcon\Http\Message\Exception\InvalidArgumentException; -use PsrExt\Http\Message\StreamInterface; -use PsrExt\Http\Message\UploadedFileInterface; +use Psr\Http\Message\StreamInterface; +use Psr\Http\Message\UploadedFileInterface; use RuntimeException; /** diff --git a/phalcon/Http/Message/UploadedFileFactory.zep b/phalcon/Http/Message/UploadedFileFactory.zep index 5bcae6de3e3..62804bb17a8 100644 --- a/phalcon/Http/Message/UploadedFileFactory.zep +++ b/phalcon/Http/Message/UploadedFileFactory.zep @@ -14,9 +14,9 @@ namespace Phalcon\Http\Message; -use PsrExt\Http\Message\StreamInterface; -use PsrExt\Http\Message\UploadedFileInterface; -use PsrExt\Http\Message\UploadedFileFactoryInterface; +use Psr\Http\Message\StreamInterface; +use Psr\Http\Message\UploadedFileInterface; +use Psr\Http\Message\UploadedFileFactoryInterface; /** * PSR-17 UploadedFileFactory diff --git a/phalcon/Http/Message/Uri.zep b/phalcon/Http/Message/Uri.zep index d59cc4cffb8..04043c92471 100644 --- a/phalcon/Http/Message/Uri.zep +++ b/phalcon/Http/Message/Uri.zep @@ -15,7 +15,7 @@ namespace Phalcon\Http\Message; use Phalcon\Http\Message\Exception\InvalidArgumentException; -use PsrExt\Http\Message\UriInterface; +use Psr\Http\Message\UriInterface; /** * PSR-7 Uri diff --git a/phalcon/Http/Message/UriFactory.zep b/phalcon/Http/Message/UriFactory.zep index 5f71b3fe497..04389cf684b 100644 --- a/phalcon/Http/Message/UriFactory.zep +++ b/phalcon/Http/Message/UriFactory.zep @@ -14,8 +14,8 @@ namespace Phalcon\Http\Message; -use PsrExt\Http\Message\UriFactoryInterface; -use PsrExt\Http\Message\UriInterface; +use Psr\Http\Message\UriFactoryInterface; +use Psr\Http\Message\UriInterface; /** * PSR-17 UriFactory diff --git a/phalcon/Http/Server/AbstractMiddleware.zep b/phalcon/Http/Server/AbstractMiddleware.zep index 56a360760c8..2cb7bc9b3b4 100644 --- a/phalcon/Http/Server/AbstractMiddleware.zep +++ b/phalcon/Http/Server/AbstractMiddleware.zep @@ -10,10 +10,10 @@ namespace Phalcon\Http\Server; -use PsrExt\Http\Message\ResponseInterface; -use PsrExt\Http\Message\ServerRequestInterface; -use PsrExt\Http\Server\MiddlewareInterface; -use PsrExt\Http\Server\RequestHandlerInterface; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; +use Psr\Http\Server\MiddlewareInterface; +use Psr\Http\Server\RequestHandlerInterface; /** * Participant in processing a server request and response. diff --git a/phalcon/Http/Server/AbstractRequestHandler.zep b/phalcon/Http/Server/AbstractRequestHandler.zep index 63d8c30d052..a19f8f41eaf 100644 --- a/phalcon/Http/Server/AbstractRequestHandler.zep +++ b/phalcon/Http/Server/AbstractRequestHandler.zep @@ -10,9 +10,9 @@ namespace Phalcon\Http\Server; -use PsrExt\Http\Message\ResponseInterface; -use PsrExt\Http\Message\ServerRequestInterface; -use PsrExt\Http\Server\RequestHandlerInterface; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; +use Psr\Http\Server\RequestHandlerInterface; /** * Handles a server request and produces a response. From 0858f36a418bb5730145116e5ba7dc3e0e9d8a31 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 24 Apr 2022 15:51:06 +0100 Subject: [PATCH 50/91] #15598 - Add PSR-4 for CLI tests --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 66ee8df505d..74856190e3f 100644 --- a/composer.json +++ b/composer.json @@ -81,6 +81,7 @@ "autoload-dev": { "psr-4": { "Zephir\\Optimizers\\FunctionCall\\": "optimizers/", + "Phalcon\\Tests\\Cli\\": "tests/cli/", "Phalcon\\Tests\\Unit\\": "tests/unit/", "Phalcon\\Tests\\Integration\\": "tests/integration/", "Phalcon\\Tests\\Database\\": "tests/database/", From 3cb51794ea9f1920550985967d7d46219102627f Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 24 Apr 2022 15:53:55 +0100 Subject: [PATCH 51/91] Revert "#15598 - Remove `install-zephir.sh` unused bash script" This reverts commit 4096059211955eeccf2b0777fb848f6262734558. --- .ci/install-zephir.sh | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100755 .ci/install-zephir.sh diff --git a/.ci/install-zephir.sh b/.ci/install-zephir.sh new file mode 100755 index 00000000000..e1040a952c2 --- /dev/null +++ b/.ci/install-zephir.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env bash +# +# This file is part of the Phalcon Framework. +# +# (c) Phalcon Team +# +# For the full copyright and license information, please view the +# LICENSE.txt file that was distributed with this source code. + +# TODO: Move Zephir installation to composer.json + +: "${ZEPHIR_VERSION:=master}" +: "${DEFAULT_COMPOSER_FLAGS:=}" + +mkdir -p "$HOME/bin" +if [[ ! $ZEPHIR_VERSION =~ ^(master|development)$ ]]; then + wget \ + --no-clobber \ + -O "$HOME/bin/zephir" \ + "https://github.com/phalcon/zephir/releases/download/$ZEPHIR_VERSION/zephir.phar" + chmod +x "$HOME/bin/zephir" + exit 0 +fi + +git clone -b "$ZEPHIR_VERSION" --depth 1 -q https://github.com/phalcon/zephir +pushd zephir 1>/dev/null || exit 1 + +# Executes the command in a subshell. +# It inherits everything from the calling script but does not +# transmit any change back. +(eval "composer install $DEFAULT_COMPOSER_FLAGS") + +ln -s "$(pwd)/zephir" "$HOME/bin/zephir" + +popd 1>/dev/null || exit 1 From 3802febcf61ac9d382131a11f7af7beb02cbd5bf Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Thu, 19 May 2022 22:28:29 +0100 Subject: [PATCH 52/91] Update Dockerfiles --- docker/7.4/Dockerfile | 1 - docker/8.0/Dockerfile | 1 - docker/8.1/Dockerfile | 4 +--- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/docker/7.4/Dockerfile b/docker/7.4/Dockerfile index 6686860a17e..a6edf645c15 100644 --- a/docker/7.4/Dockerfile +++ b/docker/7.4/Dockerfile @@ -13,7 +13,6 @@ ENV MY_USER="phalcon" \ MY_UID="1000" \ MY_GID="1000" \ PHP_VERSION="7.4" \ - PSR_VERSION="1.1.0" \ LANG=en_US.UTF-8 \ LANGUAGE=en_US.UTF-8 \ LC_ALL=en_US.UTF-8 diff --git a/docker/8.0/Dockerfile b/docker/8.0/Dockerfile index 99b810d763e..de851823954 100644 --- a/docker/8.0/Dockerfile +++ b/docker/8.0/Dockerfile @@ -13,7 +13,6 @@ ENV MY_USER="phalcon" \ MY_UID="1000" \ MY_GID="1000" \ PHP_VERSION="8.0" \ - PSR_VERSION="1.1.0" \ LANG=en_US.UTF-8 \ LANGUAGE=en_US.UTF-8 \ LC_ALL=en_US.UTF-8 diff --git a/docker/8.1/Dockerfile b/docker/8.1/Dockerfile index ef5e423099c..b9fb4d8dec9 100644 --- a/docker/8.1/Dockerfile +++ b/docker/8.1/Dockerfile @@ -44,8 +44,7 @@ RUN apt update -y && \ # PECL Packages RUN pecl install -o -f redis && \ - pecl install psr \ - igbinary \ + pecl install igbinary \ msgpack \ apcu \ yaml \ @@ -77,7 +76,6 @@ RUN docker-php-ext-install \ # Install PHP extensions RUN docker-php-ext-enable \ - psr \ redis \ igbinary \ msgpack \ From f2b7efab820139aa157204f5df7d8e76bf5b614f Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Thu, 19 May 2022 22:29:06 +0100 Subject: [PATCH 53/91] #15598 - Update vlucas/phpdotenv min version --- composer.json | 2 +- composer.lock | 167 +++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 153 insertions(+), 16 deletions(-) diff --git a/composer.json b/composer.json index f24039e4abc..433add2571c 100644 --- a/composer.json +++ b/composer.json @@ -57,7 +57,7 @@ "squizlabs/php_codesniffer": "^3.4", "twig/twig": "~1.36", "vimeo/psalm": "^4.7", - "vlucas/phpdotenv": "^2.5" + "vlucas/phpdotenv": "^v5.4" }, "config": { "optimize-autoloader": true, diff --git a/composer.lock b/composer.lock index fe6aba18a3a..3d29c93155e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b9849825d5336d0f718147ef1e78cbfd", + "content-hash": "cadb55c7b26af4d96bb0dc98963cd5be", "packages": [], "packages-dev": [ { @@ -1751,6 +1751,68 @@ ], "time": "2022-03-18T17:20:59+00:00" }, + { + "name": "graham-campbell/result-type", + "version": "v1.0.4", + "source": { + "type": "git", + "url": "https://github.com/GrahamCampbell/Result-Type.git", + "reference": "0690bde05318336c7221785f2a932467f98b64ca" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/0690bde05318336c7221785f2a932467f98b64ca", + "reference": "0690bde05318336c7221785f2a932467f98b64ca", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^8.0", + "phpoption/phpoption": "^1.8" + }, + "require-dev": { + "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8" + }, + "type": "library", + "autoload": { + "psr-4": { + "GrahamCampbell\\ResultType\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + } + ], + "description": "An Implementation Of The Result Type", + "keywords": [ + "Graham Campbell", + "GrahamCampbell", + "Result Type", + "Result-Type", + "result" + ], + "support": { + "issues": "https://github.com/GrahamCampbell/Result-Type/issues", + "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.0.4" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/graham-campbell/result-type", + "type": "tidelift" + } + ], + "time": "2021-11-21T21:41:47+00:00" + }, { "name": "guzzlehttp/guzzle", "version": "7.4.2", @@ -2925,6 +2987,77 @@ }, "time": "2022-03-15T21:29:03+00:00" }, + { + "name": "phpoption/phpoption", + "version": "1.8.1", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/php-option.git", + "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15", + "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^8.0" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.4.1", + "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.8-dev" + } + }, + "autoload": { + "psr-4": { + "PhpOption\\": "src/PhpOption/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh" + }, + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + } + ], + "description": "Option Type for PHP", + "keywords": [ + "language", + "option", + "php", + "type" + ], + "support": { + "issues": "https://github.com/schmittjoh/php-option/issues", + "source": "https://github.com/schmittjoh/php-option/tree/1.8.1" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption", + "type": "tidelift" + } + ], + "time": "2021-12-04T23:24:31+00:00" + }, { "name": "phpspec/prophecy", "version": "v1.15.0", @@ -6553,35 +6686,39 @@ }, { "name": "vlucas/phpdotenv", - "version": "v2.6.9", + "version": "v5.4.1", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "2e93cc98e2e8e869f8d9cfa61bb3a99ba4fc4141" + "reference": "264dce589e7ce37a7ba99cb901eed8249fbec92f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2e93cc98e2e8e869f8d9cfa61bb3a99ba4fc4141", - "reference": "2e93cc98e2e8e869f8d9cfa61bb3a99ba4fc4141", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/264dce589e7ce37a7ba99cb901eed8249fbec92f", + "reference": "264dce589e7ce37a7ba99cb901eed8249fbec92f", "shasum": "" }, "require": { - "php": "^5.3.9 || ^7.0 || ^8.0", - "symfony/polyfill-ctype": "^1.17" + "ext-pcre": "*", + "graham-campbell/result-type": "^1.0.2", + "php": "^7.1.3 || ^8.0", + "phpoption/phpoption": "^1.8", + "symfony/polyfill-ctype": "^1.23", + "symfony/polyfill-mbstring": "^1.23.1", + "symfony/polyfill-php80": "^1.23.1" }, "require-dev": { + "bamarni/composer-bin-plugin": "^1.4.1", "ext-filter": "*", - "ext-pcre": "*", - "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.21" + "phpunit/phpunit": "^7.5.20 || ^8.5.21 || ^9.5.10" }, "suggest": { - "ext-filter": "Required to use the boolean validator.", - "ext-pcre": "Required to use most of the library." + "ext-filter": "Required to use the boolean validator." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "5.4-dev" } }, "autoload": { @@ -6613,7 +6750,7 @@ ], "support": { "issues": "https://github.com/vlucas/phpdotenv/issues", - "source": "https://github.com/vlucas/phpdotenv/tree/v2.6.9" + "source": "https://github.com/vlucas/phpdotenv/tree/v5.4.1" }, "funding": [ { @@ -6625,7 +6762,7 @@ "type": "tidelift" } ], - "time": "2021-12-12T22:59:22+00:00" + "time": "2021-12-12T23:22:04+00:00" }, { "name": "webmozart/assert", @@ -6762,5 +6899,5 @@ "ext-sqlite3": "*", "ext-xml": "*" }, - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.1.0" } From e1075fb257cb181f425df86a752c7c38161f993c Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Thu, 19 May 2022 22:30:20 +0100 Subject: [PATCH 54/91] #15598 - Regenerate ext/ directory --- ext/kernel/file.c | 12 ++ ext/kernel/main.c | 6 +- ext/kernel/require.c | 23 +- .../application/abstractapplication.zep.c | 4 +- ext/phalcon/cli/router.zep.c | 4 +- ext/phalcon/filter/sanitize/stringval.zep.c | 61 +++++- ext/phalcon/mvc/micro.zep.c | 69 +++--- ext/phalcon/mvc/model.zep.c | 113 ++++++---- ext/phalcon/mvc/model.zep.h | 22 +- .../mvc/model/behavior/timestampable.zep.c | 4 +- ext/phalcon/mvc/model/binder.zep.c | 6 +- ext/phalcon/mvc/model/criteria.zep.c | 8 +- ext/phalcon/mvc/model/manager.zep.c | 30 +-- ext/phalcon/mvc/model/metadata/stream.zep.c | 4 +- ext/phalcon/mvc/model/query.zep.c | 202 +++++++++--------- ext/phalcon/mvc/model/query/builder.zep.c | 60 +++--- ext/phalcon/mvc/model/resultset.zep.c | 3 +- ext/phalcon/mvc/model/resultset.zep.h | 6 +- ext/phalcon/mvc/model/resultset/complex.zep.c | 51 ++++- ext/phalcon/mvc/model/resultset/complex.zep.h | 22 +- ext/phalcon/mvc/model/resultset/simple.zep.c | 33 +++ ext/phalcon/mvc/model/resultset/simple.zep.h | 12 ++ ext/phalcon/mvc/model/row.zep.c | 39 ++-- ext/phalcon/mvc/model/transaction.zep.c | 4 +- .../mvc/model/transaction/manager.zep.c | 6 +- ext/phalcon/mvc/router.zep.c | 4 +- ext/phalcon/mvc/router/annotations.zep.c | 44 ++-- ext/phalcon/mvc/router/group.zep.c | 2 +- ext/phalcon/mvc/url.zep.c | 2 +- ext/phalcon/mvc/view.zep.c | 18 +- ext/phalcon/mvc/view/engine/php.zep.c | 4 +- ext/phalcon/mvc/view/engine/volt.zep.c | 20 +- .../mvc/view/engine/volt/compiler.zep.c | 144 ++++++------- ext/phalcon/mvc/view/simple.zep.c | 12 +- .../paginator/adapter/nativearray.zep.c | 2 +- .../session/adapter/abstractadapter.zep.h | 12 +- ext/phalcon/session/adapter/noop.zep.h | 12 +- ext/phalcon/session/adapter/stream.zep.c | 31 +-- ext/phalcon/session/adapter/stream.zep.h | 12 +- ext/phalcon/session/manager.zep.c | 2 +- ext/phalcon/storage/serializer/base64.zep.h | 9 +- ext/phalcon/storage/serializer/igbinary.zep.h | 9 +- ext/phalcon/storage/serializer/json.zep.h | 9 +- ext/phalcon/storage/serializer/none.zep.h | 9 +- ext/phalcon/storage/serializer/php.zep.h | 9 +- ext/phalcon/support/collection.zep.h | 25 ++- ext/phalcon/support/debug.zep.c | 2 +- ext/phalcon/support/debug/dump.zep.c | 2 +- ext/phalcon/support/helper/arr/first.zep.c | 2 +- .../support/helper/arr/sliceleft.zep.c | 2 +- .../support/helper/arr/sliceright.zep.c | 2 +- ext/phalcon/support/helper/str/concat.zep.c | 6 +- ext/phalcon/tag.zep.c | 4 +- ext/php_phalcon.h | 2 +- 54 files changed, 774 insertions(+), 443 deletions(-) diff --git a/ext/kernel/file.c b/ext/kernel/file.c index a0540f7d837..83237c4faef 100644 --- a/ext/kernel/file.c +++ b/ext/kernel/file.c @@ -65,7 +65,13 @@ int zephir_file_exists(zval *filename) return FAILURE; } +#if PHP_VERSION_ID >= 80100 + zend_string *file = zend_string_init(Z_STRVAL_P(filename), Z_STRLEN_P(filename), 0); + php_stat(file, FS_EXISTS, &return_value); + zval_ptr_dtor(file); +#else php_stat(Z_STRVAL_P(filename), (php_stat_len) Z_STRLEN_P(filename), FS_EXISTS, &return_value); +#endif if (Z_TYPE(return_value) != IS_TRUE) { return FAILURE; @@ -288,7 +294,13 @@ void zephir_file_put_contents(zval *return_value, zval *filename, zval *data) void zephir_filemtime(zval *return_value, zval *path) { if (EXPECTED(Z_TYPE_P(path) == IS_STRING)) { +#if PHP_VERSION_ID >= 80100 + zend_string *file = zend_string_init(Z_STRVAL_P(path), Z_STRLEN_P(path), 0); + php_stat(file, FS_MTIME, return_value); + zval_ptr_dtor(file); +#else php_stat(Z_STRVAL_P(path), (php_stat_len)(Z_STRLEN_P(path)), FS_MTIME, return_value); +#endif } else { ZVAL_FALSE(return_value); } diff --git a/ext/kernel/main.c b/ext/kernel/main.c index 8014a651454..95eba881d15 100644 --- a/ext/kernel/main.c +++ b/ext/kernel/main.c @@ -151,7 +151,7 @@ void zephir_fast_count(zval *result, zval *value) } } - if (instanceof_function(Z_OBJCE_P(value), spl_ce_Countable)) { + if (instanceof_function(Z_OBJCE_P(value), zend_ce_countable)) { #if PHP_VERSION_ID >= 80000 zend_call_method_with_0_params(Z_OBJ_P(value), NULL, NULL, "count", &retval); #else @@ -201,7 +201,7 @@ int zephir_fast_count_ev(zval *value) return (int) count > 0; } - if (instanceof_function(Z_OBJCE_P(value), spl_ce_Countable)) { + if (instanceof_function(Z_OBJCE_P(value), zend_ce_countable)) { #if PHP_VERSION_ID >= 80000 zend_call_method_with_0_params(Z_OBJ_P(value), NULL, NULL, "count", &retval); #else @@ -249,7 +249,7 @@ int zephir_fast_count_int(zval *value) return (int) count; } - if (instanceof_function(Z_OBJCE_P(value), spl_ce_Countable)) { + if (instanceof_function(Z_OBJCE_P(value), zend_ce_countable)) { #if PHP_VERSION_ID >= 80000 zend_call_method_with_0_params(Z_OBJ_P(value), NULL, NULL, "count", &retval); #else diff --git a/ext/kernel/require.c b/ext/kernel/require.c index 96160ba4ef3..98125c93847 100644 --- a/ext/kernel/require.c +++ b/ext/kernel/require.c @@ -45,14 +45,22 @@ int zephir_require_ret(zval *return_value_ptr, const char *require_path) } #endif - ret = php_stream_open_for_zend_ex(require_path, &file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE); +#if PHP_VERSION_ID >= 80100 + zend_string *zend_string_path = zend_string_init(require_path, strlen(require_path), 0); + + zend_stream_init_filename_ex(&file_handle, zend_string_path); + ret = php_stream_open_for_zend_ex(&file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE); + + zval_ptr_dtor(zend_string_path); +#else + ret = php_stream_open_for_zend_ex(require_path, &file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE); +#endif if (ret != SUCCESS) { return FAILURE; } new_op_array = zend_compile_file(&file_handle, ZEND_REQUIRE); if (new_op_array) { - if (file_handle.handle.stream.handle) { ZVAL_NULL(&dummy); if (!file_handle.opened_path) { @@ -110,7 +118,16 @@ int zephir_require_once_ret(zval *return_value_ptr, const char *require_path) } #endif - ret = php_stream_open_for_zend_ex(require_path, &file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE); +#if PHP_VERSION_ID >= 80100 + zend_string *zend_string_path = zend_string_init(require_path, strlen(require_path), 0); + + zend_stream_init_filename_ex(&file_handle, zend_string_path); + ret = php_stream_open_for_zend_ex(&file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE); + + zval_ptr_dtor(zend_string_path); +#else + ret = php_stream_open_for_zend_ex(require_path, &file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE); +#endif if (ret != SUCCESS) { return FAILURE; } diff --git a/ext/phalcon/application/abstractapplication.zep.c b/ext/phalcon/application/abstractapplication.zep.c index 16ec0427cc1..081b454d8c5 100644 --- a/ext/phalcon/application/abstractapplication.zep.c +++ b/ext/phalcon/application/abstractapplication.zep.c @@ -42,9 +42,9 @@ ZEPHIR_INIT_CLASS(Phalcon_Application_AbstractApplication) */ zend_declare_property_null(phalcon_application_abstractapplication_ce, SL("container"), ZEND_ACC_PROTECTED); /** - * @var string|null + * @var string */ - zend_declare_property_null(phalcon_application_abstractapplication_ce, SL("defaultModule"), ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_application_abstractapplication_ce, SL("defaultModule"), "", ZEND_ACC_PROTECTED); /** * @var ManagerInterface|null */ diff --git a/ext/phalcon/cli/router.zep.c b/ext/phalcon/cli/router.zep.c index 5cb1c8372fe..34ddd957f96 100644 --- a/ext/phalcon/cli/router.zep.c +++ b/ext/phalcon/cli/router.zep.c @@ -63,9 +63,9 @@ ZEPHIR_INIT_CLASS(Phalcon_Cli_Router) */ zend_declare_property_null(phalcon_cli_router_ce, SL("defaultAction"), ZEND_ACC_PROTECTED); /** - * @var string|null + * @var string */ - zend_declare_property_null(phalcon_cli_router_ce, SL("defaultModule"), ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_cli_router_ce, SL("defaultModule"), "", ZEND_ACC_PROTECTED); /** * @var array */ diff --git a/ext/phalcon/filter/sanitize/stringval.zep.c b/ext/phalcon/filter/sanitize/stringval.zep.c index 460aa3e137e..56c7527c448 100644 --- a/ext/phalcon/filter/sanitize/stringval.zep.c +++ b/ext/phalcon/filter/sanitize/stringval.zep.c @@ -12,8 +12,11 @@ #include #include "kernel/main.h" -#include "kernel/fcall.h" +#include "kernel/string.h" #include "kernel/memory.h" +#include "kernel/fcall.h" +#include "kernel/operators.h" +#include "kernel/array.h" #include "kernel/object.h" @@ -26,8 +29,6 @@ * file that was distributed with this source code. */ /** - * Phalcon\Filter\Sanitize\String - * * Sanitizes a value to string */ ZEPHIR_INIT_CLASS(Phalcon_Filter_Sanitize_StringVal) @@ -40,17 +41,27 @@ ZEPHIR_INIT_CLASS(Phalcon_Filter_Sanitize_StringVal) /** * @param mixed $input The text to sanitize * - * @return string + * @return string|false */ PHP_METHOD(Phalcon_Filter_Sanitize_StringVal, __invoke) { + zval _7, _8; + zval _2; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *input, input_sub, _0; + zval *input = NULL, input_sub, _0, _1, _3, _4, _5, _6; zval *this_ptr = getThis(); ZVAL_UNDEF(&input_sub); ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_4); + ZVAL_UNDEF(&_5); + ZVAL_UNDEF(&_6); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_7); + ZVAL_UNDEF(&_8); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -61,11 +72,45 @@ PHP_METHOD(Phalcon_Filter_Sanitize_StringVal, __invoke) ZEPHIR_MM_GROW(); zephir_fetch_params(1, 1, 0, &input); + ZEPHIR_SEPARATE_PARAM(input); - ZVAL_LONG(&_0, 513); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 278, input, &_0); + if (Z_TYPE_P(input) == IS_ARRAY) { + RETURN_MM_BOOL(0); + } + ZVAL_LONG(&_0, 0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 237, &_0); + zephir_check_call_status(); + zephir_cast_to_string(&_2, input); + ZEPHIR_INIT_VAR(&_3); + ZVAL_STRING(&_3, ""); + ZEPHIR_INIT_NVAR(input); + zephir_fast_str_replace(input, &_1, &_3, &_2); + ZEPHIR_INIT_VAR(&_4); + ZVAL_STRING(&_4, "/<[^>]*>?/"); + ZEPHIR_INIT_VAR(&_5); + ZVAL_STRING(&_5, ""); + ZEPHIR_CALL_FUNCTION(&_6, "preg_replace", NULL, 37, &_4, &_5, input); zephir_check_call_status(); - RETURN_MM(); + ZEPHIR_CPY_WRT(input, &_6); + ZEPHIR_INIT_VAR(&_7); + zephir_create_array(&_7, 2, 0); + ZEPHIR_INIT_NVAR(&_4); + ZVAL_STRING(&_4, "'"); + zephir_array_fast_append(&_7, &_4); + ZEPHIR_INIT_NVAR(&_4); + ZVAL_STRING(&_4, "\""); + zephir_array_fast_append(&_7, &_4); + ZEPHIR_INIT_VAR(&_8); + zephir_create_array(&_8, 2, 0); + ZEPHIR_INIT_NVAR(&_4); + ZVAL_STRING(&_4, "'"); + zephir_array_fast_append(&_8, &_4); + ZEPHIR_INIT_NVAR(&_4); + ZVAL_STRING(&_4, """); + zephir_array_fast_append(&_8, &_4); + ZEPHIR_INIT_NVAR(&_4); + zephir_fast_str_replace(&_4, &_7, &_8, input); + RETURN_CCTOR(&_4); } diff --git a/ext/phalcon/mvc/micro.zep.c b/ext/phalcon/mvc/micro.zep.c index 4ed5640f6f7..e4e88fa6018 100644 --- a/ext/phalcon/mvc/micro.zep.c +++ b/ext/phalcon/mvc/micro.zep.c @@ -1754,28 +1754,31 @@ PHP_METHOD(Phalcon_Mvc_Micro, notFound) /** * Check if a service is registered in the internal services container using * the array syntax + * + * @param mixed offset */ PHP_METHOD(Phalcon_Mvc_Micro, offsetExists) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *alias, alias_sub; + zval offset_sub; + zval *offset; zval *this_ptr = getThis(); - ZVAL_UNDEF(&alias_sub); + ZVAL_UNDEF(&offset_sub); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(alias) + Z_PARAM_ZVAL(offset) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &alias); + zephir_fetch_params(1, 1, 0, &offset); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "hasservice", NULL, 0, alias); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "hasservice", NULL, 0, offset); zephir_check_call_status(); RETURN_MM(); } @@ -1789,28 +1792,31 @@ PHP_METHOD(Phalcon_Mvc_Micro, offsetExists) * $app["request"] * ); *``` + * + * @param mixed offset */ PHP_METHOD(Phalcon_Mvc_Micro, offsetGet) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *alias, alias_sub; + zval offset_sub; + zval *offset; zval *this_ptr = getThis(); - ZVAL_UNDEF(&alias_sub); + ZVAL_UNDEF(&offset_sub); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(alias) + Z_PARAM_ZVAL(offset) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &alias); + zephir_fetch_params(1, 1, 0, &offset); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getservice", NULL, 0, alias); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getservice", NULL, 0, offset); zephir_check_call_status(); RETURN_MM(); } @@ -1827,25 +1833,26 @@ PHP_METHOD(Phalcon_Mvc_Micro, offsetSet) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *alias, alias_sub, *definition, definition_sub; + zval offset_sub, value_sub; + zval *offset, *value; zval *this_ptr = getThis(); - ZVAL_UNDEF(&alias_sub); - ZVAL_UNDEF(&definition_sub); + ZVAL_UNDEF(&offset_sub); + ZVAL_UNDEF(&value_sub); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_ZVAL(alias) - Z_PARAM_ZVAL(definition) + Z_PARAM_ZVAL(offset) + Z_PARAM_ZVAL(value) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 2, 0, &alias, &definition); + zephir_fetch_params(1, 2, 0, &offset, &value); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "setservice", NULL, 0, alias, definition); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setservice", NULL, 0, offset, value); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -1858,34 +1865,36 @@ PHP_METHOD(Phalcon_Mvc_Micro, offsetUnset) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *alias, alias_sub, container, _0; + zval offset_sub, _0, _2, _1$$3; + zval *offset; zval *this_ptr = getThis(); - ZVAL_UNDEF(&alias_sub); - ZVAL_UNDEF(&container); + ZVAL_UNDEF(&offset_sub); ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_1$$3); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(alias) + Z_PARAM_ZVAL(offset) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &alias); + zephir_fetch_params(1, 1, 0, &offset); zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CPY_WRT(&container, &_0); - if (Z_TYPE_P(&container) != IS_OBJECT) { - ZEPHIR_INIT_NVAR(&container); - object_init_ex(&container, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 408); + if (Z_TYPE_P(&_0) == IS_NULL) { + ZEPHIR_INIT_VAR(&_1$$3); + object_init_ex(&_1$$3, phalcon_di_factorydefault_ce); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 408); zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container); + zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &_1$$3); } - ZEPHIR_CALL_METHOD(NULL, &container, "remove", NULL, 413, alias); + zephir_read_property(&_2, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(NULL, &_2, "remove", NULL, 0, offset); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -2297,7 +2306,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, setService) } else { ZVAL_BOOL(&_0, 0); } - ZEPHIR_RETURN_CALL_METHOD(&container, "set", NULL, 414, &serviceName, definition, &_0); + ZEPHIR_RETURN_CALL_METHOD(&container, "set", NULL, 413, &serviceName, definition, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/mvc/model.zep.c b/ext/phalcon/mvc/model.zep.c index ec61456b51c..a9c03ffcd96 100644 --- a/ext/phalcon/mvc/model.zep.c +++ b/ext/phalcon/mvc/model.zep.c @@ -288,7 +288,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __call) zephir_get_arrval(&arguments, arguments_param); - ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 415, &method, &arguments); + ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 414, &method, &arguments); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&records)) { RETURN_CCTOR(&records); @@ -354,7 +354,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __callStatic) zephir_get_arrval(&arguments, arguments_param); - ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 415, &method, &arguments); + ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 414, &method, &arguments); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&records)) { RETURN_CCTOR(&records); @@ -696,7 +696,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __set) } } - ZEPHIR_CALL_METHOD(&_14, this_ptr, "possiblesetter", NULL, 416, &property, value); + ZEPHIR_CALL_METHOD(&_14, this_ptr, "possiblesetter", NULL, 415, &property, value); zephir_check_call_status(); if (zephir_is_true(&_14)) { RETVAL_ZVAL(value, 1, 0); @@ -1015,7 +1015,7 @@ PHP_METHOD(Phalcon_Mvc_Model, assign) _7$$12 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_7$$12) { - ZEPHIR_CALL_SELF(&_8$$13, "caseinsensitivecolumnmap", &_9, 417, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_8$$13, "caseinsensitivecolumnmap", &_9, 416, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_8$$13); } @@ -1047,7 +1047,7 @@ PHP_METHOD(Phalcon_Mvc_Model, assign) } _13$$18 = zephir_is_true(&disableAssignSetters); if (!(_13$$18)) { - ZEPHIR_CALL_METHOD(&_14$$18, this_ptr, "possiblesetter", &_15, 416, &attributeField, &value); + ZEPHIR_CALL_METHOD(&_14$$18, this_ptr, "possiblesetter", &_15, 415, &attributeField, &value); zephir_check_call_status(); _13$$18 = !zephir_is_true(&_14$$18); } @@ -1072,7 +1072,7 @@ PHP_METHOD(Phalcon_Mvc_Model, assign) _16$$22 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_16$$22) { - ZEPHIR_CALL_SELF(&_17$$23, "caseinsensitivecolumnmap", &_9, 417, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_17$$23, "caseinsensitivecolumnmap", &_9, 416, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_17$$23); } @@ -1104,7 +1104,7 @@ PHP_METHOD(Phalcon_Mvc_Model, assign) } _20$$28 = zephir_is_true(&disableAssignSetters); if (!(_20$$28)) { - ZEPHIR_CALL_METHOD(&_21$$28, this_ptr, "possiblesetter", &_15, 416, &attributeField, &value); + ZEPHIR_CALL_METHOD(&_21$$28, this_ptr, "possiblesetter", &_15, 415, &attributeField, &value); zephir_check_call_status(); _20$$28 = !zephir_is_true(&_21$$28); } @@ -1718,7 +1718,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate) _4$$7 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_4$$7) { - ZEPHIR_CALL_SELF(&_5$$8, "caseinsensitivecolumnmap", &_6, 417, columnMap, &key); + ZEPHIR_CALL_SELF(&_5$$8, "caseinsensitivecolumnmap", &_6, 416, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_5$$8); } @@ -1770,7 +1770,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate) _10$$16 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_10$$16) { - ZEPHIR_CALL_SELF(&_11$$17, "caseinsensitivecolumnmap", &_6, 417, columnMap, &key); + ZEPHIR_CALL_SELF(&_11$$17, "caseinsensitivecolumnmap", &_6, 416, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_11$$17); } @@ -2022,7 +2022,7 @@ PHP_METHOD(Phalcon_Mvc_Model, create) ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "getwriteconnection", NULL, 418); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getwriteconnection", NULL, 417); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, this_ptr, "has", NULL, 0, &metaData, &_1); zephir_check_call_status(); @@ -2121,7 +2121,7 @@ PHP_METHOD(Phalcon_Mvc_Model, delete) ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 418); + ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 417); zephir_check_call_status(); ZEPHIR_INIT_ZVAL_NREF(_0); ZVAL_LONG(&_0, 3); @@ -2130,7 +2130,7 @@ PHP_METHOD(Phalcon_Mvc_Model, delete) array_init(&_1); zephir_update_property_zval(this_ptr, ZEND_STRL("errorMessages"), &_1); if (ZEPHIR_GLOBAL(orm).virtual_foreign_keys) { - ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "checkforeignkeysreverserestrict", NULL, 419); + ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "checkforeignkeysreverserestrict", NULL, 418); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&_2$$3)) { RETURN_MM_BOOL(0); @@ -2292,9 +2292,9 @@ PHP_METHOD(Phalcon_Mvc_Model, delete) RETURN_MM_BOOL(1); } } - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 420); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 419); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 421); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 420); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); @@ -2309,7 +2309,7 @@ PHP_METHOD(Phalcon_Mvc_Model, delete) ZEPHIR_CALL_METHOD(&success, &writeConnection, "delete", NULL, 0, &table, &_27, &values, &bindTypes); zephir_check_call_status(); if (ZEPHIR_GLOBAL(orm).virtual_foreign_keys) { - ZEPHIR_CALL_METHOD(&_28$$25, this_ptr, "checkforeignkeysreversecascade", NULL, 422); + ZEPHIR_CALL_METHOD(&_28$$25, this_ptr, "checkforeignkeysreversecascade", NULL, 421); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&_28$$25)) { RETURN_MM_BOOL(0); @@ -2349,7 +2349,7 @@ PHP_METHOD(Phalcon_Mvc_Model, dump) ZEPHIR_MM_GROW(); - ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 423, this_ptr); + ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 422, this_ptr); zephir_check_call_status(); RETURN_MM(); } @@ -2571,7 +2571,7 @@ PHP_METHOD(Phalcon_Mvc_Model, find) } else { ZEPHIR_CPY_WRT(¶ms, parameters); } - ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_0, 424, ¶ms); + ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_0, 423, ¶ms); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&resultset, &query, "execute", NULL, 0); zephir_check_call_status(); @@ -2722,7 +2722,7 @@ PHP_METHOD(Phalcon_Mvc_Model, findFirst) return; } ZVAL_LONG(&_3, 1); - ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_2, 424, ¶ms, &_3); + ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_2, 423, ¶ms, &_3); zephir_check_call_status(); ZVAL_BOOL(&_3, 1); ZEPHIR_CALL_METHOD(NULL, &query, "setuniquerow", NULL, 0, &_3); @@ -3615,7 +3615,7 @@ PHP_METHOD(Phalcon_Mvc_Model, hasChanged) RETURN_MM_BOOL(zephir_fast_in_array(fieldName, &changedFields)); } if (Z_TYPE_P(fieldName) == IS_ARRAY) { - ZEPHIR_CALL_FUNCTION(&intersect, "array_intersect", NULL, 425, fieldName, &changedFields); + ZEPHIR_CALL_FUNCTION(&intersect, "array_intersect", NULL, 424, fieldName, &changedFields); zephir_check_call_status(); if (allFields) { RETURN_MM_BOOL(ZEPHIR_IS_EQUAL(&intersect, fieldName)); @@ -3688,7 +3688,7 @@ PHP_METHOD(Phalcon_Mvc_Model, hasUpdated) RETURN_MM_BOOL(zephir_fast_in_array(fieldName, &updatedFields)); } if (Z_TYPE_P(fieldName) == IS_ARRAY) { - ZEPHIR_CALL_FUNCTION(&intersect, "array_intersect", NULL, 425, fieldName, &updatedFields); + ZEPHIR_CALL_FUNCTION(&intersect, "array_intersect", NULL, 424, fieldName, &updatedFields); zephir_check_call_status(); if (allFields) { RETURN_MM_BOOL(ZEPHIR_IS_EQUAL(&intersect, fieldName)); @@ -3903,12 +3903,12 @@ PHP_METHOD(Phalcon_Mvc_Model, query) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 426, container); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 425, container); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_3); zephir_get_called_class(&_3); - ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 427, &_3); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 426, &_3); zephir_check_call_status(); RETURN_CCTOR(&criteria); } @@ -4008,13 +4008,13 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh) } ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 428); + ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 427); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("modelsManager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_1); - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 420); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 419); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 421); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 420); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); @@ -4173,7 +4173,7 @@ PHP_METHOD(Phalcon_Mvc_Model, save) ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 418); + ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 417); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "prepareSave"); @@ -4189,9 +4189,9 @@ PHP_METHOD(Phalcon_Mvc_Model, save) RETURN_MM_BOOL(0); } } - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 420); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 419); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 421); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 420); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); @@ -4201,7 +4201,7 @@ PHP_METHOD(Phalcon_Mvc_Model, save) } else { ZEPHIR_CPY_WRT(&table, &source); } - ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 428); + ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 427); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&exists, this_ptr, "has", NULL, 0, &metaData, &readConnection); zephir_check_call_status(); @@ -4232,7 +4232,7 @@ PHP_METHOD(Phalcon_Mvc_Model, save) object_init_ex(&_6$$11, phalcon_mvc_model_validationfailed_ce); ZEPHIR_CALL_METHOD(&_7$$11, this_ptr, "getmessages", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_6$$11, "__construct", NULL, 429, this_ptr, &_7$$11); + ZEPHIR_CALL_METHOD(NULL, &_6$$11, "__construct", NULL, 428, this_ptr, &_7$$11); zephir_check_call_status(); zephir_throw_exception_debug(&_6$$11, "phalcon/Mvc/Model.zep", 2561); ZEPHIR_MM_RESTORE(); @@ -4853,7 +4853,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) _4$$4 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_4$$4) { - ZEPHIR_CALL_SELF(&_5$$6, "caseinsensitivecolumnmap", &_6, 417, columnMap, &key); + ZEPHIR_CALL_SELF(&_5$$6, "caseinsensitivecolumnmap", &_6, 416, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_5$$6); } @@ -4912,7 +4912,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) _12$$12 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_12$$12) { - ZEPHIR_CALL_SELF(&_13$$14, "caseinsensitivecolumnmap", &_6, 417, columnMap, &key); + ZEPHIR_CALL_SELF(&_13$$14, "caseinsensitivecolumnmap", &_6, 416, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_13$$14); } @@ -5333,7 +5333,7 @@ PHP_METHOD(Phalcon_Mvc_Model, toArray) _3$$4 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_3$$4) { - ZEPHIR_CALL_SELF(&_4$$5, "caseinsensitivecolumnmap", &_5, 417, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_4$$5, "caseinsensitivecolumnmap", &_5, 416, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_4$$5); } @@ -5384,7 +5384,7 @@ PHP_METHOD(Phalcon_Mvc_Model, toArray) _9$$14 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_9$$14) { - ZEPHIR_CALL_SELF(&_10$$15, "caseinsensitivecolumnmap", &_5, 417, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_10$$15, "caseinsensitivecolumnmap", &_5, 416, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_10$$15); } @@ -5464,7 +5464,7 @@ PHP_METHOD(Phalcon_Mvc_Model, update) if (zephir_is_true(&_0)) { ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getreadconnection", NULL, 428); + ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getreadconnection", NULL, 427); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "has", NULL, 0, &metaData, &_2$$3); zephir_check_call_status(); @@ -6590,9 +6590,9 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert) ZEPHIR_CALL_METHOD(&sequenceName, this_ptr, "getsequencename", NULL, 0); zephir_check_call_status(); } else { - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 421); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 420); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 420); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 419); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&sequenceName); if (ZEPHIR_IS_EMPTY(&schema)) { @@ -7432,9 +7432,9 @@ PHP_METHOD(Phalcon_Mvc_Model, has) zephir_read_property(&_22$$27, this_ptr, ZEND_STRL("uniqueTypes"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&uniqueTypes, &_22$$27); } - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 420); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 419); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 421); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 420); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); @@ -8041,7 +8041,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSave) } } if (ZEPHIR_GLOBAL(orm).virtual_foreign_keys) { - ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "checkforeignkeysrestrict", NULL, 430); + ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "checkforeignkeysrestrict", NULL, 429); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&_3$$8)) { RETURN_MM_BOOL(0); @@ -10979,6 +10979,39 @@ PHP_METHOD(Phalcon_Mvc_Model, caseInsensitiveColumnMap) RETURN_MM(); } +PHP_METHOD(Phalcon_Mvc_Model, __serialize) +{ + zval *this_ptr = getThis(); + + + + array_init(return_value); + return; +} + +PHP_METHOD(Phalcon_Mvc_Model, __unserialize) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *data_param = NULL; + zval data; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&data); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_ARRAY(data) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &data_param); + zephir_get_arrval(&data, data_param); + + +} + zend_object *zephir_init_properties_Phalcon_Mvc_Model(zend_class_entry *class_type) { zval _0, _2, _4, _6, _8, _10, _1$$3, _3$$4, _5$$5, _7$$6, _9$$7, _11$$8; diff --git a/ext/phalcon/mvc/model.zep.h b/ext/phalcon/mvc/model.zep.h index 384daf12eb5..a6b41f10bf5 100644 --- a/ext/phalcon/mvc/model.zep.h +++ b/ext/phalcon/mvc/model.zep.h @@ -102,6 +102,8 @@ PHP_METHOD(Phalcon_Mvc_Model, useDynamicUpdate); PHP_METHOD(Phalcon_Mvc_Model, validate); PHP_METHOD(Phalcon_Mvc_Model, validationHasFailed); PHP_METHOD(Phalcon_Mvc_Model, caseInsensitiveColumnMap); +PHP_METHOD(Phalcon_Mvc_Model, __serialize); +PHP_METHOD(Phalcon_Mvc_Model, __unserialize); zend_object *zephir_init_properties_Phalcon_Mvc_Model(zend_class_entry *class_type); ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_gettransaction, 0, 0, IS_NULL, 1) @@ -310,9 +312,15 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_serialize, 0, 0, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_unserialize, 0, 0, 1) - ZEND_ARG_INFO(0, data) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_unserialize, 0, 1, IS_VOID, 0) + ZEND_ARG_TYPE_INFO(0, serialized, IS_STRING, 0) +ZEND_END_ARG_INFO() +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_unserialize, 0, 1, IS_VOID, 0) + ZEND_ARG_INFO(0, serialized) ZEND_END_ARG_INFO() +#endif ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_setconnectionservice, 0, 1, IS_VOID, 0) @@ -547,6 +555,14 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_caseinsensitiv ZEND_ARG_INFO(0, key) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model___serialize, 0, 0, IS_ARRAY, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model___unserialize, 0, 1, IS_VOID, 0) + + ZEND_ARG_ARRAY_INFO(0, data, 0) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_zephir_init_properties_phalcon_mvc_model, 0, 0, 0) ZEND_END_ARG_INFO() @@ -654,5 +670,7 @@ ZEPHIR_INIT_FUNCS(phalcon_mvc_model_method_entry) { PHP_ME(Phalcon_Mvc_Model, validate, arginfo_phalcon_mvc_model_validate, ZEND_ACC_PROTECTED) PHP_ME(Phalcon_Mvc_Model, validationHasFailed, arginfo_phalcon_mvc_model_validationhasfailed, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model, caseInsensitiveColumnMap, arginfo_phalcon_mvc_model_caseinsensitivecolumnmap, ZEND_ACC_PRIVATE|ZEND_ACC_STATIC) + PHP_ME(Phalcon_Mvc_Model, __serialize, arginfo_phalcon_mvc_model___serialize, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Model, __unserialize, arginfo_phalcon_mvc_model___unserialize, ZEND_ACC_PUBLIC) PHP_FE_END }; diff --git a/ext/phalcon/mvc/model/behavior/timestampable.zep.c b/ext/phalcon/mvc/model/behavior/timestampable.zep.c index 791e34d207e..f026ef17bb0 100644 --- a/ext/phalcon/mvc/model/behavior/timestampable.zep.c +++ b/ext/phalcon/mvc/model/behavior/timestampable.zep.c @@ -101,7 +101,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Behavior_Timestampable, notify) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The option 'field' is required", "phalcon/Mvc/Model/Behavior/Timestampable.zep", 50); return; } - ZEPHIR_CALL_METHOD(×tamp, this_ptr, "gettimestamp", NULL, 431, &options); + ZEPHIR_CALL_METHOD(×tamp, this_ptr, "gettimestamp", NULL, 430, &options); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&field) == IS_ARRAY)) { zephir_is_iterable(&field, 0, "phalcon/Mvc/Model/Behavior/Timestampable.zep", 63); @@ -165,7 +165,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Behavior_Timestampable, getTimestamp) ZEPHIR_OBS_VAR(&format); if (zephir_array_isset_string_fetch(&format, &options, SL("format"), 0)) { - ZEPHIR_RETURN_CALL_FUNCTION("date", NULL, 432, &format); + ZEPHIR_RETURN_CALL_FUNCTION("date", NULL, 431, &format); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/mvc/model/binder.zep.c b/ext/phalcon/mvc/model/binder.zep.c index b629a37bde0..4227b9c0f7d 100644 --- a/ext/phalcon/mvc/model/binder.zep.c +++ b/ext/phalcon/mvc/model/binder.zep.c @@ -431,7 +431,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection) ZEPHIR_INIT_VAR(&reflection); if (!ZEPHIR_IS_NULL(&methodName)) { object_init_ex(&reflection, zephir_get_internal_ce(SL("reflectionmethod"))); - ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 433, handler, &methodName); + ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 432, handler, &methodName); zephir_check_call_status(); } else { object_init_ex(&reflection, zephir_get_internal_ce(SL("reflectionfunction"))); @@ -473,7 +473,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection) zephir_array_fetch(¶mValue, ¶ms, ¶mKey, PH_NOISY, "phalcon/Mvc/Model/Binder.zep", 179); ZEPHIR_INIT_NVAR(&_6$$5); ZVAL_STRING(&_6$$5, "Phalcon\\Mvc\\Model"); - ZEPHIR_CALL_FUNCTION(&_7$$5, "is_subclass_of", &_8, 434, &className, &_6$$5); + ZEPHIR_CALL_FUNCTION(&_7$$5, "is_subclass_of", &_8, 433, &className, &_6$$5); zephir_check_call_status(); if (ZEPHIR_IS_STRING(&className, "Phalcon\\Mvc\\Model")) { if (Z_TYPE_P(&realClasses) == IS_NULL) { @@ -555,7 +555,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection) zephir_array_fetch(¶mValue, ¶ms, ¶mKey, PH_NOISY, "phalcon/Mvc/Model/Binder.zep", 179); ZEPHIR_INIT_NVAR(&_15$$19); ZVAL_STRING(&_15$$19, "Phalcon\\Mvc\\Model"); - ZEPHIR_CALL_FUNCTION(&_16$$19, "is_subclass_of", &_8, 434, &className, &_15$$19); + ZEPHIR_CALL_FUNCTION(&_16$$19, "is_subclass_of", &_8, 433, &className, &_15$$19); zephir_check_call_status(); if (ZEPHIR_IS_STRING(&className, "Phalcon\\Mvc\\Model")) { if (Z_TYPE_P(&realClasses) == IS_NULL) { diff --git a/ext/phalcon/mvc/model/criteria.zep.c b/ext/phalcon/mvc/model/criteria.zep.c index 029befb1fb9..beea2f5888a 100644 --- a/ext/phalcon/mvc/model/criteria.zep.c +++ b/ext/phalcon/mvc/model/criteria.zep.c @@ -783,19 +783,19 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, fromInput) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 426, container); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 425, container); zephir_check_call_status(); if (zephir_fast_count_int(&conditions)) { ZEPHIR_INIT_VAR(&_16$$16); ZEPHIR_INIT_VAR(&_17$$16); ZEPHIR_CONCAT_SVS(&_17$$16, " ", &operator, " "); zephir_fast_join(&_16$$16, &_17$$16, &conditions); - ZEPHIR_CALL_METHOD(NULL, &criteria, "where", NULL, 435, &_16$$16); + ZEPHIR_CALL_METHOD(NULL, &criteria, "where", NULL, 434, &_16$$16); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &criteria, "bind", NULL, 436, &bind); + ZEPHIR_CALL_METHOD(NULL, &criteria, "bind", NULL, 435, &bind); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 427, &modelName); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 426, &modelName); zephir_check_call_status(); RETURN_CCTOR(&criteria); } diff --git a/ext/phalcon/mvc/model/manager.zep.c b/ext/phalcon/mvc/model/manager.zep.c index cd3f6d65720..3cac6a6cc7e 100644 --- a/ext/phalcon/mvc/model/manager.zep.c +++ b/ext/phalcon/mvc/model/manager.zep.c @@ -1651,7 +1651,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasOne) ZEPHIR_INIT_VAR(&relation); object_init_ex(&relation, phalcon_mvc_model_relation_ce); ZVAL_LONG(&_2, 1); - ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 437, &_2, &referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 436, &_2, &referencedModel, fields, referencedFields, options); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, options, SL("alias"), 0)) { @@ -1792,9 +1792,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasOneThrough) ZEPHIR_INIT_VAR(&relation); object_init_ex(&relation, phalcon_mvc_model_relation_ce); ZVAL_LONG(&_1, 3); - ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 437, &_1, &referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 436, &_1, &referencedModel, fields, referencedFields, options); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 438, intermediateFields, &intermediateModel, intermediateReferencedFields); + ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 437, intermediateFields, &intermediateModel, intermediateReferencedFields); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, options, SL("alias"), 0)) { @@ -1906,7 +1906,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, addBelongsTo) ZEPHIR_INIT_VAR(&relation); object_init_ex(&relation, phalcon_mvc_model_relation_ce); ZVAL_LONG(&_2, 0); - ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 437, &_2, &referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 436, &_2, &referencedModel, fields, referencedFields, options); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, options, SL("alias"), 0)) { @@ -2020,7 +2020,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasMany) ZEPHIR_INIT_VAR(&relation); object_init_ex(&relation, phalcon_mvc_model_relation_ce); ZVAL_LONG(&_1, 2); - ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 437, &_1, &referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 436, &_1, &referencedModel, fields, referencedFields, options); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, options, SL("alias"), 0)) { @@ -2161,9 +2161,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasManyToMany) ZEPHIR_INIT_VAR(&relation); object_init_ex(&relation, phalcon_mvc_model_relation_ce); ZVAL_LONG(&_1, 4); - ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 437, &_1, &referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 436, &_1, &referencedModel, fields, referencedFields, options); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 438, intermediateFields, &intermediateModel, intermediateReferencedFields); + ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 437, intermediateFields, &intermediateModel, intermediateReferencedFields); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, options, SL("alias"), 0)) { @@ -2874,7 +2874,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getRelationRecords) ZEPHIR_INIT_VAR(&_4$$3); ZEPHIR_CONCAT_SVSVSVSVS(&_4$$3, "[", &intermediateModel, "].[", &intermediateFields, "] = [", &referencedModel, "].[", &_3$$3, "]"); zephir_array_append(&joinConditions, &_4$$3, PH_SEPARATE, "phalcon/Mvc/Model/Manager.zep", 1452); - ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "_mergefindparameters", NULL, 439, &extraParameters, parameters); + ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "_mergefindparameters", NULL, 438, &extraParameters, parameters); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&builder, this_ptr, "createbuilder", NULL, 0, &_5$$3); zephir_check_call_status(); @@ -3005,10 +3005,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getRelationRecords) ZEPHIR_CALL_METHOD(&_32, record, "getdi", NULL, 0); zephir_check_call_status(); zephir_array_update_string(&findParams, SL("di"), &_32, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&findArguments, this_ptr, "_mergefindparameters", NULL, 439, &findParams, parameters); + ZEPHIR_CALL_METHOD(&findArguments, this_ptr, "_mergefindparameters", NULL, 438, &findParams, parameters); zephir_check_call_status(); if (Z_TYPE_P(&extraParameters) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&findParams, this_ptr, "_mergefindparameters", NULL, 439, &extraParameters, &findArguments); + ZEPHIR_CALL_METHOD(&findParams, this_ptr, "_mergefindparameters", NULL, 438, &extraParameters, &findArguments); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&findParams, &findArguments); @@ -3172,7 +3172,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, hasBelongsTo) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "belongsTo"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 440, &_0, &modelName, &modelRelation); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 439, &_0, &modelName, &modelRelation); zephir_check_call_status(); RETURN_MM(); } @@ -3224,7 +3224,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, hasHasMany) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "hasMany"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 440, &_0, &modelName, &modelRelation); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 439, &_0, &modelName, &modelRelation); zephir_check_call_status(); RETURN_MM(); } @@ -3276,7 +3276,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, hasHasOne) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "hasOne"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 440, &_0, &modelName, &modelRelation); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 439, &_0, &modelName, &modelRelation); zephir_check_call_status(); RETURN_MM(); } @@ -3328,7 +3328,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, hasHasOneThrough) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "hasOneThrough"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 440, &_0, &modelName, &modelRelation); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 439, &_0, &modelName, &modelRelation); zephir_check_call_status(); RETURN_MM(); } @@ -3380,7 +3380,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, hasHasManyToMany) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "hasManyToMany"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 440, &_0, &modelName, &modelRelation); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 439, &_0, &modelName, &modelRelation); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/mvc/model/metadata/stream.zep.c b/ext/phalcon/mvc/model/metadata/stream.zep.c index 19f049a7391..9f2feaadaaf 100644 --- a/ext/phalcon/mvc/model/metadata/stream.zep.c +++ b/ext/phalcon/mvc/model/metadata/stream.zep.c @@ -217,7 +217,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData_Stream, write) ZEPHIR_CONCAT_SVS(&_5$$3, "= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_offsetget, 0, 1, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_offsetget, 0, 1, IS_NULL, 0) +#endif ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() diff --git a/ext/phalcon/mvc/model/resultset/complex.zep.c b/ext/phalcon/mvc/model/resultset/complex.zep.c index 66751ea9d66..ad6ca7baed6 100644 --- a/ext/phalcon/mvc/model/resultset/complex.zep.c +++ b/ext/phalcon/mvc/model/resultset/complex.zep.c @@ -511,7 +511,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, toArray) if (!(zephir_is_true(&_0))) { break; } - ZEPHIR_CALL_METHOD(¤t, this_ptr, "current", &_2, 476); + ZEPHIR_CALL_METHOD(¤t, this_ptr, "current", &_2, 475); zephir_check_call_status(); zephir_array_append(&records, ¤t, PH_SEPARATE, "phalcon/Mvc/Model/Resultset/Complex.zep", 286); ZEPHIR_CALL_METHOD(NULL, this_ptr, "next", &_3, 0); @@ -642,8 +642,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, unserialize) } ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_0, 0); zephir_check_call_status(); - if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Complex.zep", 360); + if (Z_TYPE_P(&container) == IS_NULL) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Complex.zep", 359); return; } ZEPHIR_INIT_VAR(&_2); @@ -665,21 +665,54 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, unserialize) zephir_check_call_status(); } if (UNEXPECTED(Z_TYPE_P(&resultset) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid serialization data", "phalcon/Mvc/Model/Resultset/Complex.zep", 373); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid serialization data", "phalcon/Mvc/Model/Resultset/Complex.zep", 372); return; } - zephir_array_fetch_string(&_5, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 376); + zephir_array_fetch_string(&_5, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 375); zephir_update_property_zval(this_ptr, ZEND_STRL("rows"), &_5); - zephir_array_fetch_string(&_6, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 377); + zephir_array_fetch_string(&_6, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 376); ZEPHIR_INIT_ZVAL_NREF(_7); ZVAL_LONG(&_7, zephir_fast_count_int(&_6)); zephir_update_property_zval(this_ptr, ZEND_STRL("count"), &_7); - zephir_array_fetch_string(&_8, &resultset, SL("cache"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 378); + zephir_array_fetch_string(&_8, &resultset, SL("cache"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 377); zephir_update_property_zval(this_ptr, ZEND_STRL("cache"), &_8); - zephir_array_fetch_string(&_9, &resultset, SL("columnTypes"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 379); + zephir_array_fetch_string(&_9, &resultset, SL("columnTypes"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 378); zephir_update_property_zval(this_ptr, ZEND_STRL("columnTypes"), &_9); - zephir_array_fetch_string(&_10, &resultset, SL("hydrateMode"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 380); + zephir_array_fetch_string(&_10, &resultset, SL("hydrateMode"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 379); zephir_update_property_zval(this_ptr, ZEND_STRL("hydrateMode"), &_10); ZEPHIR_MM_RESTORE(); } +PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, __serialize) +{ + zval *this_ptr = getThis(); + + + + array_init(return_value); + return; +} + +PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, __unserialize) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *data_param = NULL; + zval data; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&data); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_ARRAY(data) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &data_param); + zephir_get_arrval(&data, data_param); + + +} + diff --git a/ext/phalcon/mvc/model/resultset/complex.zep.h b/ext/phalcon/mvc/model/resultset/complex.zep.h index 22bb22c1610..6954f9507e5 100644 --- a/ext/phalcon/mvc/model/resultset/complex.zep.h +++ b/ext/phalcon/mvc/model/resultset/complex.zep.h @@ -8,6 +8,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current); PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, toArray); PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, serialize); PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, unserialize); +PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, __serialize); +PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, __unserialize); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex___construct, 0, 0, 1) ZEND_ARG_INFO(0, columnTypes) @@ -15,7 +17,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex___construct, ZEND_ARG_INFO(0, cache) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex_current, 0, 0, 0) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex_current, 0, 0, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex_current, 0, 0, IS_NULL, 0) +#endif ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex_toarray, 0, 0, IS_ARRAY, 0) @@ -29,15 +35,21 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_comp ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex___serialize, 0, 0, IS_ARRAY, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex___unserialize, 0, 1, IS_VOID, 0) + + ZEND_ARG_ARRAY_INFO(0, data, 0) +ZEND_END_ARG_INFO() + ZEPHIR_INIT_FUNCS(phalcon_mvc_model_resultset_complex_method_entry) { PHP_ME(Phalcon_Mvc_Model_Resultset_Complex, __construct, arginfo_phalcon_mvc_model_resultset_complex___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) -#if PHP_VERSION_ID >= 80000 PHP_ME(Phalcon_Mvc_Model_Resultset_Complex, current, arginfo_phalcon_mvc_model_resultset_complex_current, ZEND_ACC_FINAL|ZEND_ACC_PUBLIC) -#else - PHP_ME(Phalcon_Mvc_Model_Resultset_Complex, current, NULL, ZEND_ACC_FINAL|ZEND_ACC_PUBLIC) -#endif PHP_ME(Phalcon_Mvc_Model_Resultset_Complex, toArray, arginfo_phalcon_mvc_model_resultset_complex_toarray, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model_Resultset_Complex, serialize, arginfo_phalcon_mvc_model_resultset_complex_serialize, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model_Resultset_Complex, unserialize, arginfo_phalcon_mvc_model_resultset_complex_unserialize, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Model_Resultset_Complex, __serialize, arginfo_phalcon_mvc_model_resultset_complex___serialize, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Model_Resultset_Complex, __unserialize, arginfo_phalcon_mvc_model_resultset_complex___unserialize, ZEND_ACC_PUBLIC) PHP_FE_END }; diff --git a/ext/phalcon/mvc/model/resultset/simple.zep.c b/ext/phalcon/mvc/model/resultset/simple.zep.c index 71f1ff7a89d..542b6205cbe 100644 --- a/ext/phalcon/mvc/model/resultset/simple.zep.c +++ b/ext/phalcon/mvc/model/resultset/simple.zep.c @@ -671,3 +671,36 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, unserialize) ZEPHIR_MM_RESTORE(); } +PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, __serialize) +{ + zval *this_ptr = getThis(); + + + + array_init(return_value); + return; +} + +PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, __unserialize) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *data_param = NULL; + zval data; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&data); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_ARRAY(data) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &data_param); + zephir_get_arrval(&data, data_param); + + +} + diff --git a/ext/phalcon/mvc/model/resultset/simple.zep.h b/ext/phalcon/mvc/model/resultset/simple.zep.h index af554655343..e9c102de26e 100644 --- a/ext/phalcon/mvc/model/resultset/simple.zep.h +++ b/ext/phalcon/mvc/model/resultset/simple.zep.h @@ -8,6 +8,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, current); PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray); PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, serialize); PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, unserialize); +PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, __serialize); +PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, __unserialize); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset_simple___construct, 0, 0, 3) ZEND_ARG_INFO(0, columnMap) @@ -32,11 +34,21 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_simp ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_simple___serialize, 0, 0, IS_ARRAY, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_simple___unserialize, 0, 1, IS_VOID, 0) + + ZEND_ARG_ARRAY_INFO(0, data, 0) +ZEND_END_ARG_INFO() + ZEPHIR_INIT_FUNCS(phalcon_mvc_model_resultset_simple_method_entry) { PHP_ME(Phalcon_Mvc_Model_Resultset_Simple, __construct, arginfo_phalcon_mvc_model_resultset_simple___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) PHP_ME(Phalcon_Mvc_Model_Resultset_Simple, current, arginfo_phalcon_mvc_model_resultset_simple_current, ZEND_ACC_FINAL|ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model_Resultset_Simple, toArray, arginfo_phalcon_mvc_model_resultset_simple_toarray, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model_Resultset_Simple, serialize, arginfo_phalcon_mvc_model_resultset_simple_serialize, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model_Resultset_Simple, unserialize, arginfo_phalcon_mvc_model_resultset_simple_unserialize, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Model_Resultset_Simple, __serialize, arginfo_phalcon_mvc_model_resultset_simple___serialize, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Model_Resultset_Simple, __unserialize, arginfo_phalcon_mvc_model_resultset_simple___unserialize, ZEND_ACC_PUBLIC) PHP_FE_END }; diff --git a/ext/phalcon/mvc/model/row.zep.c b/ext/phalcon/mvc/model/row.zep.c index 59a15f86365..1056c4f6e2c 100644 --- a/ext/phalcon/mvc/model/row.zep.c +++ b/ext/phalcon/mvc/model/row.zep.c @@ -16,10 +16,10 @@ #include "kernel/fcall.h" #include "kernel/object.h" #include "kernel/memory.h" -#include "kernel/array.h" +#include "kernel/operators.h" #include "kernel/exception.h" +#include "kernel/array.h" #include "ext/spl/spl_exceptions.h" -#include "kernel/operators.h" /** @@ -31,8 +31,6 @@ * file that was distributed with this source code. */ /** - * Phalcon\Mvc\Model\Row - * * This component allows Phalcon\Mvc\Model to return rows without an associated entity. * This objects implements the ArrayAccess interface to allow access the object as object->x or array[x]. */ @@ -75,11 +73,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Row, jsonSerialize) PHP_METHOD(Phalcon_Mvc_Model_Row, offsetGet) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *index, index_sub, value; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval index_sub, _0, _1; + zval *index; zval *this_ptr = getThis(); ZVAL_UNDEF(&index_sub); - ZVAL_UNDEF(&value); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -92,12 +93,15 @@ PHP_METHOD(Phalcon_Mvc_Model_Row, offsetGet) zephir_fetch_params(1, 1, 0, &index); - ZEPHIR_OBS_VAR(&value); - if (UNEXPECTED(!(zephir_fetch_property_zval(&value, this_ptr, index, PH_SILENT_CC)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The index does not exist in the row", "phalcon/Mvc/Model/Row.zep", 46); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "offsetexists", NULL, 0, index); + zephir_check_call_status(); + if (!(zephir_is_true(&_0))) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The index does not exist in the row", "phalcon/Mvc/Model/Row.zep", 42); return; } - RETURN_CCTOR(&value); + ZEPHIR_OBS_VAR(&_1); + zephir_read_property_zval(&_1, this_ptr, index, PH_NOISY_CC); + RETURN_CCTOR(&_1); } /** @@ -107,7 +111,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Row, offsetGet) */ PHP_METHOD(Phalcon_Mvc_Model_Row, offsetExists) { - zval *index, index_sub; + zval index_sub; + zval *index; zval *this_ptr = getThis(); ZVAL_UNDEF(&index_sub); @@ -133,7 +138,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Row, offsetExists) */ PHP_METHOD(Phalcon_Mvc_Model_Row, offsetSet) { - zval *index, index_sub, *value, value_sub; + zval index_sub, value_sub; + zval *index, *value; zval *this_ptr = getThis(); ZVAL_UNDEF(&index_sub); @@ -150,7 +156,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Row, offsetSet) zephir_fetch_params_without_memory_grow(2, 0, &index, &value); - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Row is an immutable ArrayAccess object", "phalcon/Mvc/Model/Row.zep", 70); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Row is an immutable ArrayAccess object", "phalcon/Mvc/Model/Row.zep", 66); return; } @@ -161,7 +167,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Row, offsetSet) */ PHP_METHOD(Phalcon_Mvc_Model_Row, offsetUnset) { - zval *offset, offset_sub; + zval offset_sub; + zval *offset; zval *this_ptr = getThis(); ZVAL_UNDEF(&offset_sub); @@ -176,7 +183,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Row, offsetUnset) zephir_fetch_params_without_memory_grow(1, 0, &offset); - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Row is an immutable ArrayAccess object", "phalcon/Mvc/Model/Row.zep", 80); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Row is an immutable ArrayAccess object", "phalcon/Mvc/Model/Row.zep", 76); return; } @@ -263,7 +270,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Row, toArray) ZEPHIR_MM_GROW(); - ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 423, this_ptr); + ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 422, this_ptr); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/mvc/model/transaction.zep.c b/ext/phalcon/mvc/model/transaction.zep.c index 2a34947130b..c53c2a7a62c 100644 --- a/ext/phalcon/mvc/model/transaction.zep.c +++ b/ext/phalcon/mvc/model/transaction.zep.c @@ -240,7 +240,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction, getConnection) zephir_read_property(&_0, this_ptr, ZEND_STRL("rollbackOnAbort"), PH_NOISY_CC | PH_READONLY); if (zephir_is_true(&_0)) { - ZEPHIR_CALL_FUNCTION(&_1$$3, "connection_aborted", NULL, 477); + ZEPHIR_CALL_FUNCTION(&_1$$3, "connection_aborted", NULL, 476); zephir_check_call_status(); if (zephir_is_true(&_1$$3)) { ZEPHIR_INIT_VAR(&_2$$4); @@ -371,7 +371,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction, rollback) ZEPHIR_INIT_VAR(&_3$$7); object_init_ex(&_3$$7, phalcon_mvc_model_transaction_failed_ce); zephir_read_property(&_4$$7, this_ptr, ZEND_STRL("rollbackRecord"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", NULL, 478, &rollbackMessage, &_4$$7); + ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", NULL, 477, &rollbackMessage, &_4$$7); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model/Transaction.zep", 215); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/mvc/model/transaction/manager.zep.c b/ext/phalcon/mvc/model/transaction/manager.zep.c index 01c952438cc..58af968b198 100644 --- a/ext/phalcon/mvc/model/transaction/manager.zep.c +++ b/ext/phalcon/mvc/model/transaction/manager.zep.c @@ -327,7 +327,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction_Manager, get) ZEPHIR_INIT_VAR(&_3$$4); ZVAL_STRING(&_3$$4, "rollbackPendent"); zephir_array_fast_append(&_2$$4, &_3$$4); - ZEPHIR_CALL_FUNCTION(NULL, "register_shutdown_function", NULL, 479, &_2$$4); + ZEPHIR_CALL_FUNCTION(NULL, "register_shutdown_function", NULL, 478, &_2$$4); zephir_check_call_status(); } if (1) { @@ -467,9 +467,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction_Manager, getOrCreateTransaction) } else { ZVAL_BOOL(&_7, 0); } - ZEPHIR_CALL_METHOD(NULL, &transaction, "__construct", NULL, 480, &container, &_7, &_6); + ZEPHIR_CALL_METHOD(NULL, &transaction, "__construct", NULL, 479, &container, &_7, &_6); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &transaction, "settransactionmanager", NULL, 481, this_ptr); + ZEPHIR_CALL_METHOD(NULL, &transaction, "settransactionmanager", NULL, 480, this_ptr); zephir_check_call_status(); zephir_update_property_array_append(this_ptr, SL("transactions"), &transaction); RETURN_ON_FAILURE(zephir_property_incr(this_ptr, SL("number"))); diff --git a/ext/phalcon/mvc/router.zep.c b/ext/phalcon/mvc/router.zep.c index f26673e6409..6d76279a395 100644 --- a/ext/phalcon/mvc/router.zep.c +++ b/ext/phalcon/mvc/router.zep.c @@ -80,9 +80,9 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Router) */ zend_declare_property_null(phalcon_mvc_router_ce, SL("defaultController"), ZEND_ACC_PROTECTED); /** - * @var string|null + * @var string */ - zend_declare_property_null(phalcon_mvc_router_ce, SL("defaultModule"), ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_mvc_router_ce, SL("defaultModule"), "", ZEND_ACC_PROTECTED); /** * @var string|null */ diff --git a/ext/phalcon/mvc/router/annotations.zep.c b/ext/phalcon/mvc/router/annotations.zep.c index 778af2bf415..9a10cd28551 100644 --- a/ext/phalcon/mvc/router/annotations.zep.c +++ b/ext/phalcon/mvc/router/annotations.zep.c @@ -326,7 +326,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) ZVAL_STRING(&_1, "annotations"); ZEPHIR_CALL_METHOD(&annotationsService, &container, "getshared", NULL, 0, &_1); zephir_check_call_status(); - zephir_is_iterable(&handlers, 0, "phalcon/Mvc/Router/Annotations.zep", 249); + zephir_is_iterable(&handlers, 0, "phalcon/Mvc/Router/Annotations.zep", 250); if (Z_TYPE_P(&handlers) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&handlers), _2) { @@ -342,7 +342,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) object_init_ex(&route, phalcon_mvc_router_route_ce); ZEPHIR_CALL_METHOD(NULL, &route, "__construct", &_4, 96, &prefix); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_5$$6, &route, "getcompiledpattern", &_6, 482); + ZEPHIR_CALL_METHOD(&_5$$6, &route, "getcompiledpattern", &_6, 481); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_7$$6); ZVAL_STRING(&_7$$6, "$#"); @@ -377,6 +377,14 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) ZEPHIR_OBS_NVAR(&moduleName); zephir_array_isset_long_fetch(&moduleName, &scope, 2, 0); ZEPHIR_INIT_NVAR(&_11$$4); + if (Z_TYPE_P(&moduleName) != IS_NULL) { + ZEPHIR_CPY_WRT(&_11$$4, &moduleName); + } else { + ZEPHIR_INIT_NVAR(&_11$$4); + ZVAL_STRING(&_11$$4, ""); + } + ZEPHIR_CPY_WRT(&moduleName, &_11$$4); + ZEPHIR_INIT_NVAR(&_11$$4); ZEPHIR_CONCAT_VV(&_11$$4, &controllerName, &controllerSuffix); zephir_get_strval(&sufixed, &_11$$4); if (Z_TYPE_P(&namespaceName) != IS_NULL) { @@ -395,7 +403,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) ZEPHIR_CALL_METHOD(&annotations, &classAnnotations, "getannotations", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&annotations) == IS_ARRAY) { - zephir_is_iterable(&annotations, 0, "phalcon/Mvc/Router/Annotations.zep", 217); + zephir_is_iterable(&annotations, 0, "phalcon/Mvc/Router/Annotations.zep", 218); if (Z_TYPE_P(&annotations) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&annotations), _14$$15) { @@ -429,7 +437,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) if (Z_TYPE_P(&methodAnnotations) == IS_ARRAY) { ZEPHIR_INIT_NVAR(&lowerControllerName); zephir_uncamelize(&lowerControllerName, &controllerName, NULL ); - zephir_is_iterable(&methodAnnotations, 0, "phalcon/Mvc/Router/Annotations.zep", 243); + zephir_is_iterable(&methodAnnotations, 0, "phalcon/Mvc/Router/Annotations.zep", 244); if (Z_TYPE_P(&methodAnnotations) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&methodAnnotations), _19$$18, _20$$18, _17$$18) { @@ -446,7 +454,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) } ZEPHIR_CALL_METHOD(&_21$$19, &collection, "getannotations", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&_21$$19, 0, "phalcon/Mvc/Router/Annotations.zep", 242); + zephir_is_iterable(&_21$$19, 0, "phalcon/Mvc/Router/Annotations.zep", 243); if (Z_TYPE_P(&_21$$19) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_21$$19), _22$$19) { @@ -492,7 +500,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) } ZEPHIR_CALL_METHOD(&_25$$23, &collection, "getannotations", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&_25$$23, 0, "phalcon/Mvc/Router/Annotations.zep", 242); + zephir_is_iterable(&_25$$23, 0, "phalcon/Mvc/Router/Annotations.zep", 243); if (Z_TYPE_P(&_25$$23) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_25$$23), _26$$23) { @@ -548,7 +556,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) object_init_ex(&route, phalcon_mvc_router_route_ce); ZEPHIR_CALL_METHOD(NULL, &route, "__construct", &_4, 96, &prefix); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_28$$29, &route, "getcompiledpattern", &_6, 482); + ZEPHIR_CALL_METHOD(&_28$$29, &route, "getcompiledpattern", &_6, 481); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_29$$29); ZVAL_STRING(&_29$$29, "$#"); @@ -583,6 +591,14 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) ZEPHIR_OBS_NVAR(&moduleName); zephir_array_isset_long_fetch(&moduleName, &scope, 2, 0); ZEPHIR_INIT_NVAR(&_33$$27); + if (Z_TYPE_P(&moduleName) != IS_NULL) { + ZEPHIR_CPY_WRT(&_33$$27, &moduleName); + } else { + ZEPHIR_INIT_NVAR(&_33$$27); + ZVAL_STRING(&_33$$27, ""); + } + ZEPHIR_CPY_WRT(&moduleName, &_33$$27); + ZEPHIR_INIT_NVAR(&_33$$27); ZEPHIR_CONCAT_VV(&_33$$27, &controllerName, &controllerSuffix); zephir_get_strval(&sufixed, &_33$$27); if (Z_TYPE_P(&namespaceName) != IS_NULL) { @@ -601,7 +617,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) ZEPHIR_CALL_METHOD(&annotations, &classAnnotations, "getannotations", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&annotations) == IS_ARRAY) { - zephir_is_iterable(&annotations, 0, "phalcon/Mvc/Router/Annotations.zep", 217); + zephir_is_iterable(&annotations, 0, "phalcon/Mvc/Router/Annotations.zep", 218); if (Z_TYPE_P(&annotations) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&annotations), _36$$38) { @@ -635,7 +651,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) if (Z_TYPE_P(&methodAnnotations) == IS_ARRAY) { ZEPHIR_INIT_NVAR(&lowerControllerName); zephir_uncamelize(&lowerControllerName, &controllerName, NULL ); - zephir_is_iterable(&methodAnnotations, 0, "phalcon/Mvc/Router/Annotations.zep", 243); + zephir_is_iterable(&methodAnnotations, 0, "phalcon/Mvc/Router/Annotations.zep", 244); if (Z_TYPE_P(&methodAnnotations) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&methodAnnotations), _40$$41, _41$$41, _38$$41) { @@ -652,7 +668,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) } ZEPHIR_CALL_METHOD(&_42$$42, &collection, "getannotations", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&_42$$42, 0, "phalcon/Mvc/Router/Annotations.zep", 242); + zephir_is_iterable(&_42$$42, 0, "phalcon/Mvc/Router/Annotations.zep", 243); if (Z_TYPE_P(&_42$$42) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_42$$42), _43$$42) { @@ -698,7 +714,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) } ZEPHIR_CALL_METHOD(&_45$$46, &collection, "getannotations", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&_45$$46, 0, "phalcon/Mvc/Router/Annotations.zep", 242); + zephir_is_iterable(&_45$$46, 0, "phalcon/Mvc/Router/Annotations.zep", 243); if (Z_TYPE_P(&_45$$46) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_45$$46), _46$$46) { @@ -931,7 +947,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, processActionAnnotation) ZEPHIR_CALL_METHOD(&converts, annotation, "getnamedargument", NULL, 0, &_5); zephir_check_call_status(); if (Z_TYPE_P(&converts) == IS_ARRAY) { - zephir_is_iterable(&converts, 0, "phalcon/Mvc/Router/Annotations.zep", 372); + zephir_is_iterable(&converts, 0, "phalcon/Mvc/Router/Annotations.zep", 373); if (Z_TYPE_P(&converts) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&converts), _11$$18, _12$$18, _9$$18) { @@ -973,7 +989,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, processActionAnnotation) ZEPHIR_CALL_METHOD(&converts, annotation, "getnamedargument", NULL, 0, &_5); zephir_check_call_status(); if (Z_TYPE_P(&converts) == IS_ARRAY) { - zephir_is_iterable(&converts, 0, "phalcon/Mvc/Router/Annotations.zep", 383); + zephir_is_iterable(&converts, 0, "phalcon/Mvc/Router/Annotations.zep", 384); if (Z_TYPE_P(&converts) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&converts), _17$$21, _18$$21, _15$$21) { @@ -1181,7 +1197,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, setActionPreformatCallback) zephir_create_closure_ex(&_0$$4, NULL, phalcon_10__closure_ce, SL("__invoke")); zephir_update_property_zval(this_ptr, ZEND_STRL("actionPreformatCallback"), &_0$$4); } else { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "The 'callback' parameter must be either a callable or NULL.", "phalcon/Mvc/Router/Annotations.zep", 462); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "The 'callback' parameter must be either a callable or NULL.", "phalcon/Mvc/Router/Annotations.zep", 463); return; } ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/mvc/router/group.zep.c b/ext/phalcon/mvc/router/group.zep.c index ca1dd8d613c..3169218ceb3 100644 --- a/ext/phalcon/mvc/router/group.zep.c +++ b/ext/phalcon/mvc/router/group.zep.c @@ -1104,7 +1104,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Group, addRoute) ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 96, &_2, &mergedPaths, httpMethods); zephir_check_call_status(); zephir_update_property_array_append(this_ptr, SL("routes"), &route); - ZEPHIR_CALL_METHOD(NULL, &route, "setgroup", NULL, 483, this_ptr); + ZEPHIR_CALL_METHOD(NULL, &route, "setgroup", NULL, 482, this_ptr); zephir_check_call_status(); RETURN_CCTOR(&route); } diff --git a/ext/phalcon/mvc/url.zep.c b/ext/phalcon/mvc/url.zep.c index 0f9b698ab37..a19d5700fcd 100644 --- a/ext/phalcon/mvc/url.zep.c +++ b/ext/phalcon/mvc/url.zep.c @@ -309,7 +309,7 @@ PHP_METHOD(Phalcon_Mvc_Url, get) zephir_check_call_status(); } if (zephir_is_true(args)) { - ZEPHIR_CALL_FUNCTION(&queryString, "http_build_query", NULL, 484, args); + ZEPHIR_CALL_FUNCTION(&queryString, "http_build_query", NULL, 483, args); zephir_check_call_status(); _20$$16 = Z_TYPE_P(&queryString) == IS_STRING; if (_20$$16) { diff --git a/ext/phalcon/mvc/view.zep.c b/ext/phalcon/mvc/view.zep.c index aec7b8ac395..9e1ddefa8dc 100644 --- a/ext/phalcon/mvc/view.zep.c +++ b/ext/phalcon/mvc/view.zep.c @@ -555,7 +555,7 @@ PHP_METHOD(Phalcon_Mvc_View, finish) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 485); + ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 484); zephir_check_call_status(); RETURN_THIS(); } @@ -1967,7 +1967,7 @@ PHP_METHOD(Phalcon_Mvc_View, setViewsDir) return; } if (Z_TYPE_P(viewsDir) == IS_STRING) { - ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "getdirseparator", NULL, 486, viewsDir); + ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "getdirseparator", NULL, 485, viewsDir); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("viewsDirs"), &_1$$4); } else { @@ -1989,7 +1989,7 @@ PHP_METHOD(Phalcon_Mvc_View, setViewsDir) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Views directory item must be a string", "phalcon/Mvc/View.zep", 968); return; } - ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "getdirseparator", NULL, 486, &directory); + ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "getdirseparator", NULL, 485, &directory); zephir_check_call_status(); zephir_array_update_zval(&newViewsDir, &position, &_6$$6, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -2010,7 +2010,7 @@ PHP_METHOD(Phalcon_Mvc_View, setViewsDir) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Views directory item must be a string", "phalcon/Mvc/View.zep", 968); return; } - ZEPHIR_CALL_METHOD(&_7$$8, this_ptr, "getdirseparator", NULL, 486, &directory); + ZEPHIR_CALL_METHOD(&_7$$8, this_ptr, "getdirseparator", NULL, 485, &directory); zephir_check_call_status(); zephir_array_update_zval(&newViewsDir, &position, &_7$$8, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, viewsDir, "next", NULL, 0); @@ -2213,7 +2213,7 @@ PHP_METHOD(Phalcon_Mvc_View, engineRender) { ZEPHIR_INIT_NVAR(&viewsDir); ZVAL_COPY(&viewsDir, _2); - ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "isabsolutepath", &_5, 487, &viewPath); + ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "isabsolutepath", &_5, 486, &viewPath); zephir_check_call_status(); if (!(zephir_is_true(&_4$$3))) { ZEPHIR_INIT_NVAR(&viewsDirPath); @@ -2329,7 +2329,7 @@ PHP_METHOD(Phalcon_Mvc_View, engineRender) } ZEPHIR_CALL_METHOD(&viewsDir, &_1, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_24$$16, this_ptr, "isabsolutepath", &_5, 487, &viewPath); + ZEPHIR_CALL_METHOD(&_24$$16, this_ptr, "isabsolutepath", &_5, 486, &viewPath); zephir_check_call_status(); if (!(zephir_is_true(&_24$$16))) { ZEPHIR_INIT_NVAR(&viewsDirPath); @@ -2560,7 +2560,7 @@ PHP_METHOD(Phalcon_Mvc_View, loadTemplateEngines) if (ZEPHIR_IS_EMPTY(®isteredEngines)) { ZEPHIR_INIT_VAR(&_2$$4); object_init_ex(&_2$$4, phalcon_mvc_view_engine_php_ce); - ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 488, this_ptr, &di); + ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 487, this_ptr, &di); zephir_check_call_status(); zephir_array_update_string(&engines, SL(".phtml"), &_2$$4, PH_COPY | PH_SEPARATE); } else { @@ -2775,7 +2775,7 @@ PHP_METHOD(Phalcon_Mvc_View, processRender) zephir_update_property_zval(this_ptr, ZEND_STRL("currentRenderLevel"), &_0); zephir_read_property(&_0, this_ptr, ZEND_STRL("disabled"), PH_NOISY_CC | PH_READONLY); if (!ZEPHIR_IS_FALSE_IDENTICAL(&_0)) { - ZEPHIR_CALL_FUNCTION(&_1$$3, "ob_get_contents", NULL, 489); + ZEPHIR_CALL_FUNCTION(&_1$$3, "ob_get_contents", NULL, 488); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("content"), &_1$$3); RETURN_MM_BOOL(0); @@ -2833,7 +2833,7 @@ PHP_METHOD(Phalcon_Mvc_View, processRender) RETURN_MM_BOOL(0); } } - ZEPHIR_CALL_FUNCTION(&_8, "ob_get_contents", NULL, 489); + ZEPHIR_CALL_FUNCTION(&_8, "ob_get_contents", NULL, 488); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("content"), &_8); silence = 1; diff --git a/ext/phalcon/mvc/view/engine/php.zep.c b/ext/phalcon/mvc/view/engine/php.zep.c index e3811d1af13..4baf748d5d1 100644 --- a/ext/phalcon/mvc/view/engine/php.zep.c +++ b/ext/phalcon/mvc/view/engine/php.zep.c @@ -92,7 +92,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Php, render) if (mustClean) { - ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 490); + ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 489); zephir_check_call_status(); } if (Z_TYPE_P(params) == IS_ARRAY) { @@ -142,7 +142,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Php, render) } if (mustClean) { zephir_read_property(&_6$$7, this_ptr, ZEND_STRL("view"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_7$$7, "ob_get_contents", NULL, 489); + ZEPHIR_CALL_FUNCTION(&_7$$7, "ob_get_contents", NULL, 488); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_6$$7, "setcontent", NULL, 0, &_7$$7); zephir_check_call_status(); diff --git a/ext/phalcon/mvc/view/engine/volt.zep.c b/ext/phalcon/mvc/view/engine/volt.zep.c index 926aa39b666..f766cf7e4ec 100644 --- a/ext/phalcon/mvc/view/engine/volt.zep.c +++ b/ext/phalcon/mvc/view/engine/volt.zep.c @@ -186,7 +186,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, convertEncoding) _0 = ZEPHIR_IS_STRING_IDENTICAL(&to, "utf8"); } if (_0) { - ZEPHIR_RETURN_CALL_FUNCTION("utf8_encode", NULL, 491, &text); + ZEPHIR_RETURN_CALL_FUNCTION("utf8_encode", NULL, 490, &text); zephir_check_call_status(); RETURN_MM(); } @@ -236,18 +236,18 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, getCompiler) ZEPHIR_INIT_NVAR(&compiler); object_init_ex(&compiler, phalcon_mvc_view_engine_volt_compiler_ce); zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("view"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, &compiler, "__construct", NULL, 492, &_1$$3); + ZEPHIR_CALL_METHOD(NULL, &compiler, "__construct", NULL, 491, &_1$$3); zephir_check_call_status(); zephir_read_property(&_2$$3, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&container, &_2$$3); if (Z_TYPE_P(&container) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(NULL, &compiler, "setdi", NULL, 493, &container); + ZEPHIR_CALL_METHOD(NULL, &compiler, "setdi", NULL, 492, &container); zephir_check_call_status(); } zephir_read_property(&_2$$3, this_ptr, ZEND_STRL("options"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&options, &_2$$3); if (Z_TYPE_P(&options) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, &compiler, "setoptions", NULL, 494, &options); + ZEPHIR_CALL_METHOD(NULL, &compiler, "setoptions", NULL, 493, &options); zephir_check_call_status(); } zephir_update_property_zval(this_ptr, ZEND_STRL("compiler"), &compiler); @@ -460,7 +460,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, preload) zephir_fast_str_replace(&_5$$5, &_6$$5, &_7$$5, &href); ZEPHIR_INIT_VAR(&_8$$5); ZVAL_STRING(&_8$$5, "preload"); - ZEPHIR_CALL_METHOD(NULL, &link, "__construct", NULL, 495, &_8$$5, &_5$$5, &attributes); + ZEPHIR_CALL_METHOD(NULL, &link, "__construct", NULL, 494, &_8$$5, &_5$$5, &attributes); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_8$$5); object_init_ex(&_8$$5, phalcon_html_link_serializer_header_ce); @@ -472,7 +472,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, preload) ZEPHIR_INIT_VAR(&_10$$5); zephir_create_array(&_10$$5, 1, 0); zephir_array_fast_append(&_10$$5, &link); - ZEPHIR_CALL_METHOD(&_9$$5, &_8$$5, "serialize", NULL, 496, &_10$$5); + ZEPHIR_CALL_METHOD(&_9$$5, &_8$$5, "serialize", NULL, 495, &_10$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(&header); ZEPHIR_CONCAT_SV(&header, "Link: ", &_9$$5); @@ -549,7 +549,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render) if (mustClean) { - ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 490); + ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 489); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&compiler, this_ptr, "getcompiler", NULL, 0); @@ -625,7 +625,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render) } if (mustClean) { zephir_read_property(&_11$$11, this_ptr, ZEND_STRL("view"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_12$$11, "ob_get_contents", NULL, 489); + ZEPHIR_CALL_FUNCTION(&_12$$11, "ob_get_contents", NULL, 488); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_11$$11, "setcontent", NULL, 0, &_12$$11); zephir_check_call_status(); @@ -782,7 +782,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, slice) } if (Z_TYPE_P(value) == IS_ARRAY) { ZVAL_LONG(&_5$$9, start); - ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 497, value, &_5$$9, &length); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 496, value, &_5$$9, &length); zephir_check_call_status(); RETURN_MM(); } @@ -834,7 +834,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, sort) ZEPHIR_MAKE_REF(&value); - ZEPHIR_CALL_FUNCTION(NULL, "asort", NULL, 498, &value); + ZEPHIR_CALL_FUNCTION(NULL, "asort", NULL, 497, &value); ZEPHIR_UNREF(&value); zephir_check_call_status(); RETURN_CTOR(&value); diff --git a/ext/phalcon/mvc/view/engine/volt/compiler.zep.c b/ext/phalcon/mvc/view/engine/volt/compiler.zep.c index f20f1759a77..09e9cb4bdb0 100644 --- a/ext/phalcon/mvc/view/engine/volt/compiler.zep.c +++ b/ext/phalcon/mvc/view/engine/volt/compiler.zep.c @@ -385,7 +385,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, attributeReader) } } } else { - ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", NULL, 499, &left); + ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", NULL, 498, &left); zephir_check_call_status(); ZEPHIR_OBS_VAR(&leftType); zephir_array_fetch_string(&leftType, &left, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 243); @@ -407,7 +407,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, attributeReader) zephir_array_fetch_string(&_11$$11, &right, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 257); zephir_concat_self(&exprCode, &_11$$11); } else { - ZEPHIR_CALL_METHOD(&_12$$12, this_ptr, "expression", NULL, 499, &right); + ZEPHIR_CALL_METHOD(&_12$$12, this_ptr, "expression", NULL, 498, &right); zephir_check_call_status(); zephir_concat_self(&exprCode, &_12$$12); } @@ -679,7 +679,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compile) object_init_ex(&_17$$35, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_18$$35); ZEPHIR_CONCAT_SVS(&_18$$35, "Extends compilation file ", &compiledTemplatePath, " could not be opened"); - ZEPHIR_CALL_METHOD(NULL, &_17$$35, "__construct", NULL, 500, &_18$$35); + ZEPHIR_CALL_METHOD(NULL, &_17$$35, "__construct", NULL, 499, &_18$$35); zephir_check_call_status(); zephir_throw_exception_debug(&_17$$35, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 477); ZEPHIR_MM_RESTORE(); @@ -752,7 +752,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileAutoEscape) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_CALL_METHOD(&compilation, this_ptr, "statementlist", NULL, 501, &_0, &_1); + ZEPHIR_CALL_METHOD(&compilation, this_ptr, "statementlist", NULL, 500, &_0, &_1); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("autoescape"), &oldAutoescape); RETURN_CCTOR(&compilation); @@ -841,13 +841,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileCase) object_init_ex(&_0$$4, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$4); ZVAL_STRING(&_1$$4, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 500, &_1$$4, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 499, &_1$$4, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$4, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 567); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 499, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 498, &expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -889,7 +889,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileDo) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 591); return; } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 499, &expr); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 498, &expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -939,13 +939,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileEcho) object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 500, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 499, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 615); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 499, &expr); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 498, &expr); zephir_check_call_status(); zephir_array_fetch_string(&_2, &expr, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 623); if (ZEPHIR_IS_LONG(&_2, 350)) { @@ -1006,13 +1006,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileElseIf) object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 500, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 499, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 662); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 499, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 498, &expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -1102,7 +1102,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileFile) object_init_ex(&_0$$4, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$4); ZEPHIR_CONCAT_SVS(&_1$$4, "Template file ", &path, " does not exist"); - ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 500, &_1$$4); + ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 499, &_1$$4); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$4, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 702); ZEPHIR_MM_RESTORE(); @@ -1115,7 +1115,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileFile) object_init_ex(&_2$$5, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_3$$5); ZEPHIR_CONCAT_SVS(&_3$$5, "Template file ", &path, " could not be opened"); - ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 500, &_3$$5); + ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 499, &_3$$5); zephir_check_call_status(); zephir_throw_exception_debug(&_2$$5, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 714); ZEPHIR_MM_RESTORE(); @@ -1240,7 +1240,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) ZEPHIR_CONCAT_VV(&prefixLevel, &prefix, &level); ZEPHIR_OBS_VAR(&expr); zephir_array_fetch_string(&expr, &statement, SL("expr"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 780); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 499, &expr); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 498, &expr); zephir_check_call_status(); ZEPHIR_OBS_VAR(&blockStatements); zephir_array_fetch_string(&blockStatements, &statement, SL("block_statements"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 787); @@ -1300,7 +1300,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) } else { ZVAL_BOOL(&_4, 0); } - ZEPHIR_CALL_METHOD(&code, this_ptr, "statementlist", NULL, 501, &blockStatements, &_4); + ZEPHIR_CALL_METHOD(&code, this_ptr, "statementlist", NULL, 500, &blockStatements, &_4); zephir_check_call_status(); ZEPHIR_OBS_VAR(&loopContext); zephir_read_property(&loopContext, this_ptr, ZEND_STRL("loopPointers"), PH_NOISY_CC); @@ -1351,7 +1351,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) } ZEPHIR_OBS_VAR(&ifExpr); if (zephir_array_isset_string_fetch(&ifExpr, &statement, SL("if_expr"), 0)) { - ZEPHIR_CALL_METHOD(&_16$$15, this_ptr, "expression", NULL, 499, &ifExpr); + ZEPHIR_CALL_METHOD(&_16$$15, this_ptr, "expression", NULL, 498, &ifExpr); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_17$$15); ZEPHIR_CONCAT_SVS(&_17$$15, "if (", &_16$$15, ") { ?>"); @@ -1493,13 +1493,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 500, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 499, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 942); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 499, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 498, &expr); zephir_check_call_status(); zephir_array_fetch_string(&_4, &statement, SL("true_statements"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 948); if (extendsMode) { @@ -1507,7 +1507,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) } else { ZVAL_BOOL(&_5, 0); } - ZEPHIR_CALL_METHOD(&_3, this_ptr, "statementlist", NULL, 501, &_4, &_5); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "statementlist", NULL, 500, &_4, &_5); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6); ZEPHIR_CONCAT_SVSV(&_6, "", &_3); @@ -1519,7 +1519,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) } else { ZVAL_BOOL(&_8$$4, 0); } - ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "statementlist", NULL, 501, &blockStatements, &_8$$4); + ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "statementlist", NULL, 500, &blockStatements, &_8$$4); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_9$$4); ZEPHIR_CONCAT_SV(&_9$$4, "", &_7$$4); @@ -1597,14 +1597,14 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileInclude) RETURN_CCTOR(&compilation); } } - ZEPHIR_CALL_METHOD(&path, this_ptr, "expression", NULL, 499, &pathExpr); + ZEPHIR_CALL_METHOD(&path, this_ptr, "expression", NULL, 498, &pathExpr); zephir_check_call_status(); ZEPHIR_OBS_VAR(¶ms); if (!(zephir_array_isset_string_fetch(¶ms, &statement, SL("params"), 0))) { ZEPHIR_CONCAT_SVS(return_value, "partial(", &path, "); ?>"); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&_3, this_ptr, "expression", NULL, 499, ¶ms); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "expression", NULL, 498, ¶ms); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "partial(", &path, ", ", &_3, "); ?>"); RETURN_MM(); @@ -1692,7 +1692,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro) object_init_ex(&_1$$4, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_2$$4); ZEPHIR_CONCAT_SVS(&_2$$4, "Macro '", &name, "' is already defined"); - ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 500, &_2$$4); + ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 499, &_2$$4); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$4, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1064); ZEPHIR_MM_RESTORE(); @@ -1743,7 +1743,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro) zephir_concat_self_str(&code, " } else { ", sizeof(" } else { ") - 1); ZEPHIR_OBS_NVAR(&defaultValue); if (EXPECTED(zephir_array_isset_string_fetch(&defaultValue, ¶meter, SL("default"), 0))) { - ZEPHIR_CALL_METHOD(&_14$$8, this_ptr, "expression", &_15, 499, &defaultValue); + ZEPHIR_CALL_METHOD(&_14$$8, this_ptr, "expression", &_15, 498, &defaultValue); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$8); ZEPHIR_CONCAT_SVSVS(&_16$$8, "$", &variableName, " = ", &_14$$8, ";"); @@ -1786,7 +1786,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro) zephir_concat_self_str(&code, " } else { ", sizeof(" } else { ") - 1); ZEPHIR_OBS_NVAR(&defaultValue); if (EXPECTED(zephir_array_isset_string_fetch(&defaultValue, ¶meter, SL("default"), 0))) { - ZEPHIR_CALL_METHOD(&_22$$11, this_ptr, "expression", &_15, 499, &defaultValue); + ZEPHIR_CALL_METHOD(&_22$$11, this_ptr, "expression", &_15, 498, &defaultValue); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_23$$11); ZEPHIR_CONCAT_SVSVS(&_23$$11, "$", &variableName, " = ", &_22$$11, ";"); @@ -1812,7 +1812,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro) } else { ZVAL_BOOL(&_26$$13, 0); } - ZEPHIR_CALL_METHOD(&_25$$13, this_ptr, "statementlist", NULL, 501, &blockStatements, &_26$$13); + ZEPHIR_CALL_METHOD(&_25$$13, this_ptr, "statementlist", NULL, 500, &blockStatements, &_26$$13); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_27$$13); ZEPHIR_CONCAT_VS(&_27$$13, &_25$$13, ""); RETURN_MM(); @@ -1935,10 +1935,10 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSet) ZEPHIR_INIT_NVAR(&assignment); ZVAL_COPY(&assignment, _0); zephir_array_fetch_string(&_2$$4, &assignment, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1177); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_3, 499, &_2$$4); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_3, 498, &_2$$4); zephir_check_call_status(); zephir_array_fetch_string(&_4$$4, &assignment, SL("variable"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1184); - ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_3, 499, &_4$$4); + ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_3, 498, &_4$$4); zephir_check_call_status(); zephir_array_fetch_string(&_5$$4, &assignment, SL("op"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1190); do { @@ -1985,10 +1985,10 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSet) ZEPHIR_CALL_METHOD(&assignment, &assignments, "current", NULL, 0); zephir_check_call_status(); zephir_array_fetch_string(&_11$$10, &assignment, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1177); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_3, 499, &_11$$10); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_3, 498, &_11$$10); zephir_check_call_status(); zephir_array_fetch_string(&_12$$10, &assignment, SL("variable"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1184); - ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_3, 499, &_12$$10); + ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_3, 498, &_12$$10); zephir_check_call_status(); zephir_array_fetch_string(&_13$$10, &assignment, SL("op"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1190); do { @@ -2153,13 +2153,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSwitch) object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 500, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 499, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1256); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 499, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 498, &expr); zephir_check_call_status(); ZEPHIR_INIT_VAR(&compilation); ZEPHIR_CONCAT_SVS(&compilation, ""); @@ -2170,7 +2170,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSwitch) } else { ZVAL_BOOL(&_3$$4, 0); } - ZEPHIR_CALL_METHOD(&lines, this_ptr, "statementlist", NULL, 501, &caseClauses, &_3$$4); + ZEPHIR_CALL_METHOD(&lines, this_ptr, "statementlist", NULL, 500, &caseClauses, &_3$$4); zephir_check_call_status(); if (zephir_fast_strlen_ev(&lines) != 0) { ZEPHIR_INIT_VAR(&_4$$5); @@ -2265,7 +2265,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) zephir_array_fast_append(&_1$$4, &expr); ZEPHIR_INIT_NVAR(&_2$$4); ZVAL_STRING(&_2$$4, "resolveExpression"); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "fireextensionevent", &_3, 502, &_2$$4, &_1$$4); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "fireextensionevent", &_3, 501, &_2$$4, &_1$$4); zephir_check_call_status(); if (Z_TYPE_P(&exprCode) == IS_STRING) { break; @@ -2282,7 +2282,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) ZEPHIR_INIT_NVAR(&singleExpr); ZVAL_COPY(&singleExpr, _4$$6); zephir_array_fetch_string(&_6$$7, &singleExpr, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1344); - ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_7, 499, &_6$$7); + ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_7, 498, &_6$$7); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); if (zephir_array_isset_string_fetch(&name, &singleExpr, SL("name"), 0)) { @@ -2305,7 +2305,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) ZEPHIR_CALL_METHOD(&singleExpr, &expr, "current", NULL, 0); zephir_check_call_status(); zephir_array_fetch_string(&_9$$10, &singleExpr, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1344); - ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_7, 499, &_9$$10); + ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_7, 498, &_9$$10); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); if (zephir_array_isset_string_fetch(&name, &singleExpr, SL("name"), 0)) { @@ -2331,7 +2331,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) } ZEPHIR_OBS_NVAR(&left); if (zephir_array_isset_string_fetch(&left, &expr, SL("left"), 0)) { - ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_7, 499, &left); + ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_7, 498, &left); zephir_check_call_status(); } if (ZEPHIR_IS_LONG(&type, 311)) { @@ -2342,13 +2342,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) } if (ZEPHIR_IS_LONG(&type, 124)) { zephir_array_fetch_string(&_14$$16, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1391); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "resolvefilter", &_15, 503, &_14$$16, &leftCode); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "resolvefilter", &_15, 502, &_14$$16, &leftCode); zephir_check_call_status(); break; } ZEPHIR_OBS_NVAR(&right); if (zephir_array_isset_string_fetch(&right, &expr, SL("right"), 0)) { - ZEPHIR_CALL_METHOD(&rightCode, this_ptr, "expression", &_7, 499, &right); + ZEPHIR_CALL_METHOD(&rightCode, this_ptr, "expression", &_7, 498, &right); zephir_check_call_status(); } ZEPHIR_INIT_NVAR(&exprCode); @@ -2524,7 +2524,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) if (ZEPHIR_IS_LONG(&type, 365)) { ZEPHIR_OBS_NVAR(&start); if (zephir_array_isset_string_fetch(&start, &expr, SL("start"), 0)) { - ZEPHIR_CALL_METHOD(&startCode, this_ptr, "expression", &_7, 499, &start); + ZEPHIR_CALL_METHOD(&startCode, this_ptr, "expression", &_7, 498, &start); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&startCode); @@ -2532,7 +2532,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) } ZEPHIR_OBS_NVAR(&end); if (zephir_array_isset_string_fetch(&end, &expr, SL("end"), 0)) { - ZEPHIR_CALL_METHOD(&endCode, this_ptr, "expression", &_7, 499, &end); + ZEPHIR_CALL_METHOD(&endCode, this_ptr, "expression", &_7, 498, &end); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&endCode); @@ -2624,7 +2624,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) } if (ZEPHIR_IS_LONG(&type, 366)) { zephir_array_fetch_string(&_23$$72, &expr, SL("ternary"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1625); - ZEPHIR_CALL_METHOD(&_22$$72, this_ptr, "expression", &_7, 499, &_23$$72); + ZEPHIR_CALL_METHOD(&_22$$72, this_ptr, "expression", &_7, 498, &_23$$72); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&exprCode); ZEPHIR_CONCAT_SVSVSVS(&exprCode, "(", &_22$$72, " ? ", &leftCode, " : ", &rightCode, ")"); @@ -2651,7 +2651,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) zephir_array_fetch_string(&_26$$76, &expr, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1643); ZEPHIR_INIT_NVAR(&_27$$76); ZEPHIR_CONCAT_SVSVSV(&_27$$76, "Unknown expression ", &type, " in ", &_25$$76, " on line ", &_26$$76); - ZEPHIR_CALL_METHOD(NULL, &_24$$76, "__construct", &_28, 500, &_27$$76); + ZEPHIR_CALL_METHOD(NULL, &_24$$76, "__construct", &_28, 499, &_27$$76); zephir_check_call_status(); zephir_throw_exception_debug(&_24$$76, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1643); ZEPHIR_MM_RESTORE(); @@ -2868,7 +2868,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) ZVAL_NULL(&funcArguments); ZEPHIR_OBS_NVAR(&funcArguments); if (zephir_array_isset_string_fetch(&funcArguments, &expr, SL("arguments"), 0)) { - ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 499, &funcArguments); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 498, &funcArguments); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&arguments); @@ -2891,7 +2891,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) zephir_array_fast_append(&_1$$6, &funcArguments); ZEPHIR_INIT_VAR(&_2$$6); ZVAL_STRING(&_2$$6, "compileFunction"); - ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 502, &_2$$6, &_1$$6); + ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 501, &_2$$6, &_1$$6); zephir_check_call_status(); if (Z_TYPE_P(&code) == IS_STRING) { RETURN_CCTOR(&code); @@ -2923,7 +2923,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) zephir_array_fetch_string(&_6$$9, &expr, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1775); ZEPHIR_INIT_VAR(&_7$$9); ZEPHIR_CONCAT_SVSVSV(&_7$$9, "Invalid definition for user function '", &name, "' in ", &_5$$9, " on line ", &_6$$9); - ZEPHIR_CALL_METHOD(NULL, &_4$$9, "__construct", NULL, 500, &_7$$9); + ZEPHIR_CALL_METHOD(NULL, &_4$$9, "__construct", NULL, 499, &_7$$9); zephir_check_call_status(); zephir_throw_exception_debug(&_4$$9, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1775); ZEPHIR_MM_RESTORE(); @@ -2952,7 +2952,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) zephir_read_property(&_11$$17, this_ptr, ZEND_STRL("exprLevel"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&exprLevel, &_11$$17); if (Z_TYPE_P(&block) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&code, this_ptr, "statementlistorextends", NULL, 504, &block); + ZEPHIR_CALL_METHOD(&code, this_ptr, "statementlistorextends", NULL, 503, &block); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&exprLevel, 1)) { ZEPHIR_CPY_WRT(&escapedCode, &code); @@ -3072,7 +3072,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) ZEPHIR_CONCAT_SVSVS(return_value, "$this->callMacro('", &name, "', [", &arguments, "])"); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&_21, this_ptr, "expression", NULL, 499, &nameExpr); + ZEPHIR_CALL_METHOD(&_21, this_ptr, "expression", NULL, 498, &nameExpr); zephir_check_call_status(); ZEPHIR_CONCAT_VSVS(return_value, &_21, "(", &arguments, ")"); RETURN_MM(); @@ -3407,28 +3407,28 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveTest) if (zephir_array_isset_string_fetch(&name, &testName, SL("value"), 0)) { if (ZEPHIR_IS_STRING(&name, "divisibleby")) { zephir_array_fetch_string(&_1$$12, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2155); - ZEPHIR_CALL_METHOD(&_0$$12, this_ptr, "expression", NULL, 499, &_1$$12); + ZEPHIR_CALL_METHOD(&_0$$12, this_ptr, "expression", NULL, 498, &_1$$12); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "(((", &left, ") % (", &_0$$12, ")) == 0)"); RETURN_MM(); } if (ZEPHIR_IS_STRING(&name, "sameas")) { zephir_array_fetch_string(&_3$$13, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2162); - ZEPHIR_CALL_METHOD(&_2$$13, this_ptr, "expression", NULL, 499, &_3$$13); + ZEPHIR_CALL_METHOD(&_2$$13, this_ptr, "expression", NULL, 498, &_3$$13); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "(", &left, ") === (", &_2$$13, ")"); RETURN_MM(); } if (ZEPHIR_IS_STRING(&name, "type")) { zephir_array_fetch_string(&_5$$14, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2169); - ZEPHIR_CALL_METHOD(&_4$$14, this_ptr, "expression", NULL, 499, &_5$$14); + ZEPHIR_CALL_METHOD(&_4$$14, this_ptr, "expression", NULL, 498, &_5$$14); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "gettype(", &left, ") === (", &_4$$14, ")"); RETURN_MM(); } } } - ZEPHIR_CALL_METHOD(&_6, this_ptr, "expression", NULL, 499, &test); + ZEPHIR_CALL_METHOD(&_6, this_ptr, "expression", NULL, 498, &test); zephir_check_call_status(); ZEPHIR_CONCAT_VSV(return_value, &left, " == ", &_6); RETURN_MM(); @@ -3647,7 +3647,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource) } else { ZVAL_BOOL(&_0, 0); } - ZEPHIR_CALL_METHOD(&compilation, this_ptr, "statementlist", NULL, 501, &intermediate, &_0); + ZEPHIR_CALL_METHOD(&compilation, this_ptr, "statementlist", NULL, 500, &intermediate, &_0); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("extended"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&extended, &_1); @@ -3683,11 +3683,11 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource) ZEPHIR_INIT_NVAR(&localBlock); array_init(&localBlock); } - ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 501, &localBlock); + ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 500, &localBlock); zephir_check_call_status(); } else { if (Z_TYPE_P(&block) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 501, &block); + ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 500, &block); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&blockCompilation, &block); @@ -3728,11 +3728,11 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource) ZEPHIR_INIT_NVAR(&localBlock); array_init(&localBlock); } - ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 501, &localBlock); + ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 500, &localBlock); zephir_check_call_status(); } else { if (Z_TYPE_P(&block) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 501, &block); + ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 500, &block); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&blockCompilation, &block); @@ -3927,7 +3927,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) zephir_array_fetch_string(&_2$$5, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2389); ZEPHIR_INIT_VAR(&_3$$5); ZEPHIR_CONCAT_SVSV(&_3$$5, "Unknown filter type in ", &_1$$5, " on line ", &_2$$5); - ZEPHIR_CALL_METHOD(NULL, &_0$$5, "__construct", NULL, 500, &_3$$5); + ZEPHIR_CALL_METHOD(NULL, &_0$$5, "__construct", NULL, 499, &_3$$5); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$5, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2389); ZEPHIR_MM_RESTORE(); @@ -3965,7 +3965,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) ZEPHIR_UNREF(&funcArguments); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 499, &funcArguments); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 498, &funcArguments); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&arguments, &left); @@ -3980,7 +3980,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) zephir_array_fast_append(&_7$$9, &funcArguments); ZEPHIR_INIT_VAR(&_8$$9); ZVAL_STRING(&_8$$9, "compileFilter"); - ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 502, &_8$$9, &_7$$9); + ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 501, &_8$$9, &_7$$9); zephir_check_call_status(); if (Z_TYPE_P(&code) == IS_STRING) { RETURN_CCTOR(&code); @@ -4011,7 +4011,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) zephir_array_fetch_string(&_12$$11, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2483); ZEPHIR_INIT_VAR(&_13$$11); ZEPHIR_CONCAT_SVSVSV(&_13$$11, "Invalid definition for user filter '", &name, "' in ", &_11$$11, " on line ", &_12$$11); - ZEPHIR_CALL_METHOD(NULL, &_10$$11, "__construct", NULL, 500, &_13$$11); + ZEPHIR_CALL_METHOD(NULL, &_10$$11, "__construct", NULL, 499, &_13$$11); zephir_check_call_status(); zephir_throw_exception_debug(&_10$$11, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2483); ZEPHIR_MM_RESTORE(); @@ -4145,7 +4145,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) zephir_array_fetch_string(&_25, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2677); ZEPHIR_INIT_VAR(&_26); ZEPHIR_CONCAT_SVSVSV(&_26, "Unknown filter \"", &name, "\" in ", &_24, " on line ", &_25); - ZEPHIR_CALL_METHOD(NULL, &_23, "__construct", NULL, 500, &_26); + ZEPHIR_CALL_METHOD(NULL, &_23, "__construct", NULL, 499, &_26); zephir_check_call_status(); zephir_throw_exception_debug(&_23, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2677); ZEPHIR_MM_RESTORE(); @@ -4316,7 +4316,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) zephir_array_fetch_string(&_6$$7, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2725); ZEPHIR_INIT_NVAR(&_7$$7); ZEPHIR_CONCAT_SVSV(&_7$$7, "Invalid statement in ", &_5$$7, " on line ", &_6$$7); - ZEPHIR_CALL_METHOD(NULL, &_4$$7, "__construct", &_8, 500, &_7$$7, &statement); + ZEPHIR_CALL_METHOD(NULL, &_4$$7, "__construct", &_8, 499, &_7$$7, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_4$$7, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2727); ZEPHIR_MM_RESTORE(); @@ -4328,7 +4328,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) zephir_array_fast_append(&_9$$8, &statement); ZEPHIR_INIT_NVAR(&_10$$8); ZVAL_STRING(&_10$$8, "compileStatement"); - ZEPHIR_CALL_METHOD(&tempCompilation, this_ptr, "fireextensionevent", &_11, 502, &_10$$8, &_9$$8); + ZEPHIR_CALL_METHOD(&tempCompilation, this_ptr, "fireextensionevent", &_11, 501, &_10$$8, &_9$$8); zephir_check_call_status(); if (Z_TYPE_P(&tempCompilation) == IS_STRING) { zephir_concat_self(&compilation, &tempCompilation); @@ -4433,7 +4433,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) } else { ZVAL_BOOL(&_34$$24, 0); } - ZEPHIR_CALL_METHOD(&_33$$24, this_ptr, "statementlist", &_35, 501, &blockStatements, &_34$$24); + ZEPHIR_CALL_METHOD(&_33$$24, this_ptr, "statementlist", &_35, 500, &blockStatements, &_34$$24); zephir_check_call_status(); zephir_concat_self(&compilation, &_33$$24); } @@ -4543,7 +4543,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) zephir_array_fetch_string(&_58$$37, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2957); ZEPHIR_INIT_NVAR(&_59$$37); ZEPHIR_CONCAT_SVSVSV(&_59$$37, "Unknown statement ", &type, " in ", &_57$$37, " on line ", &_58$$37); - ZEPHIR_CALL_METHOD(NULL, &_56$$37, "__construct", &_8, 500, &_59$$37); + ZEPHIR_CALL_METHOD(NULL, &_56$$37, "__construct", &_8, 499, &_59$$37); zephir_check_call_status(); zephir_throw_exception_debug(&_56$$37, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2957); ZEPHIR_MM_RESTORE(); @@ -4573,7 +4573,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) zephir_array_fetch_string(&_62$$40, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2725); ZEPHIR_INIT_NVAR(&_63$$40); ZEPHIR_CONCAT_SVSV(&_63$$40, "Invalid statement in ", &_61$$40, " on line ", &_62$$40); - ZEPHIR_CALL_METHOD(NULL, &_60$$40, "__construct", &_8, 500, &_63$$40, &statement); + ZEPHIR_CALL_METHOD(NULL, &_60$$40, "__construct", &_8, 499, &_63$$40, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_60$$40, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2727); ZEPHIR_MM_RESTORE(); @@ -4585,7 +4585,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) zephir_array_fast_append(&_64$$41, &statement); ZEPHIR_INIT_NVAR(&_65$$41); ZVAL_STRING(&_65$$41, "compileStatement"); - ZEPHIR_CALL_METHOD(&tempCompilation, this_ptr, "fireextensionevent", &_11, 502, &_65$$41, &_64$$41); + ZEPHIR_CALL_METHOD(&tempCompilation, this_ptr, "fireextensionevent", &_11, 501, &_65$$41, &_64$$41); zephir_check_call_status(); if (Z_TYPE_P(&tempCompilation) == IS_STRING) { zephir_concat_self(&compilation, &tempCompilation); @@ -4690,7 +4690,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) } else { ZVAL_BOOL(&_81$$57, 0); } - ZEPHIR_CALL_METHOD(&_80$$57, this_ptr, "statementlist", &_35, 501, &blockStatements, &_81$$57); + ZEPHIR_CALL_METHOD(&_80$$57, this_ptr, "statementlist", &_35, 500, &blockStatements, &_81$$57); zephir_check_call_status(); zephir_concat_self(&compilation, &_80$$57); } @@ -4800,7 +4800,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) zephir_array_fetch_string(&_96$$70, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2957); ZEPHIR_INIT_NVAR(&_97$$70); ZEPHIR_CONCAT_SVSVSV(&_97$$70, "Unknown statement ", &type, " in ", &_95$$70, " on line ", &_96$$70); - ZEPHIR_CALL_METHOD(NULL, &_94$$70, "__construct", &_8, 500, &_97$$70); + ZEPHIR_CALL_METHOD(NULL, &_94$$70, "__construct", &_8, 499, &_97$$70); zephir_check_call_status(); zephir_throw_exception_debug(&_94$$70, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2957); ZEPHIR_MM_RESTORE(); @@ -4893,7 +4893,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementListOrExtends) ZEPHIR_INIT_NVAR(&statement); } if (isStatementList) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "statementlist", NULL, 501, statements); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "statementlist", NULL, 500, statements); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/mvc/view/simple.zep.c b/ext/phalcon/mvc/view/simple.zep.c index a0bd830a30b..b95505756da 100644 --- a/ext/phalcon/mvc/view/simple.zep.c +++ b/ext/phalcon/mvc/view/simple.zep.c @@ -430,12 +430,12 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, partial) } else { ZEPHIR_CPY_WRT(&mergedParams, params); } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "internalrender", NULL, 505, &partialPath, &mergedParams); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "internalrender", NULL, 504, &partialPath, &mergedParams); zephir_check_call_status(); if (Z_TYPE_P(params) == IS_ARRAY) { zephir_update_property_zval(this_ptr, ZEND_STRL("viewParams"), &viewParams); } - ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 485); + ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 484); zephir_check_call_status(); zephir_read_property(&_2, this_ptr, ZEND_STRL("content"), PH_NOISY_CC | PH_READONLY); zend_print_zval(&_2, 0); @@ -540,9 +540,9 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, render) ZEPHIR_CPY_WRT(&viewParams, &_1); ZEPHIR_INIT_VAR(&mergedParams); zephir_fast_array_merge(&mergedParams, &viewParams, ¶ms); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "internalrender", NULL, 505, &path, &mergedParams); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "internalrender", NULL, 504, &path, &mergedParams); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 485); + ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 484); zephir_check_call_status(); RETURN_MM_MEMBER(getThis(), "content"); } @@ -794,7 +794,7 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, setViewsDir) } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdirseparator", NULL, 506, &viewsDir); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdirseparator", NULL, 505, &viewsDir); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("viewsDir"), &_0); ZEPHIR_MM_RESTORE(); @@ -853,7 +853,7 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, loadTemplateEngines) if (Z_TYPE_P(®isteredEngines) != IS_ARRAY) { ZEPHIR_INIT_VAR(&_2$$4); object_init_ex(&_2$$4, phalcon_mvc_view_engine_php_ce); - ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 488, this_ptr, &di); + ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 487, this_ptr, &di); zephir_check_call_status(); zephir_array_update_string(&engines, SL(".phtml"), &_2$$4, PH_COPY | PH_SEPARATE); } else { diff --git a/ext/phalcon/paginator/adapter/nativearray.zep.c b/ext/phalcon/paginator/adapter/nativearray.zep.c index e010644292e..aa0f6beea54 100644 --- a/ext/phalcon/paginator/adapter/nativearray.zep.c +++ b/ext/phalcon/paginator/adapter/nativearray.zep.c @@ -113,7 +113,7 @@ PHP_METHOD(Phalcon_Paginator_Adapter_NativeArray, paginate) } ZVAL_LONG(&_0, (show * ((pageNumber - 1)))); ZVAL_LONG(&_4, show); - ZEPHIR_CALL_FUNCTION(&_5, "array_slice", NULL, 497, &items, &_0, &_4); + ZEPHIR_CALL_FUNCTION(&_5, "array_slice", NULL, 496, &items, &_0, &_4); zephir_check_call_status(); ZEPHIR_CPY_WRT(&items, &_5); if (pageNumber < totalPages) { diff --git a/ext/phalcon/session/adapter/abstractadapter.zep.h b/ext/phalcon/session/adapter/abstractadapter.zep.h index d2ab59a8270..45be8c40575 100644 --- a/ext/phalcon/session/adapter/abstractadapter.zep.h +++ b/ext/phalcon/session/adapter/abstractadapter.zep.h @@ -18,9 +18,19 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_session_adapter_abstract ZEND_ARG_INFO(0, sessionId) ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 80100 +ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_phalcon_session_adapter_abstractadapter_gc, 0, 1, MAY_BE_LONG|MAY_BE_FALSE) + ZEND_ARG_TYPE_INFO(0, maxlifetime, IS_LONG, 0) +ZEND_END_ARG_INFO() +#elif PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_session_adapter_abstractadapter_gc, 0, 0, 1) + ZEND_ARG_TYPE_INFO(0, maxlifetime, IS_LONG, 0) +ZEND_END_ARG_INFO() +#else ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_session_adapter_abstractadapter_gc, 0, 0, 1) - ZEND_ARG_INFO(0, maxlifetime) + ZEND_ARG_INFO(0, maxlifetime) ZEND_END_ARG_INFO() +#endif ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_session_adapter_abstractadapter_read, 0, 1, IS_STRING, 0) ZEND_ARG_INFO(0, sessionId) diff --git a/ext/phalcon/session/adapter/noop.zep.h b/ext/phalcon/session/adapter/noop.zep.h index 99a7eb8d6b0..6b9adde87c8 100644 --- a/ext/phalcon/session/adapter/noop.zep.h +++ b/ext/phalcon/session/adapter/noop.zep.h @@ -28,9 +28,19 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_session_adapter_noop_des ZEND_ARG_INFO(0, sessionId) ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 80100 +ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_phalcon_session_adapter_noop_gc, 0, 1, MAY_BE_LONG|MAY_BE_FALSE) + ZEND_ARG_TYPE_INFO(0, maxlifetime, IS_LONG, 0) +ZEND_END_ARG_INFO() +#elif PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_session_adapter_noop_gc, 0, 0, 1) - ZEND_ARG_INFO(0, maxlifetime) + ZEND_ARG_TYPE_INFO(0, maxlifetime, IS_LONG, 0) ZEND_END_ARG_INFO() +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_session_adapter_noop_gc, 0, 0, 1) + ZEND_ARG_INFO(0, maxlifetime) +ZEND_END_ARG_INFO() +#endif ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_session_adapter_noop_read, 0, 1, IS_STRING, 0) ZEND_ARG_INFO(0, sessionId) diff --git a/ext/phalcon/session/adapter/stream.zep.c b/ext/phalcon/session/adapter/stream.zep.c index 02f71bdacf3..dc6e06341bd 100644 --- a/ext/phalcon/session/adapter/stream.zep.c +++ b/ext/phalcon/session/adapter/stream.zep.c @@ -139,7 +139,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, __construct) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_6, this_ptr, "getdirseparator", NULL, 507, &path); + ZEPHIR_CALL_METHOD(&_6, this_ptr, "getdirseparator", NULL, 506, &path); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("path"), &_6); ZEPHIR_MM_RESTORE(); @@ -177,7 +177,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, destroy) ZEPHIR_CONCAT_VV(&file, &_0, &_1); _2 = (zephir_file_exists(&file) == SUCCESS); if (_2) { - ZEPHIR_CALL_FUNCTION(&_3, "is_file", NULL, 508, &file); + ZEPHIR_CALL_FUNCTION(&_3, "is_file", NULL, 507, &file); zephir_check_call_status(); _2 = zephir_is_true(&_3); } @@ -190,17 +190,19 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, destroy) /** * Garbage Collector + * + * @param int $maxlifetime + * @return false|int */ PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) { zend_bool _6$$3, _9$$3, _12$$5, _14$$5; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zephir_fcall_cache_entry *_8 = NULL, *_11 = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *maxlifetime, maxlifetime_sub, file, pattern, time, _0, _1, _2, _3, *_4, _5, _7$$3, _10$$3, _13$$5, _15$$5; + zval *maxlifetime_param = NULL, file, pattern, time, _0, _1, _2, _3, *_4, _5, _7$$3, _10$$3, _13$$5, _15$$5; + zend_long maxlifetime, ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); - ZVAL_UNDEF(&maxlifetime_sub); ZVAL_UNDEF(&file); ZVAL_UNDEF(&pattern); ZVAL_UNDEF(&time); @@ -216,13 +218,14 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(maxlifetime) + Z_PARAM_LONG(maxlifetime) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &maxlifetime); + zephir_fetch_params(1, 1, 0, &maxlifetime_param); + maxlifetime = zephir_get_intval(maxlifetime_param); zephir_read_property(&_0, this_ptr, ZEND_STRL("path"), PH_NOISY_CC | PH_READONLY); @@ -232,10 +235,10 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) ZEPHIR_INIT_VAR(&_2); zephir_time(&_2); ZEPHIR_INIT_VAR(&time); - zephir_sub_function(&time, &_2, maxlifetime); - ZEPHIR_CALL_FUNCTION(&_3, "glob", NULL, 509, &pattern); + ZVAL_LONG(&time, (zephir_get_numberval(&_2) - maxlifetime)); + ZEPHIR_CALL_FUNCTION(&_3, "glob", NULL, 508, &pattern); zephir_check_call_status(); - zephir_is_iterable(&_3, 0, "phalcon/Session/Adapter/Stream.zep", 108); + zephir_is_iterable(&_3, 0, "phalcon/Session/Adapter/Stream.zep", 111); if (Z_TYPE_P(&_3) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_3), _4) { @@ -243,7 +246,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) ZVAL_COPY(&file, _4); _6$$3 = 1 == (zephir_file_exists(&file) == SUCCESS); if (_6$$3) { - ZEPHIR_CALL_FUNCTION(&_7$$3, "is_file", &_8, 508, &file); + ZEPHIR_CALL_FUNCTION(&_7$$3, "is_file", &_8, 507, &file); zephir_check_call_status(); _6$$3 = ZEPHIR_IS_TRUE_IDENTICAL(&_7$$3); } @@ -271,7 +274,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) zephir_check_call_status(); _12$$5 = 1 == (zephir_file_exists(&file) == SUCCESS); if (_12$$5) { - ZEPHIR_CALL_FUNCTION(&_13$$5, "is_file", &_8, 508, &file); + ZEPHIR_CALL_FUNCTION(&_13$$5, "is_file", &_8, 507, &file); zephir_check_call_status(); _12$$5 = ZEPHIR_IS_TRUE_IDENTICAL(&_13$$5); } @@ -712,7 +715,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, phpIniGet) zephir_get_strval(&varname, varname_param); - ZEPHIR_RETURN_CALL_FUNCTION("ini_get", NULL, 510, &varname); + ZEPHIR_RETURN_CALL_FUNCTION("ini_get", NULL, 509, &varname); zephir_check_call_status(); RETURN_MM(); } @@ -748,7 +751,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, phpIsWritable) zephir_get_strval(&filename, filename_param); - ZEPHIR_RETURN_CALL_FUNCTION("is_writable", NULL, 511, &filename); + ZEPHIR_RETURN_CALL_FUNCTION("is_writable", NULL, 510, &filename); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/session/adapter/stream.zep.h b/ext/phalcon/session/adapter/stream.zep.h index d70591dcf52..134fca2c9b0 100644 --- a/ext/phalcon/session/adapter/stream.zep.h +++ b/ext/phalcon/session/adapter/stream.zep.h @@ -30,9 +30,19 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_session_adapter_stream_d ZEND_ARG_INFO(0, sessionId) ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 80100 +ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_phalcon_session_adapter_stream_gc, 0, 1, MAY_BE_LONG|MAY_BE_FALSE) + ZEND_ARG_TYPE_INFO(0, maxlifetime, IS_LONG, 0) +ZEND_END_ARG_INFO() +#elif PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_session_adapter_stream_gc, 0, 0, 1) - ZEND_ARG_INFO(0, maxlifetime) + ZEND_ARG_TYPE_INFO(0, maxlifetime, IS_LONG, 0) ZEND_END_ARG_INFO() +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_session_adapter_stream_gc, 0, 0, 1) + ZEND_ARG_INFO(0, maxlifetime) +ZEND_END_ARG_INFO() +#endif ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_session_adapter_stream_open, 0, 2, _IS_BOOL, 0) ZEND_ARG_INFO(0, savePath) diff --git a/ext/phalcon/session/manager.zep.c b/ext/phalcon/session/manager.zep.c index bfc1b19d077..30c94563d0a 100644 --- a/ext/phalcon/session/manager.zep.c +++ b/ext/phalcon/session/manager.zep.c @@ -259,7 +259,7 @@ PHP_METHOD(Phalcon_Session_Manager, destroy) ZEPHIR_CALL_METHOD(&_0, this_ptr, "exists", NULL, 0); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - ZEPHIR_CALL_FUNCTION(NULL, "session_destroy", NULL, 0); + ZEPHIR_CALL_FUNCTION(NULL, "session_destroy", NULL, 511); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_SESSION); array_init(&_SESSION); diff --git a/ext/phalcon/storage/serializer/base64.zep.h b/ext/phalcon/storage/serializer/base64.zep.h index db588a01d24..fc6c36350a3 100644 --- a/ext/phalcon/storage/serializer/base64.zep.h +++ b/ext/phalcon/storage/serializer/base64.zep.h @@ -10,10 +10,15 @@ PHP_METHOD(Phalcon_Storage_Serializer_Base64, phpBase64Decode); ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_base64_serialize, 0, 0, IS_STRING, 0) ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_base64_unserialize, 0, 1, IS_VOID, 0) - - ZEND_ARG_INFO(0, data) + ZEND_ARG_TYPE_INFO(0, serialized, IS_STRING, 0) +ZEND_END_ARG_INFO() +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_base64_unserialize, 0, 1, IS_VOID, 0) + ZEND_ARG_INFO(0, serialized) ZEND_END_ARG_INFO() +#endif ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_base64_phpbase64decode, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0) diff --git a/ext/phalcon/storage/serializer/igbinary.zep.h b/ext/phalcon/storage/serializer/igbinary.zep.h index 9c64f3eaefb..4f388c5afc0 100644 --- a/ext/phalcon/storage/serializer/igbinary.zep.h +++ b/ext/phalcon/storage/serializer/igbinary.zep.h @@ -12,10 +12,15 @@ PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, doUnserialize); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_igbinary_serialize, 0, 0, 0) ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_igbinary_unserialize, 0, 1, IS_VOID, 0) - - ZEND_ARG_INFO(0, data) + ZEND_ARG_TYPE_INFO(0, serialized, IS_STRING, 0) +ZEND_END_ARG_INFO() +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_igbinary_unserialize, 0, 1, IS_VOID, 0) + ZEND_ARG_INFO(0, serialized) ZEND_END_ARG_INFO() +#endif ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_igbinary_phpigbinaryserialize, 0, 1, IS_STRING, 1) ZEND_ARG_INFO(0, value) diff --git a/ext/phalcon/storage/serializer/json.zep.h b/ext/phalcon/storage/serializer/json.zep.h index 5ebf3f20e59..732da81681a 100644 --- a/ext/phalcon/storage/serializer/json.zep.h +++ b/ext/phalcon/storage/serializer/json.zep.h @@ -11,10 +11,15 @@ PHP_METHOD(Phalcon_Storage_Serializer_Json, getEncode); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_json_serialize, 0, 0, 0) ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_json_unserialize, 0, 1, IS_VOID, 0) - - ZEND_ARG_INFO(0, data) + ZEND_ARG_TYPE_INFO(0, serialized, IS_STRING, 0) ZEND_END_ARG_INFO() +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_json_unserialize, 0, 1, IS_VOID, 0) + ZEND_ARG_INFO(0, serialized) +ZEND_END_ARG_INFO() +#endif ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_json_getdecode, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0) diff --git a/ext/phalcon/storage/serializer/none.zep.h b/ext/phalcon/storage/serializer/none.zep.h index deff604c1bc..346fa5e9ee8 100644 --- a/ext/phalcon/storage/serializer/none.zep.h +++ b/ext/phalcon/storage/serializer/none.zep.h @@ -9,10 +9,15 @@ PHP_METHOD(Phalcon_Storage_Serializer_None, unserialize); ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_none_serialize, 0, 0, IS_STRING, 1) ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_none_unserialize, 0, 1, IS_VOID, 0) - - ZEND_ARG_INFO(0, data) + ZEND_ARG_TYPE_INFO(0, serialized, IS_STRING, 0) +ZEND_END_ARG_INFO() +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_none_unserialize, 0, 1, IS_VOID, 0) + ZEND_ARG_INFO(0, serialized) ZEND_END_ARG_INFO() +#endif ZEPHIR_INIT_FUNCS(phalcon_storage_serializer_none_method_entry) { PHP_ME(Phalcon_Storage_Serializer_None, serialize, arginfo_phalcon_storage_serializer_none_serialize, ZEND_ACC_PUBLIC) diff --git a/ext/phalcon/storage/serializer/php.zep.h b/ext/phalcon/storage/serializer/php.zep.h index 11abd306a11..1aadb57bebb 100644 --- a/ext/phalcon/storage/serializer/php.zep.h +++ b/ext/phalcon/storage/serializer/php.zep.h @@ -10,10 +10,15 @@ PHP_METHOD(Phalcon_Storage_Serializer_Php, phpUnserialize); ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_php_serialize, 0, 0, IS_STRING, 0) ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_php_unserialize, 0, 1, IS_VOID, 0) - - ZEND_ARG_INFO(0, data) + ZEND_ARG_TYPE_INFO(0, serialized, IS_STRING, 0) +ZEND_END_ARG_INFO() +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_php_unserialize, 0, 1, IS_VOID, 0) + ZEND_ARG_INFO(0, serialized) ZEND_END_ARG_INFO() +#endif ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_php_phpunserialize, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0) diff --git a/ext/phalcon/support/collection.zep.h b/ext/phalcon/support/collection.zep.h index 49cf713ecee..b597fbecd35 100644 --- a/ext/phalcon/support/collection.zep.h +++ b/ext/phalcon/support/collection.zep.h @@ -27,6 +27,8 @@ PHP_METHOD(Phalcon_Support_Collection, serialize); PHP_METHOD(Phalcon_Support_Collection, toArray); PHP_METHOD(Phalcon_Support_Collection, toJson); PHP_METHOD(Phalcon_Support_Collection, unserialize); +PHP_METHOD(Phalcon_Support_Collection, __serialize); +PHP_METHOD(Phalcon_Support_Collection, __unserialize); PHP_METHOD(Phalcon_Support_Collection, setData); PHP_METHOD(Phalcon_Support_Collection, phpJsonEncode); PHP_METHOD(Phalcon_Support_Collection, processKey); @@ -102,7 +104,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_offse ZEND_ARG_INFO(0, element) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_support_collection_offsetget, 0, 0, 1) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_offsetget, 0, 1, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_offsetget, 0, 1, IS_NULL, 0) +#endif ZEND_ARG_INFO(0, element) ZEND_END_ARG_INFO() @@ -138,9 +144,22 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_tojso ZEND_ARG_TYPE_INFO(0, options, IS_LONG, 0) ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_unserialize, 0, 1, IS_VOID, 0) + ZEND_ARG_TYPE_INFO(0, serialized, IS_STRING, 0) +ZEND_END_ARG_INFO() +#else ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_unserialize, 0, 1, IS_VOID, 0) + ZEND_ARG_INFO(0, serialized) +ZEND_END_ARG_INFO() +#endif + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection___serialize, 0, 0, IS_ARRAY, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection___unserialize, 0, 1, IS_VOID, 0) - ZEND_ARG_INFO(0, serialized) + ZEND_ARG_ARRAY_INFO(0, data, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_setdata, 0, 2, IS_VOID, 0) @@ -187,6 +206,8 @@ ZEPHIR_INIT_FUNCS(phalcon_support_collection_method_entry) { PHP_ME(Phalcon_Support_Collection, toArray, arginfo_phalcon_support_collection_toarray, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Support_Collection, toJson, arginfo_phalcon_support_collection_tojson, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Support_Collection, unserialize, arginfo_phalcon_support_collection_unserialize, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Support_Collection, __serialize, arginfo_phalcon_support_collection___serialize, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Support_Collection, __unserialize, arginfo_phalcon_support_collection___unserialize, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Support_Collection, setData, arginfo_phalcon_support_collection_setdata, ZEND_ACC_PROTECTED) PHP_ME(Phalcon_Support_Collection, phpJsonEncode, arginfo_phalcon_support_collection_phpjsonencode, ZEND_ACC_PROTECTED) PHP_ME(Phalcon_Support_Collection, processKey, arginfo_phalcon_support_collection_processkey, ZEND_ACC_PROTECTED) diff --git a/ext/phalcon/support/debug.zep.c b/ext/phalcon/support/debug.zep.c index b2e21e5451d..fbfbcac90b9 100644 --- a/ext/phalcon/support/debug.zep.c +++ b/ext/phalcon/support/debug.zep.c @@ -386,7 +386,7 @@ PHP_METHOD(Phalcon_Support_Debug, onUncaughtException) ZEPHIR_CALL_FUNCTION(&obLevel, "ob_get_level", NULL, 0); zephir_check_call_status(); if (ZEPHIR_GT_LONG(&obLevel, 0)) { - ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 485); + ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 484); zephir_check_call_status(); } zephir_read_static_property_ce(&_0, phalcon_support_debug_ce, SL("isActive"), PH_NOISY_CC | PH_READONLY); diff --git a/ext/phalcon/support/debug/dump.zep.c b/ext/phalcon/support/debug/dump.zep.c index 189dfe21023..93a12fa8ee1 100644 --- a/ext/phalcon/support/debug/dump.zep.c +++ b/ext/phalcon/support/debug/dump.zep.c @@ -890,7 +890,7 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, output) ZEPHIR_CONCAT_VS(&_45$$11, &_44$$11, "[skipped]\n"); zephir_concat_self(&output, &_45$$11); } else if (_42$$9) { - ZEPHIR_CALL_FUNCTION(&_46$$12, "get_object_vars", NULL, 423, variable); + ZEPHIR_CALL_FUNCTION(&_46$$12, "get_object_vars", NULL, 422, variable); zephir_check_call_status(); zephir_is_iterable(&_46$$12, 0, "phalcon/Support/Debug/Dump.zep", 263); if (Z_TYPE_P(&_46$$12) == IS_ARRAY) { diff --git a/ext/phalcon/support/helper/arr/first.zep.c b/ext/phalcon/support/helper/arr/first.zep.c index 057b4acdd51..9dcd2e2985a 100644 --- a/ext/phalcon/support/helper/arr/first.zep.c +++ b/ext/phalcon/support/helper/arr/first.zep.c @@ -77,7 +77,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_First, __invoke) ZEPHIR_CALL_METHOD(&filtered, this_ptr, "tofilter", NULL, 0, &collection, method); zephir_check_call_status(); ZEPHIR_MAKE_REF(&filtered); - ZEPHIR_RETURN_CALL_FUNCTION("reset", NULL, 473, &filtered); + ZEPHIR_RETURN_CALL_FUNCTION("reset", NULL, 472, &filtered); ZEPHIR_UNREF(&filtered); zephir_check_call_status(); RETURN_MM(); diff --git a/ext/phalcon/support/helper/arr/sliceleft.zep.c b/ext/phalcon/support/helper/arr/sliceleft.zep.c index 5fc04761006..b86d2838ccc 100644 --- a/ext/phalcon/support/helper/arr/sliceleft.zep.c +++ b/ext/phalcon/support/helper/arr/sliceleft.zep.c @@ -75,7 +75,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_SliceLeft, __invoke) ZVAL_LONG(&_0, 0); ZVAL_LONG(&_1, elements); - ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 497, &collection, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 496, &collection, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/support/helper/arr/sliceright.zep.c b/ext/phalcon/support/helper/arr/sliceright.zep.c index 1da6d02fde0..31382b69679 100644 --- a/ext/phalcon/support/helper/arr/sliceright.zep.c +++ b/ext/phalcon/support/helper/arr/sliceright.zep.c @@ -73,7 +73,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_SliceRight, __invoke) ZVAL_LONG(&_0, elements); - ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 497, &collection, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 496, &collection, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/support/helper/str/concat.zep.c b/ext/phalcon/support/helper/str/concat.zep.c index 8a5779116fd..1c9ada17578 100644 --- a/ext/phalcon/support/helper/str/concat.zep.c +++ b/ext/phalcon/support/helper/str/concat.zep.c @@ -81,15 +81,15 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Concat, __invoke) return; } ZEPHIR_MAKE_REF(&arguments); - ZEPHIR_CALL_FUNCTION(&delimiter, "reset", NULL, 473, &arguments); + ZEPHIR_CALL_FUNCTION(&delimiter, "reset", NULL, 472, &arguments); ZEPHIR_UNREF(&arguments); zephir_check_call_status(); ZVAL_LONG(&_0, 1); - ZEPHIR_CALL_FUNCTION(&_1, "array_slice", NULL, 497, &arguments, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "array_slice", NULL, 496, &arguments, &_0); zephir_check_call_status(); ZEPHIR_CPY_WRT(&arguments, &_1); ZEPHIR_MAKE_REF(&arguments); - ZEPHIR_CALL_FUNCTION(&first, "reset", NULL, 473, &arguments); + ZEPHIR_CALL_FUNCTION(&first, "reset", NULL, 472, &arguments); ZEPHIR_UNREF(&arguments); zephir_check_call_status(); ZEPHIR_MAKE_REF(&arguments); diff --git a/ext/phalcon/tag.zep.c b/ext/phalcon/tag.zep.c index 43a205e4490..e37ca5a3928 100644 --- a/ext/phalcon/tag.zep.c +++ b/ext/phalcon/tag.zep.c @@ -1852,7 +1852,7 @@ PHP_METHOD(Phalcon_Tag, preload) zephir_fast_str_replace(&_5$$5, &_6$$5, &_7$$5, &href); ZEPHIR_INIT_VAR(&_8$$5); ZVAL_STRING(&_8$$5, "preload"); - ZEPHIR_CALL_METHOD(NULL, &link, "__construct", NULL, 495, &_8$$5, &_5$$5, &attributes); + ZEPHIR_CALL_METHOD(NULL, &link, "__construct", NULL, 494, &_8$$5, &_5$$5, &attributes); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_8$$5); object_init_ex(&_8$$5, phalcon_html_link_serializer_header_ce); @@ -1864,7 +1864,7 @@ PHP_METHOD(Phalcon_Tag, preload) ZEPHIR_INIT_VAR(&_10$$5); zephir_create_array(&_10$$5, 1, 0); zephir_array_fast_append(&_10$$5, &link); - ZEPHIR_CALL_METHOD(&_9$$5, &_8$$5, "serialize", NULL, 496, &_10$$5); + ZEPHIR_CALL_METHOD(&_9$$5, &_8$$5, "serialize", NULL, 495, &_10$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(&header); ZEPHIR_CONCAT_SV(&header, "Link: ", &_9$$5); diff --git a/ext/php_phalcon.h b/ext/php_phalcon.h index 7c90d409c0f..5bd542092b3 100644 --- a/ext/php_phalcon.h +++ b/ext/php_phalcon.h @@ -14,7 +14,7 @@ #define PHP_PHALCON_VERSION "5.0.0beta3" #define PHP_PHALCON_EXTNAME "phalcon" #define PHP_PHALCON_AUTHOR "Phalcon Team and contributors" -#define PHP_PHALCON_ZEPVERSION "0.15.2-5828ae2" +#define PHP_PHALCON_ZEPVERSION "0.16.0-$Id$" #define PHP_PHALCON_DESCRIPTION "Phalcon is a full stack PHP framework, delivered as a PHP extension, offering lower resource consumption and high performance." typedef struct _zephir_struct_db { From a4613c74ca74f8f0a77047269bd0a87626020418 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Thu, 19 May 2022 22:30:46 +0100 Subject: [PATCH 55/91] #15598 - Add PHP8.1 in workflows --- .github/workflows/build-docker.yml | 2 +- .github/workflows/main.yml | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 68e11290174..b92ebba94ab 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -16,7 +16,7 @@ jobs: name: Build Dockerfile PHP ${{ matrix.php }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Build Dockerfile run: docker build docker/${{ matrix.php }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 46790754695..e4974c818ee 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,7 +22,6 @@ env: PHALCON_VERSION: 5.0.0beta3 ZEPHIR_PARSER_VERSION: 1.5.0 ZEPHIR_VERSION: 0.16.0 - PSR_VERSION: 1.2.0 # For tests LANG: en_US.UTF-8 @@ -66,7 +65,7 @@ jobs: generate: needs: setup_workflow - uses: zephir-lang/templates/.github/workflows/phalcon-pecl.yml@main + uses: zephir-lang/templates/.github/workflows/phalcon-pecl-8.1.yml@main with: extensions: ${{ needs.setup_workflow.outputs.zephir_extensions }} secrets: @@ -79,7 +78,7 @@ jobs: strategy: fail-fast: false matrix: - php: [ '7.4', '8.0' ] + php: [ '7.4', '8.0', '8.1' ] ts: [ 'nts', 'ts' ] arch: [ 'x64' ] @@ -99,6 +98,8 @@ jobs: - { php: '7.4', ts: 'nts', arch: 'x64', name: 'windows2019-vc15', os: 'windows-2019', compiler: 'vc15' } - { php: '8.0', ts: 'ts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' } - { php: '8.0', ts: 'nts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' } + - { php: '8.1', ts: 'ts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' } + - { php: '8.1', ts: 'nts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' } steps: - uses: actions/checkout@v2 @@ -254,7 +255,7 @@ jobs: strategy: fail-fast: false matrix: - php: [ '7.4', '8.0' ] + php: [ '7.4', '8.0', '8.1' ] steps: - uses: actions/checkout@v2 From cd6bb987d456a68c6763340be864f5f229ab1db0 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 21 May 2022 21:44:23 +0100 Subject: [PATCH 56/91] #15598 - Fix CLI tests --- phalcon/Cli/Router.zep | 4 ++-- tests/cli/Cli/Router/HandleCest.php | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/phalcon/Cli/Router.zep b/phalcon/Cli/Router.zep index 5253690a957..ca71eb6b09c 100644 --- a/phalcon/Cli/Router.zep +++ b/phalcon/Cli/Router.zep @@ -75,9 +75,9 @@ class Router extends AbstractInjectionAware protected matches = null; /** - * @var string|null + * @var string */ - protected module = null; + protected module = ""; /** * @var array diff --git a/tests/cli/Cli/Router/HandleCest.php b/tests/cli/Cli/Router/HandleCest.php index 7172e83e6e4..949119c539d 100644 --- a/tests/cli/Cli/Router/HandleCest.php +++ b/tests/cli/Cli/Router/HandleCest.php @@ -55,7 +55,8 @@ public function cliRouterHandle(CliTester $I) 'task' => 'main', ] ); - $I->assertNull( + $I->assertSame( + '', $router->getModuleName() ); $I->assertEquals( From c0adc8a376a6f7ae713d10c1c2318c8de7820d77 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 21 May 2022 22:19:45 +0100 Subject: [PATCH 57/91] #15598 - Adjust CLI tests --- ext/phalcon/cli/router.zep.c | 4 ++-- tests/cli/Cli/Router/GetModuleNameCest.php | 3 ++- tests/cli/Cli/Router/HandleCest.php | 9 ++++++--- tests/cli/Cli/Router/SetDefaultModuleCest.php | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ext/phalcon/cli/router.zep.c b/ext/phalcon/cli/router.zep.c index 34ddd957f96..890dfcdcdef 100644 --- a/ext/phalcon/cli/router.zep.c +++ b/ext/phalcon/cli/router.zep.c @@ -84,9 +84,9 @@ ZEPHIR_INIT_CLASS(Phalcon_Cli_Router) */ zend_declare_property_null(phalcon_cli_router_ce, SL("matches"), ZEND_ACC_PROTECTED); /** - * @var string|null + * @var string */ - zend_declare_property_null(phalcon_cli_router_ce, SL("module"), ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_cli_router_ce, SL("module"), "", ZEND_ACC_PROTECTED); /** * @var array */ diff --git a/tests/cli/Cli/Router/GetModuleNameCest.php b/tests/cli/Cli/Router/GetModuleNameCest.php index 547d820c641..06e6f5fd2cd 100644 --- a/tests/cli/Cli/Router/GetModuleNameCest.php +++ b/tests/cli/Cli/Router/GetModuleNameCest.php @@ -29,7 +29,8 @@ public function cliRouterGetModuleName(CliTester $I) $I->wantToTest('Cli\Router - getModuleName()'); $router = new Router(); - $I->assertNull( + $I->assertSame( + '', $router->getModuleName() ); $router->handle([ diff --git a/tests/cli/Cli/Router/HandleCest.php b/tests/cli/Cli/Router/HandleCest.php index 949119c539d..01a138da817 100644 --- a/tests/cli/Cli/Router/HandleCest.php +++ b/tests/cli/Cli/Router/HandleCest.php @@ -77,7 +77,8 @@ public function cliRouterHandle(CliTester $I) 'task' => 'echo', ] ); - $I->assertNull( + $I->assertSame( + '', $router->getModuleName() ); $I->assertEquals( @@ -98,7 +99,8 @@ public function cliRouterHandle(CliTester $I) ] ); - $I->assertNull( + $I->assertSame( + '', $router->getModuleName() ); $I->assertEquals( @@ -122,7 +124,8 @@ public function cliRouterHandle(CliTester $I) ] ); - $I->assertNull( + $I->assertSame( + '', $router->getModuleName() ); $I->assertEquals( diff --git a/tests/cli/Cli/Router/SetDefaultModuleCest.php b/tests/cli/Cli/Router/SetDefaultModuleCest.php index ee611d4d396..ec42d0b47aa 100644 --- a/tests/cli/Cli/Router/SetDefaultModuleCest.php +++ b/tests/cli/Cli/Router/SetDefaultModuleCest.php @@ -31,7 +31,7 @@ public function cliRouterSetDefaultModule(CliTester $I) $router = new Router(false); $I->assertSame('', $router->getModuleName()); $router->handle(""); - $I->assertNull($router->getModuleName()); + $I->assertSame('', $router->getModuleName()); $router->setDefaultModule("test"); $router->handle(""); $I->assertEquals("test", $router->getModuleName()); From 805b018272be14f142d1a0f1a701c79c5254172c Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 15:27:57 +0100 Subject: [PATCH 58/91] #15598 - Map tcp ports --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e4974c818ee..54bda962548 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -230,7 +230,7 @@ jobs: mysql: image: mysql:5.7 ports: - - 3306 + - "3306:3306" env: MYSQL_ROOT_PASSWORD: secret MYSQL_USER: phalcon @@ -239,18 +239,18 @@ jobs: postgres: image: postgres:12-alpine ports: - - 5432 + - "5432:5432" env: POSTGRES_PASSWORD: secret POSTGRES_DB: phalcon redis: image: redis:5-alpine ports: - - 6379 + - "6379:6379" memcached: image: memcached:1.5-alpine ports: - - 11211 + - "11211:11211" strategy: fail-fast: false From a319eef7acc7aa29663074614e8dea9f78bd385d Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 15:28:24 +0100 Subject: [PATCH 59/91] #15598 - Optimize imports --- tests/_config/bootstrap.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/_config/bootstrap.php b/tests/_config/bootstrap.php index fdbe37f0c2b..37e8f4c2ebd 100644 --- a/tests/_config/bootstrap.php +++ b/tests/_config/bootstrap.php @@ -1,15 +1,12 @@ set('dispatcher', Dispatcher::class); $application = new Application(); - $application->setDI($container); FactoryDefault::setDefault($container); From 1b5d6d6bf6bc6145a1770e586114a4758128f070 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 15:28:46 +0100 Subject: [PATCH 60/91] #15598 - Cleanup code --- tests/_bootstrap.php | 20 -------------------- tests/_config/functions.php | 2 -- tests/_support/Helper/Database.php | 3 ++- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php index e0ad346ed7c..285a50746d3 100644 --- a/tests/_bootstrap.php +++ b/tests/_bootstrap.php @@ -2,8 +2,6 @@ declare(strict_types=1); -use Codeception\Util\Autoload; - $root = dirname(realpath(__DIR__) . DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR; define('PROJECT_PATH', $root); @@ -14,22 +12,4 @@ loadFolders(); loadDefined(); -// -///** -// * Setting this in the $_ENV so that DotLoad sets everything up properly -// */ -//$_ENV['PROJECT_PATH'] = $root; -// -//require_once $root . 'tests/shim.php'; -// -// -//define('APP_DATA', dataDir()); -//define('APP_PATH', codecept_root_dir()); -//define('APP_PATH_OUTPUT', outputDir()); -// -// -//loadEnvironment($root); -//loadFolders(); -// - unset($root); diff --git a/tests/_config/functions.php b/tests/_config/functions.php index c11f9e90061..3c31119ef92 100644 --- a/tests/_config/functions.php +++ b/tests/_config/functions.php @@ -58,7 +58,6 @@ function loadDefined() defineFromEnv('DATA_MYSQL_PORT'); defineFromEnv('DATA_MYSQL_USER'); -// define('PATH_CACHE'); if (!defined('PATH_DATA')) { define('PATH_DATA', dataDir()); } @@ -66,7 +65,6 @@ function loadDefined() if (!defined('PATH_OUTPUT')) { define('PATH_OUTPUT', outputDir()); } -// define('PATH_FIXTURES'); } } diff --git a/tests/_support/Helper/Database.php b/tests/_support/Helper/Database.php index c6d60eca60f..e72f3ab71b3 100644 --- a/tests/_support/Helper/Database.php +++ b/tests/_support/Helper/Database.php @@ -6,6 +6,7 @@ // all public methods declared in helper class will be available in $I use Codeception\Exception\ModuleException; +use Codeception\Module; use Codeception\TestInterface; use PDO; use Phalcon\DataMapper\Pdo\Connection; @@ -24,7 +25,7 @@ * @property string $password * @property string $username */ -class Database extends \Codeception\Module +class Database extends Module { /** * @var string From c0a9000c2f9afb2cee725000e18bc3e37d7f0364 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 15:29:04 +0100 Subject: [PATCH 61/91] #15598 - Change assertion method --- tests/database/Mvc/Model/FindCest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/database/Mvc/Model/FindCest.php b/tests/database/Mvc/Model/FindCest.php index 6f31a3fc4a1..de3630531a8 100644 --- a/tests/database/Mvc/Model/FindCest.php +++ b/tests/database/Mvc/Model/FindCest.php @@ -289,7 +289,7 @@ public function mvcModelFindPrivatePropertyWithRedisCache(DatabaseTester $I) ] ); - $I->assertCount(1, $original); + $I->assertSame(1, $original->count()); $record = $original[0]; $actual = $record->getIsActive(); @@ -320,7 +320,7 @@ public function mvcModelFindPrivatePropertyWithRedisCache(DatabaseTester $I) ] ); - $I->assertCount(1, $cached); + $I->assertSame(1, $cached->count()); $record = $cached[0]; $actual = $record->getIsActive(); @@ -345,7 +345,7 @@ public function mvcModelFindPrivatePropertyWithRedisCache(DatabaseTester $I) ] ); - $I->assertCount(0, $original); + $I->assertSame(0, $original->count()); /** * Finally get it back from the cache @@ -364,7 +364,7 @@ public function mvcModelFindPrivatePropertyWithRedisCache(DatabaseTester $I) ] ); - $I->assertCount(1, $cached); + $I->assertSame(1, $cached->count()); $record = $cached[0]; $actual = $record->getIsActive(); From f3f344594d3ebf4f3abf20ef32da177bc1c2bf84 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 18:52:04 +0100 Subject: [PATCH 62/91] #15598 - Change type from `string` to `mixed` in `unserialize()` methods --- phalcon/Storage/Serializer/Base64.zep | 4 +- phalcon/Storage/Serializer/Igbinary.zep | 4 +- phalcon/Storage/Serializer/Json.zep | 4 +- phalcon/Storage/Serializer/None.zep | 8 +-- phalcon/Storage/Serializer/Php.zep | 76 ++++++++++++------------- 5 files changed, 46 insertions(+), 50 deletions(-) diff --git a/phalcon/Storage/Serializer/Base64.zep b/phalcon/Storage/Serializer/Base64.zep index a3d2c63cc28..1eda10f8ee3 100644 --- a/phalcon/Storage/Serializer/Base64.zep +++ b/phalcon/Storage/Serializer/Base64.zep @@ -33,11 +33,11 @@ class Base64 extends AbstractSerializer /** * Unserializes data * - * @param string $data + * @param mixed $data * * @retrun void */ - public function unserialize(string data) -> void + public function unserialize(mixed data) -> void { var result; diff --git a/phalcon/Storage/Serializer/Igbinary.zep b/phalcon/Storage/Serializer/Igbinary.zep index 6731fb93896..13b5a2cc73a 100644 --- a/phalcon/Storage/Serializer/Igbinary.zep +++ b/phalcon/Storage/Serializer/Igbinary.zep @@ -38,11 +38,11 @@ class Igbinary extends AbstractSerializer /** * Unserializes data * - * @param string $data + * @param mixed $data * * @return void */ - public function unserialize(string data) -> void + public function unserialize(mixed data) -> void { var result, version; diff --git a/phalcon/Storage/Serializer/Json.zep b/phalcon/Storage/Serializer/Json.zep index 9c31a8574e9..ad7366b5d24 100644 --- a/phalcon/Storage/Serializer/Json.zep +++ b/phalcon/Storage/Serializer/Json.zep @@ -39,11 +39,11 @@ class Json extends AbstractSerializer /** * Unserializes data * - * @param string $data + * @param mixed $data * * @return void */ - public function unserialize(string data) -> void + public function unserialize(mixed data) -> void { if (true !== this->isSerializable(data)) { let this->data = data; diff --git a/phalcon/Storage/Serializer/None.zep b/phalcon/Storage/Serializer/None.zep index 2eb35c5e771..e425eff63d7 100644 --- a/phalcon/Storage/Serializer/None.zep +++ b/phalcon/Storage/Serializer/None.zep @@ -15,9 +15,9 @@ class None extends AbstractSerializer /** * Serializes data * - * @return string + * @return mixed */ - public function serialize() -> string|null + public function serialize() -> mixed { return this->data; } @@ -25,11 +25,11 @@ class None extends AbstractSerializer /** * Unserializes data * - * @param string $data + * @param mixed $data * * @retrun void */ - public function unserialize(string data) -> void + public function unserialize(mixed data) -> void { let this->data = data; } diff --git a/phalcon/Storage/Serializer/Php.zep b/phalcon/Storage/Serializer/Php.zep index ae336fbb775..d94d5983845 100644 --- a/phalcon/Storage/Serializer/Php.zep +++ b/phalcon/Storage/Serializer/Php.zep @@ -31,61 +31,57 @@ class Php extends AbstractSerializer /** * Unserializes data * - * @param string $data + * @param mixed $data */ - public function unserialize(string data) -> void + public function unserialize(mixed data) -> void { var result, version; if (true !== this->isSerializable(data)) { let this->data = data; + + return; + } + + let version = phpversion(); + + globals_set("warning.enable", false); + + if version_compare(version, "8.0", ">=") { + set_error_handler( + function (number, message, file, line) { + globals_set("warning.enable", true); + }, + E_NOTICE + ); } else { - if typeof data !== "string" { - throw new InvalidArgumentException( - "Data for the unserializer must of type string" - ); - } - - let version = phpversion(); - - globals_set("warning.enable", false); - - if version_compare(version, "8.0", ">=") { - set_error_handler( - function (number, message, file, line) { - globals_set("warning.enable", true); - }, - E_NOTICE - ); - } else { - set_error_handler( - function (number, message, file, line, context) { - globals_set("warning.enable", true); - }, - E_NOTICE - ); - } - - let result = this->phpUnserialize(data); - - restore_error_handler(); - - if unlikely globals_get("warning.enable") || result === false { - let this->isSuccess = false, - result = ""; - } - - let this->data = result; + set_error_handler( + function (number, message, file, line, context) { + globals_set("warning.enable", true); + }, + E_NOTICE + ); } + + let result = this->phpUnserialize(data); + + restore_error_handler(); + + if unlikely globals_get("warning.enable") || result === false { + let this->isSuccess = false, + result = ""; + } + + let this->data = result; } /** * @param string $data * @param array $options * - * @return mixed|false + * @return mixed */ - private function phpUnserialize(string data, array options = []) + private function phpUnserialize(string data, array options = []) -> mixed { return unserialize(data, options); } From 93f8059e9ba5949e49c4658e5a3a12d07abaff4a Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 18:52:51 +0100 Subject: [PATCH 63/91] #15598 - Add `null` check --- phalcon/Filter/Validation/Validator/Regex.zep | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/phalcon/Filter/Validation/Validator/Regex.zep b/phalcon/Filter/Validation/Validator/Regex.zep index e8261ffd73d..242a478b2ef 100644 --- a/phalcon/Filter/Validation/Validator/Regex.zep +++ b/phalcon/Filter/Validation/Validator/Regex.zep @@ -90,11 +90,14 @@ class Regex extends AbstractValidator let pattern = this->getOption("pattern"); - if typeof pattern == "array" { + if typeof pattern === "array" { let pattern = pattern[field]; } - if preg_match(pattern, value, matches) { + /** + * Since PHP8.1 $value can't be null. + */ + if value !== null && preg_match(pattern, value, matches) { let failed = matches[0] != value; } else { let failed = true; From 06fa7aa2276b016d4c2f72d5391a3abb372340ff Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 18:53:19 +0100 Subject: [PATCH 64/91] #15598 - Make `$name` nullable --- phalcon/Mvc/Micro/Collection.zep | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phalcon/Mvc/Micro/Collection.zep b/phalcon/Mvc/Micro/Collection.zep index e10dd21815b..a56deb882b7 100644 --- a/phalcon/Mvc/Micro/Collection.zep +++ b/phalcon/Mvc/Micro/Collection.zep @@ -290,9 +290,9 @@ class Collection implements CollectionInterface * @param string|array method * @param string routePattern * @param callable handler - * @param string name + * @param string|null name */ - protected function addMap(var method, string! routePattern, callable handler, string name) -> void + protected function addMap(var method, string! routePattern, callable handler, string name = null) -> void { let this->handlers[] = [method, routePattern, handler, name]; } From cd800a89ca7a000df2e961c75cf4de245cca0cc1 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 18:53:56 +0100 Subject: [PATCH 65/91] #15598 - Simplify conditions to null check instead of `typeof` --- phalcon/Mvc/Application.zep | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/phalcon/Mvc/Application.zep b/phalcon/Mvc/Application.zep index 9207df9c33e..83aac9654f1 100644 --- a/phalcon/Mvc/Application.zep +++ b/phalcon/Mvc/Application.zep @@ -94,7 +94,7 @@ class Application extends AbstractApplication let container = this->container; - if unlikely typeof container != "object" { + if container === null { throw new Exception( "A dependency injection container is required to access internal services" ); @@ -106,10 +106,8 @@ class Application extends AbstractApplication * Call boot event, this allow the developer to perform initialization * actions */ - if typeof eventsManager == "object" { - if eventsManager->fire("application:boot", this) === false { - return false; - } + if eventsManager !== null && eventsManager->fire("application:boot", this) === false { + return false; } let router = container->getShared("router"); From a08e6cd856837281768a8b174b8d88f4cd63e962 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 18:54:22 +0100 Subject: [PATCH 66/91] #15598 - Make default values empty strings instead of `null` --- phalcon/Mvc/Router.zep | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/phalcon/Mvc/Router.zep b/phalcon/Mvc/Router.zep index 300a35aeed1..d71a1c6f501 100644 --- a/phalcon/Mvc/Router.zep +++ b/phalcon/Mvc/Router.zep @@ -54,24 +54,24 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw const POSITION_LAST = 1; /** - * @var string|null + * @var string */ - protected action = null; + protected action = ""; /** - * @var string|null + * @var string */ - protected controller = null; + protected controller = ""; /** - * @var string|null + * @var string */ - protected defaultAction = null; + protected defaultAction = ""; /** - * @var string|null + * @var string */ - protected defaultController = null; + protected defaultController = ""; /** * @var string @@ -79,9 +79,9 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw protected defaultModule = ""; /** - * @var string|null + * @var string */ - protected defaultNamespace = null; + protected defaultNamespace = ""; /** * @var array @@ -114,14 +114,14 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw protected matches = []; /** - * @var string|null + * @var string */ - protected module = null; + protected module = ""; /** - * @var string|null + * @var string */ - protected namespaceName = null; + protected namespaceName = ""; /** * @var array|string|null @@ -1151,7 +1151,7 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw // Set a default namespace if fetch namespaceName, defaults["namespace"] { - let this->defaultNamespace = namespaceName; + let this->defaultNamespace = (string)namespaceName; } // Set a default module From 84a7af64c946a9f2af4de4c497685d01fc7bcb2d Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 18:54:40 +0100 Subject: [PATCH 67/91] #15598 - Adjust integration tests --- .../Cache/Adapter/Libmemcached/GetSetCest.php | 7 ++- .../Forms/Element/GetAddValidatorsCest.php | 4 -- .../Forms/Element/GetSetTagFactoryCest.php | 2 - .../Forms/Form/GetAttributesCest.php | 3 -- .../Forms/Form/GetMessagesCest.php | 11 ++-- .../Forms/Form/GetSetTagFactoryCest.php | 2 - .../Forms/Form/HasMessagesForCest.php | 7 +-- tests/integration/Forms/Form/IsValidCest.php | 11 ++-- tests/integration/Forms/Form/RenderCest.php | 2 - .../Forms/Form/SetValidationCest.php | 6 +-- tests/integration/Mvc/Router/HandleCest.php | 36 ++++++++----- .../Storage/Serializer/ExceptionsCest.php | 37 ++++++++++---- .../Validator/Confirmation/ValidateCest.php | 51 ++++++++++--------- 13 files changed, 89 insertions(+), 90 deletions(-) diff --git a/tests/integration/Cache/Adapter/Libmemcached/GetSetCest.php b/tests/integration/Cache/Adapter/Libmemcached/GetSetCest.php index df5d52163f7..4ac80a26ecf 100644 --- a/tests/integration/Cache/Adapter/Libmemcached/GetSetCest.php +++ b/tests/integration/Cache/Adapter/Libmemcached/GetSetCest.php @@ -16,7 +16,7 @@ use Codeception\Example; use IntegrationTester; use Phalcon\Cache\Adapter\Libmemcached; -use Phalcon\Cache\Exception as CacheException; +use Phalcon\Storage\Exception; use Phalcon\Storage\SerializerFactory; use Phalcon\Support\Exception as HelperException; use Phalcon\Tests\Fixtures\Traits\LibmemcachedTrait; @@ -36,9 +36,8 @@ class GetSetCest * @param IntegrationTester $I * @param Example $example * - * @throws CacheException * @throws HelperException - * + * @throws Exception * @author Phalcon Team * @since 2020-09-09 */ @@ -67,7 +66,7 @@ public function storageAdapterLibmemcachedGetSet(IntegrationTester $I, Example $ * * @param IntegrationTester $I * - * @throws CacheException + * @throws Exception * @throws HelperException * * @author Phalcon Team diff --git a/tests/integration/Forms/Element/GetAddValidatorsCest.php b/tests/integration/Forms/Element/GetAddValidatorsCest.php index 05b1ca41f8a..b56889420dd 100644 --- a/tests/integration/Forms/Element/GetAddValidatorsCest.php +++ b/tests/integration/Forms/Element/GetAddValidatorsCest.php @@ -16,7 +16,6 @@ use Codeception\Example; use IntegrationTester; use Phalcon\Filter\Validation\Validator\Alnum; -use Phalcon\Filter\Validation\Validator\Date as ValidatorDate; use Phalcon\Filter\Validation\Validator\Digit; use Phalcon\Filter\Validation\Validator\StringLength; use Phalcon\Forms\Element\Check; @@ -31,9 +30,6 @@ use Phalcon\Forms\Element\Submit; use Phalcon\Forms\Element\Text; use Phalcon\Forms\Element\TextArea; -use Phalcon\Messages\Message; -use Phalcon\Messages\Messages; - use function uniqid; class GetAddValidatorsCest diff --git a/tests/integration/Forms/Element/GetSetTagFactoryCest.php b/tests/integration/Forms/Element/GetSetTagFactoryCest.php index a87b1dddb4c..23d7152f709 100644 --- a/tests/integration/Forms/Element/GetSetTagFactoryCest.php +++ b/tests/integration/Forms/Element/GetSetTagFactoryCest.php @@ -14,14 +14,12 @@ namespace Phalcon\Tests\Integration\Forms\Element; use IntegrationTester; -use Phalcon\Di\Di; use Phalcon\Forms\Element\Text; use Phalcon\Forms\Form; use Phalcon\Html\Escaper; use Phalcon\Html\TagFactory; use Phalcon\Tests\Fixtures\Traits\DiTrait; -use function spl_object_hash; use function sprintf; use function uniqid; diff --git a/tests/integration/Forms/Form/GetAttributesCest.php b/tests/integration/Forms/Form/GetAttributesCest.php index 534c59de4a7..43e61e4f6e7 100644 --- a/tests/integration/Forms/Form/GetAttributesCest.php +++ b/tests/integration/Forms/Form/GetAttributesCest.php @@ -16,9 +16,6 @@ use IntegrationTester; use Phalcon\Forms\Form; use Phalcon\Html\Attributes\AttributesInterface; -use Phalcon\Tag; -use Phalcon\Tests\Fixtures\Traits\DiTrait; - use function method_exists; class GetAttributesCest diff --git a/tests/integration/Forms/Form/GetMessagesCest.php b/tests/integration/Forms/Form/GetMessagesCest.php index 6841d721bd2..ceb3792a0fe 100644 --- a/tests/integration/Forms/Form/GetMessagesCest.php +++ b/tests/integration/Forms/Form/GetMessagesCest.php @@ -14,15 +14,13 @@ namespace Phalcon\Tests\Integration\Forms\Form; use IntegrationTester; +use Phalcon\Filter\Validation; +use Phalcon\Filter\Validation\Validator\PresenceOf; +use Phalcon\Filter\Validation\Validator\Regex; use Phalcon\Forms\Element\Text; use Phalcon\Forms\Form; use Phalcon\Messages\Message; use Phalcon\Messages\Messages; -use Phalcon\Tag; -use Phalcon\Tests\Fixtures\Traits\DiTrait; -use Phalcon\Filter\Validation; -use Phalcon\Filter\Validation\Validator\PresenceOf; -use Phalcon\Filter\Validation\Validator\Regex; class GetMessagesCest { @@ -34,9 +32,7 @@ class GetMessagesCest */ public function testGetElementMessagesFromForm(IntegrationTester $I) { - // First element $telephone = new Text('telephone'); - $telephone->addValidators( [ new PresenceOf( @@ -48,7 +44,6 @@ public function testGetElementMessagesFromForm(IntegrationTester $I) ); $customValidation = new Validation(); - $customValidation->add( 'telephone', new Regex( diff --git a/tests/integration/Forms/Form/GetSetTagFactoryCest.php b/tests/integration/Forms/Form/GetSetTagFactoryCest.php index eeb32c8591b..8514cc9971a 100644 --- a/tests/integration/Forms/Form/GetSetTagFactoryCest.php +++ b/tests/integration/Forms/Form/GetSetTagFactoryCest.php @@ -14,11 +14,9 @@ namespace Phalcon\Tests\Integration\Forms\Form; use IntegrationTester; -use Phalcon\Forms\Element\Text; use Phalcon\Forms\Form; use Phalcon\Html\Escaper; use Phalcon\Html\TagFactory; -use Phalcon\Tests\Fixtures\Traits\DiTrait; class GetSetTagFactoryCest { diff --git a/tests/integration/Forms/Form/HasMessagesForCest.php b/tests/integration/Forms/Form/HasMessagesForCest.php index 5986bdf881e..53a0e065c3f 100644 --- a/tests/integration/Forms/Form/HasMessagesForCest.php +++ b/tests/integration/Forms/Form/HasMessagesForCest.php @@ -14,13 +14,11 @@ namespace Phalcon\Tests\Integration\Forms\Form; use IntegrationTester; +use Phalcon\Filter\Validation\Validator\Regex; use Phalcon\Forms\Element\Text; use Phalcon\Forms\Form; use Phalcon\Messages\Message; use Phalcon\Messages\Messages; -use Phalcon\Tag; -use Phalcon\Tests\Fixtures\Traits\DiTrait; -use Phalcon\Filter\Validation\Validator\Regex; class HasMessagesForCest { @@ -32,9 +30,7 @@ class HasMessagesForCest */ public function testFormHasMessagesFor(IntegrationTester $I) { - // First element $telephone = new Text('telephone'); - $telephone->addValidators( [ new Regex( @@ -46,7 +42,6 @@ public function testFormHasMessagesFor(IntegrationTester $I) ] ); - // Second element $address = new Text('address'); $form = new Form(); diff --git a/tests/integration/Forms/Form/IsValidCest.php b/tests/integration/Forms/Form/IsValidCest.php index 6cb1b85d84a..3fef95ea093 100644 --- a/tests/integration/Forms/Form/IsValidCest.php +++ b/tests/integration/Forms/Form/IsValidCest.php @@ -14,16 +14,14 @@ namespace Phalcon\Tests\Integration\Forms\Form; use IntegrationTester; +use Phalcon\Filter\Validation; +use Phalcon\Filter\Validation\Validator\PresenceOf; +use Phalcon\Filter\Validation\Validator\Regex; use Phalcon\Forms\Element\Text; use Phalcon\Forms\Form; use Phalcon\Messages\Message; use Phalcon\Messages\Messages; -use Phalcon\Tag; use Phalcon\Tests\Fixtures\Forms\ValidationForm; -use Phalcon\Tests\Fixtures\Traits\DiTrait; -use Phalcon\Filter\Validation; -use Phalcon\Filter\Validation\Validator\PresenceOf; -use Phalcon\Filter\Validation\Validator\Regex; class IsValidCest { @@ -35,9 +33,7 @@ class IsValidCest */ public function testMergeValidators(IntegrationTester $I) { - // First element $telephone = new Text('telephone'); - $telephone->addValidators( [ new PresenceOf( @@ -49,7 +45,6 @@ public function testMergeValidators(IntegrationTester $I) ); $customValidation = new Validation(); - $customValidation->add( 'telephone', new Regex( diff --git a/tests/integration/Forms/Form/RenderCest.php b/tests/integration/Forms/Form/RenderCest.php index 98727bd677b..25dfd874857 100644 --- a/tests/integration/Forms/Form/RenderCest.php +++ b/tests/integration/Forms/Form/RenderCest.php @@ -18,8 +18,6 @@ use Phalcon\Forms\Form; use Phalcon\Html\Escaper; use Phalcon\Html\TagFactory; -use Phalcon\Tag; -use Phalcon\Tests\Fixtures\Traits\DiTrait; use stdClass; class RenderCest diff --git a/tests/integration/Forms/Form/SetValidationCest.php b/tests/integration/Forms/Form/SetValidationCest.php index 4876216c00e..06e4d45fec1 100644 --- a/tests/integration/Forms/Form/SetValidationCest.php +++ b/tests/integration/Forms/Form/SetValidationCest.php @@ -14,14 +14,12 @@ namespace Phalcon\Tests\Integration\Forms\Form; use IntegrationTester; +use Phalcon\Filter\Validation; +use Phalcon\Filter\Validation\Validator\Regex; use Phalcon\Forms\Element\Text; use Phalcon\Forms\Form; use Phalcon\Messages\Message; use Phalcon\Messages\Messages; -use Phalcon\Tag; -use Phalcon\Tests\Fixtures\Traits\DiTrait; -use Phalcon\Filter\Validation; -use Phalcon\Filter\Validation\Validator\Regex; /** * Class SetValidationCest diff --git a/tests/integration/Mvc/Router/HandleCest.php b/tests/integration/Mvc/Router/HandleCest.php index 18143ae98c0..72c6f372c87 100644 --- a/tests/integration/Mvc/Router/HandleCest.php +++ b/tests/integration/Mvc/Router/HandleCest.php @@ -136,11 +136,13 @@ public function mvcRouterHandleWithPlaceholders(IntegrationTester $I) '/admin/2020/october/21/456' ); - $I->assertNull( + $I->assertSame( + '', $router->getModuleName() ); - $I->assertNull( + $I->assertSame( + '', $router->getNamespaceName() ); @@ -183,11 +185,13 @@ public function mvcRouterHandleWithPlaceholders(IntegrationTester $I) '/admin/2020/10/21/456' ); - $I->assertNull( + $I->assertSame( + '', $router->getModuleName() ); - $I->assertNull( + $I->assertSame( + '', $router->getNamespaceName() ); @@ -227,11 +231,13 @@ public function mvcRouterHandleShortSyntax(IntegrationTester $I) $router->handle('/about'); - $I->assertNull( + $I->assertSame( + '', $router->getModuleName() ); - $I->assertNull( + $I->assertSame( + '', $router->getNamespaceName() ); @@ -269,11 +275,13 @@ public function mvcRouterHandleShortSyntax(IntegrationTester $I) $router->getMatchedRoute() ); - $I->assertNull( + $I->assertSame( + '', $router->getControllerName() ); - $I->assertNull( + $I->assertSame( + '', $router->getActionName() ); @@ -290,11 +298,13 @@ public function mvcRouterHandleShortSyntax(IntegrationTester $I) $router->handle('/about'); - $I->assertNull( + $I->assertSame( + '', $router->getModuleName() ); - $I->assertNull( + $I->assertSame( + '', $router->getNamespaceName() ); @@ -331,11 +341,13 @@ public function mvcRouterHandleNumeric(IntegrationTester $I) $router->setDI($di); $router->handle('/12/34/56'); - $I->assertNull( + $I->assertSame( + '', $router->getModuleName() ); - $I->assertNull( + $I->assertSame( + '', $router->getNamespaceName() ); diff --git a/tests/integration/Storage/Serializer/ExceptionsCest.php b/tests/integration/Storage/Serializer/ExceptionsCest.php index 543258e33af..aa1884f22d1 100644 --- a/tests/integration/Storage/Serializer/ExceptionsCest.php +++ b/tests/integration/Storage/Serializer/ExceptionsCest.php @@ -24,6 +24,7 @@ use Phalcon\Support\Collection; use stdClass; +use TypeError; use function json_encode; use function trigger_error; @@ -272,17 +273,33 @@ public function storageSerializerMsgpackUnserializeError(IntegrationTester $I) public function storageSerializerPhpUnserializeErrorNotString(IntegrationTester $I) { $I->wantToTest('Storage\Serializer\Php - unserialize() - error not string'); - $I->expectThrowable( - new InvalidArgumentException( - 'Data for the unserializer must of type string' - ), - function () { - $serializer = new Php(); - $serialized = new stdClass(); - $serializer->unserialize($serialized); - } - ); + if (version_compare(PHP_VERSION, '8.1.0', '<')) { + $I->expectThrowable( + new InvalidArgumentException( + 'Data for the unserializer must of type string' + ), + function () { + $serializer = new Php(); + + $serialized = new stdClass(); + $serializer->unserialize($serialized); + } + ); + } else { + $I->expectThrowable( + new TypeError( + 'Phalcon\Storage\Serializer\Php::phpUnserialize(): ' . + 'Argument #1 ($data) must be of type string, stdClass given' + ), + function () { + $serializer = new Php(); + + $serialized = new stdClass(); + $serializer->unserialize($serialized); + } + ); + } } /** diff --git a/tests/integration/Validation/Validator/Confirmation/ValidateCest.php b/tests/integration/Validation/Validator/Confirmation/ValidateCest.php index 8ac72435d77..f5e749484e4 100644 --- a/tests/integration/Validation/Validator/Confirmation/ValidateCest.php +++ b/tests/integration/Validation/Validator/Confirmation/ValidateCest.php @@ -288,21 +288,21 @@ public function filterValidationValidatorConfirmationValidateEmptyValues(Integra $messages->count() ); + if (version_compare(PHP_VERSION, '8.1.0', '<')) { + $messages = $validation->validate( + [ + 'password' => null, + 'password2' => 'test123', + ] + ); - $messages = $validation->validate( - [ - 'password' => null, - 'password2' => 'test123', - ] - ); - - $I->assertEquals( - 1, - $messages->count() - ); - - $I->assertEquals($expected, $messages); + $I->assertEquals( + 1, + $messages->count() + ); + $I->assertEquals($expected, $messages); + } $validation = new Validation(); @@ -328,19 +328,20 @@ public function filterValidationValidatorConfirmationValidateEmptyValues(Integra $messages->count() ); + if (version_compare(PHP_VERSION, '8.1.0', '<')) { + $messages = $validation->validate( + [ + 'password' => null, + 'password2' => 'test123', + ] + ); - $messages = $validation->validate( - [ - 'password' => null, - 'password2' => 'test123', - ] - ); - - $I->assertEquals( - 1, - $messages->count() - ); + $I->assertEquals( + 1, + $messages->count() + ); - $I->assertEquals($expected, $messages); + $I->assertEquals($expected, $messages); + } } } From b1c455f7b7e1d9002938d60d58750def46e16a70 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 19:09:49 +0100 Subject: [PATCH 68/91] #15598 - Change postgres port --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 54bda962548..209d4736001 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -102,7 +102,7 @@ jobs: - { php: '8.1', ts: 'nts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' } steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup platform specific environment shell: pwsh @@ -239,7 +239,7 @@ jobs: postgres: image: postgres:12-alpine ports: - - "5432:5432" + - "5435:5432" env: POSTGRES_PASSWORD: secret POSTGRES_DB: phalcon @@ -258,7 +258,7 @@ jobs: php: [ '7.4', '8.0', '8.1' ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -348,7 +348,7 @@ jobs: - name: Run Database Tests (Postgres) env: DATA_POSTGRES_USER: postgres - DATA_POSTGRES_PORT: ${{ job.services.postgres.ports['5432'] }} + DATA_POSTGRES_PORT: ${{ job.services.postgres.ports['5435'] }} DATA_REDIS_PORT: ${{ job.services.redis.ports['6379'] }} DATA_MEMCACHED_PORT: ${{ job.services.memcached.ports['11211'] }} if: always() @@ -368,7 +368,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Get the release version id: get-version From 54b340cbd1ac42764ba035afd21cb368e651bfe8 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 19:11:31 +0100 Subject: [PATCH 69/91] #15598 - Fix CS --- tests/integration/Forms/Element/GetAddValidatorsCest.php | 1 + tests/integration/Forms/Form/GetAttributesCest.php | 1 + tests/integration/Storage/Serializer/ExceptionsCest.php | 8 ++++++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/integration/Forms/Element/GetAddValidatorsCest.php b/tests/integration/Forms/Element/GetAddValidatorsCest.php index b56889420dd..d94ffa367f0 100644 --- a/tests/integration/Forms/Element/GetAddValidatorsCest.php +++ b/tests/integration/Forms/Element/GetAddValidatorsCest.php @@ -30,6 +30,7 @@ use Phalcon\Forms\Element\Submit; use Phalcon\Forms\Element\Text; use Phalcon\Forms\Element\TextArea; + use function uniqid; class GetAddValidatorsCest diff --git a/tests/integration/Forms/Form/GetAttributesCest.php b/tests/integration/Forms/Form/GetAttributesCest.php index 43e61e4f6e7..1877ed0aa59 100644 --- a/tests/integration/Forms/Form/GetAttributesCest.php +++ b/tests/integration/Forms/Form/GetAttributesCest.php @@ -16,6 +16,7 @@ use IntegrationTester; use Phalcon\Forms\Form; use Phalcon\Html\Attributes\AttributesInterface; + use function method_exists; class GetAttributesCest diff --git a/tests/integration/Storage/Serializer/ExceptionsCest.php b/tests/integration/Storage/Serializer/ExceptionsCest.php index aa1884f22d1..9fabae85f93 100644 --- a/tests/integration/Storage/Serializer/ExceptionsCest.php +++ b/tests/integration/Storage/Serializer/ExceptionsCest.php @@ -23,8 +23,8 @@ use Phalcon\Storage\Serializer\Php; use Phalcon\Support\Collection; use stdClass; - use TypeError; + use function json_encode; use function trigger_error; @@ -43,6 +43,7 @@ class ExceptionsCest public function storageSerializerBase64SerializeException(IntegrationTester $I) { $I->wantToTest('Storage\Serializer\Base64 - serialize() - exception'); + $I->expectThrowable( new InvalidArgumentException( 'Data for the serializer must of type string' @@ -65,6 +66,7 @@ function () { public function storageSerializerBase64UnserializeException(IntegrationTester $I) { $I->wantToTest('Storage\Serializer\Base64 - unserialize() - exception'); + $I->expectThrowable( new InvalidArgumentException( 'Data for the unserializer must of type string' @@ -137,6 +139,7 @@ public function storageSerializerIgbinarySerializeFailReturnsEmptyString(Integra * * @param IntegrationTester $I * + * @throws \Exception * @author Phalcon Team * @since 2022-02-24 */ @@ -164,8 +167,9 @@ public function storageSerializerIgbinaryUnserializeFailReturnsEmptyString(Integ * * @param IntegrationTester $I * - * @author Phalcon Team + * @throws \Exception * @since 2022-02-24 + * @author Phalcon Team */ public function storageSerializerIgbinaryUnserializeFailWarning(IntegrationTester $I) { From ca5d6a8f469d755acc6cfed90d9867335e596550 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 19:22:15 +0100 Subject: [PATCH 70/91] #15598 - Change exception classes --- tests/integration/Storage/Serializer/ExceptionsCest.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/integration/Storage/Serializer/ExceptionsCest.php b/tests/integration/Storage/Serializer/ExceptionsCest.php index 9fabae85f93..b188ed92626 100644 --- a/tests/integration/Storage/Serializer/ExceptionsCest.php +++ b/tests/integration/Storage/Serializer/ExceptionsCest.php @@ -14,6 +14,7 @@ namespace Phalcon\Tests\Integration\Storage\Serializer; use Codeception\Stub; +use Error; use IntegrationTester; use InvalidArgumentException; use Phalcon\Storage\Serializer\Base64; @@ -278,10 +279,10 @@ public function storageSerializerPhpUnserializeErrorNotString(IntegrationTester { $I->wantToTest('Storage\Serializer\Php - unserialize() - error not string'); - if (version_compare(PHP_VERSION, '8.1.0', '<')) { + if (version_compare(PHP_VERSION, '8.0.0', '<')) { $I->expectThrowable( - new InvalidArgumentException( - 'Data for the unserializer must of type string' + new Error( + 'Object of class stdClass could not be converted to string' ), function () { $serializer = new Php(); From 6a4b233975767484080ce9eb49c0bbb9f79a8ea3 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 19:22:43 +0100 Subject: [PATCH 71/91] #15598 - Fix Sqlite:describeColumns() --- phalcon/Db/Adapter/Pdo/Sqlite.zep | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/phalcon/Db/Adapter/Pdo/Sqlite.zep b/phalcon/Db/Adapter/Pdo/Sqlite.zep index d4b684b6a9a..6ec309db58c 100644 --- a/phalcon/Db/Adapter/Pdo/Sqlite.zep +++ b/phalcon/Db/Adapter/Pdo/Sqlite.zep @@ -113,7 +113,6 @@ class Sqlite extends PdoAdapter ); for field in fields { - /** * By default the bind types is two */ @@ -293,7 +292,7 @@ class Sqlite extends PdoAdapter * Check if the column is default values * When field is empty default value is null */ - if strcasecmp(field[4], "null") != 0 && field[4] != "" { + if !empty(field[4]) && strcasecmp(field[4], "null") !== 0 { let definition["default"] = preg_replace( "/^'|'$/", "", From cc0aec0de615b3fb03738d014e1c40137a329ca3 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 19:29:03 +0100 Subject: [PATCH 72/91] #15598 - Bump PHALCON_VERSION --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 209d4736001..9ba66363892 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ on: env: # All versions should be declared here - PHALCON_VERSION: 5.0.0beta3 + PHALCON_VERSION: 5.0.0rc1 ZEPHIR_PARSER_VERSION: 1.5.0 ZEPHIR_VERSION: 0.16.0 From 1099a7d2685b43b0103d4d23624dee857e4b8bf1 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 19:32:54 +0100 Subject: [PATCH 73/91] #15598 - Regenerate ext/ directory --- ext/phalcon/db/adapter/pdo/sqlite.zep.c | 280 +++++++++--------- .../filter/validation/validator/regex.zep.c | 26 +- ext/phalcon/mvc/application.zep.c | 265 ++++++++--------- ext/phalcon/mvc/micro/collection.zep.c | 15 +- ext/phalcon/mvc/micro/collection.zep.h | 4 +- ext/phalcon/mvc/router.zep.c | 33 ++- ext/phalcon/storage/serializer/base64.zep.c | 22 +- ext/phalcon/storage/serializer/igbinary.zep.c | 19 +- ext/phalcon/storage/serializer/json.zep.c | 19 +- ext/phalcon/storage/serializer/none.zep.c | 21 +- ext/phalcon/storage/serializer/none.zep.h | 6 +- ext/phalcon/storage/serializer/php.zep.c | 119 ++++---- ext/phalcon/storage/serializer/php.zep.h | 6 +- 13 files changed, 423 insertions(+), 412 deletions(-) diff --git a/ext/phalcon/db/adapter/pdo/sqlite.zep.c b/ext/phalcon/db/adapter/pdo/sqlite.zep.c index 33eea200cf3..7d907c5eb3c 100644 --- a/ext/phalcon/db/adapter/pdo/sqlite.zep.c +++ b/ext/phalcon/db/adapter/pdo/sqlite.zep.c @@ -160,11 +160,11 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, connect) */ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) { - zend_bool _5$$3, _34$$3, _43$$28, _71$$28; + zend_bool _5$$3, _31$$3, _43$$28, _69$$28; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zephir_fcall_cache_entry *_33 = NULL, *_40 = NULL, *_41 = NULL; + zephir_fcall_cache_entry *_35 = NULL, *_40 = NULL, *_41 = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *table_param = NULL, *schema_param = NULL, __$true, __$false, columns, columnType, fields, field, definition, oldColumn, sizePattern, matches, matchOne, matchTwo, columnName, _0, _1, _2, *_3, _4, _28$$3, _29$$3, _30$$3, _31$$3, _32$$3, _35$$3, _6$$4, _7$$4, _8$$5, _9$$5, _10$$5, _11$$7, _12$$7, _13$$8, _14$$9, _15$$10, _16$$11, _17$$11, _18$$12, _19$$12, _20$$13, _21$$14, _22$$15, _23$$16, _24$$17, _25$$18, _26$$20, _27$$21, _36$$27, _37$$27, _38$$27, _39$$27, _42$$28, _66$$28, _67$$28, _68$$28, _69$$28, _70$$28, _72$$28, _44$$29, _45$$29, _46$$30, _47$$30, _48$$30, _49$$32, _50$$32, _51$$33, _52$$34, _53$$35, _54$$36, _55$$36, _56$$37, _57$$37, _58$$38, _59$$39, _60$$40, _61$$41, _62$$42, _63$$43, _64$$45, _65$$46, _73$$52, _74$$52, _75$$52, _76$$52; + zval *table_param = NULL, *schema_param = NULL, __$true, __$false, columns, columnType, fields, field, definition, oldColumn, sizePattern, matches, matchOne, matchTwo, columnName, _0, _1, _2, *_3, _4, _28$$3, _29$$3, _30$$3, _32$$3, _33$$3, _34$$3, _6$$4, _7$$4, _8$$5, _9$$5, _10$$5, _11$$7, _12$$7, _13$$8, _14$$9, _15$$10, _16$$11, _17$$11, _18$$12, _19$$12, _20$$13, _21$$14, _22$$15, _23$$16, _24$$17, _25$$18, _26$$20, _27$$21, _36$$27, _37$$27, _38$$27, _39$$27, _42$$28, _66$$28, _67$$28, _68$$28, _70$$28, _71$$28, _72$$28, _44$$29, _45$$29, _46$$30, _47$$30, _48$$30, _49$$32, _50$$32, _51$$33, _52$$34, _53$$35, _54$$36, _55$$36, _56$$37, _57$$37, _58$$38, _59$$39, _60$$40, _61$$41, _62$$42, _63$$43, _64$$45, _65$$46, _73$$52, _74$$52, _75$$52, _76$$52; zval table, schema; zval *this_ptr = getThis(); @@ -190,9 +190,9 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZVAL_UNDEF(&_28$$3); ZVAL_UNDEF(&_29$$3); ZVAL_UNDEF(&_30$$3); - ZVAL_UNDEF(&_31$$3); ZVAL_UNDEF(&_32$$3); - ZVAL_UNDEF(&_35$$3); + ZVAL_UNDEF(&_33$$3); + ZVAL_UNDEF(&_34$$3); ZVAL_UNDEF(&_6$$4); ZVAL_UNDEF(&_7$$4); ZVAL_UNDEF(&_8$$5); @@ -223,8 +223,8 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZVAL_UNDEF(&_66$$28); ZVAL_UNDEF(&_67$$28); ZVAL_UNDEF(&_68$$28); - ZVAL_UNDEF(&_69$$28); ZVAL_UNDEF(&_70$$28); + ZVAL_UNDEF(&_71$$28); ZVAL_UNDEF(&_72$$28); ZVAL_UNDEF(&_44$$29); ZVAL_UNDEF(&_45$$29); @@ -300,7 +300,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZVAL_LONG(&_2, 3); ZEPHIR_CALL_METHOD(&fields, this_ptr, "fetchall", NULL, 0, &_1, &_2); zephir_check_call_status(); - zephir_is_iterable(&fields, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 312); + zephir_is_iterable(&fields, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 311); if (Z_TYPE_P(&fields) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&fields), _3) { @@ -310,12 +310,12 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) zephir_create_array(&definition, 1, 0); add_assoc_long_ex(&definition, SL("bindType"), 2); ZEPHIR_OBS_NVAR(&columnType); - zephir_array_fetch_long(&columnType, &field, 2, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 128); - _5$$3 = zephir_memnstr_str(&columnType, SL("int"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 150); + zephir_array_fetch_long(&columnType, &field, 2, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 127); + _5$$3 = zephir_memnstr_str(&columnType, SL("int"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 149); if (!(_5$$3)) { - _5$$3 = zephir_memnstr_str(&columnType, SL("INT"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 150); + _5$$3 = zephir_memnstr_str(&columnType, SL("INT"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 149); } - if (zephir_memnstr_str(&columnType, SL("bigint"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 143)) { + if (zephir_memnstr_str(&columnType, SL("bigint"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 142)) { ZEPHIR_INIT_NVAR(&_6$$4); ZVAL_LONG(&_6$$4, 14); zephir_array_update_string(&definition, SL("type"), &_6$$4, PH_COPY | PH_SEPARATE); @@ -331,11 +331,11 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZEPHIR_INIT_NVAR(&_9$$5); ZVAL_LONG(&_9$$5, 1); zephir_array_update_string(&definition, SL("bindType"), &_9$$5, PH_COPY | PH_SEPARATE); - zephir_array_fetch_long(&_10$$5, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 158); + zephir_array_fetch_long(&_10$$5, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 157); if (zephir_is_true(&_10$$5)) { zephir_array_update_string(&definition, SL("autoIncrement"), &__$true, PH_COPY | PH_SEPARATE); } - } else if (zephir_memnstr_str(&columnType, SL("tinyint(1)"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 161)) { + } else if (zephir_memnstr_str(&columnType, SL("tinyint(1)"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 160)) { ZEPHIR_INIT_NVAR(&_11$$7); ZVAL_LONG(&_11$$7, 8); zephir_array_update_string(&definition, SL("type"), &_11$$7, PH_COPY | PH_SEPARATE); @@ -344,19 +344,19 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) zephir_array_update_string(&definition, SL("bindType"), &_12$$7, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&columnType); ZVAL_STRING(&columnType, "boolean"); - } else if (zephir_memnstr_str(&columnType, SL("enum"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 172)) { + } else if (zephir_memnstr_str(&columnType, SL("enum"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 171)) { ZEPHIR_INIT_NVAR(&_13$$8); ZVAL_LONG(&_13$$8, 5); zephir_array_update_string(&definition, SL("type"), &_13$$8, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("datetime"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 181)) { + } else if (zephir_memnstr_str(&columnType, SL("datetime"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 180)) { ZEPHIR_INIT_NVAR(&_14$$9); ZVAL_LONG(&_14$$9, 4); zephir_array_update_string(&definition, SL("type"), &_14$$9, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("date"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 186)) { + } else if (zephir_memnstr_str(&columnType, SL("date"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 185)) { ZEPHIR_INIT_NVAR(&_15$$10); ZVAL_LONG(&_15$$10, 1); zephir_array_update_string(&definition, SL("type"), &_15$$10, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("decimal"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 195)) { + } else if (zephir_memnstr_str(&columnType, SL("decimal"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 194)) { ZEPHIR_INIT_NVAR(&_16$$11); ZVAL_LONG(&_16$$11, 3); zephir_array_update_string(&definition, SL("type"), &_16$$11, PH_COPY | PH_SEPARATE); @@ -364,7 +364,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZEPHIR_INIT_NVAR(&_17$$11); ZVAL_LONG(&_17$$11, 32); zephir_array_update_string(&definition, SL("bindType"), &_17$$11, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("float"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 202)) { + } else if (zephir_memnstr_str(&columnType, SL("float"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 201)) { ZEPHIR_INIT_NVAR(&_18$$12); ZVAL_LONG(&_18$$12, 7); zephir_array_update_string(&definition, SL("type"), &_18$$12, PH_COPY | PH_SEPARATE); @@ -372,19 +372,19 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZEPHIR_INIT_NVAR(&_19$$12); ZVAL_LONG(&_19$$12, 3); zephir_array_update_string(&definition, SL("bindType"), &_19$$12, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("timestamp"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 213)) { + } else if (zephir_memnstr_str(&columnType, SL("timestamp"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 212)) { ZEPHIR_INIT_NVAR(&_20$$13); ZVAL_LONG(&_20$$13, 17); zephir_array_update_string(&definition, SL("type"), &_20$$13, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("varchar"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 222)) { + } else if (zephir_memnstr_str(&columnType, SL("varchar"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 221)) { ZEPHIR_INIT_NVAR(&_21$$14); ZVAL_LONG(&_21$$14, 2); zephir_array_update_string(&definition, SL("type"), &_21$$14, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("char"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 227)) { + } else if (zephir_memnstr_str(&columnType, SL("char"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 226)) { ZEPHIR_INIT_NVAR(&_22$$15); ZVAL_LONG(&_22$$15, 5); zephir_array_update_string(&definition, SL("type"), &_22$$15, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("text"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 232)) { + } else if (zephir_memnstr_str(&columnType, SL("text"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 231)) { ZEPHIR_INIT_NVAR(&_23$$16); ZVAL_LONG(&_23$$16, 6); zephir_array_update_string(&definition, SL("type"), &_23$$16, PH_COPY | PH_SEPARATE); @@ -393,7 +393,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZVAL_LONG(&_24$$17, 2); zephir_array_update_string(&definition, SL("type"), &_24$$17, PH_COPY | PH_SEPARATE); } - if (zephir_memnstr_str(&columnType, SL("("), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 249)) { + if (zephir_memnstr_str(&columnType, SL("("), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 248)) { ZEPHIR_INIT_NVAR(&matches); ZVAL_NULL(&matches); ZEPHIR_INIT_NVAR(&_25$$18); @@ -413,7 +413,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) } } } - if (zephir_memnstr_str(&columnType, SL("unsigned"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 265)) { + if (zephir_memnstr_str(&columnType, SL("unsigned"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 264)) { zephir_array_update_string(&definition, SL("unsigned"), &__$true, PH_COPY | PH_SEPARATE); } if (Z_TYPE_P(&oldColumn) == IS_NULL) { @@ -421,26 +421,27 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) } else { zephir_array_update_string(&definition, SL("after"), &oldColumn, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_28$$3, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 281); + zephir_array_fetch_long(&_28$$3, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 280); if (zephir_is_true(&_28$$3)) { zephir_array_update_string(&definition, SL("primary"), &__$true, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_29$$3, &field, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 288); + zephir_array_fetch_long(&_29$$3, &field, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 287); if (ZEPHIR_IS_LONG(&_29$$3, 0)) { zephir_array_update_string(&definition, SL("notNull"), &__$false, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_30$$3, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 296); - ZEPHIR_INIT_NVAR(&_31$$3); - ZVAL_STRING(&_31$$3, "null"); - ZEPHIR_CALL_FUNCTION(&_32$$3, "strcasecmp", &_33, 34, &_30$$3, &_31$$3); - zephir_check_call_status(); - _34$$3 = !ZEPHIR_IS_LONG(&_32$$3, 0); - if (_34$$3) { - zephir_array_fetch_long(&_35$$3, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 296); - _34$$3 = !ZEPHIR_IS_STRING(&_35$$3, ""); + ZEPHIR_OBS_NVAR(&_30$$3); + zephir_array_fetch_long(&_30$$3, &field, 4, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 295); + _31$$3 = !(ZEPHIR_IS_EMPTY(&_30$$3)); + if (_31$$3) { + zephir_array_fetch_long(&_32$$3, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 295); + ZEPHIR_INIT_NVAR(&_33$$3); + ZVAL_STRING(&_33$$3, "null"); + ZEPHIR_CALL_FUNCTION(&_34$$3, "strcasecmp", &_35, 34, &_32$$3, &_33$$3); + zephir_check_call_status(); + _31$$3 = !ZEPHIR_IS_LONG_IDENTICAL(&_34$$3, 0); } - if (_34$$3) { - zephir_array_fetch_long(&_36$$27, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 301); + if (_31$$3) { + zephir_array_fetch_long(&_36$$27, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 300); ZEPHIR_INIT_NVAR(&_37$$27); ZVAL_STRING(&_37$$27, "/^'|'$/"); ZEPHIR_INIT_NVAR(&_38$$27); @@ -449,12 +450,12 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) zephir_check_call_status(); zephir_array_update_string(&definition, SL("default"), &_39$$27, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&columnName, &field, 1, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 307); - ZEPHIR_INIT_NVAR(&_31$$3); - object_init_ex(&_31$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_31$$3, "__construct", &_41, 206, &columnName, &definition); + zephir_array_fetch_long(&columnName, &field, 1, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 306); + ZEPHIR_INIT_NVAR(&_33$$3); + object_init_ex(&_33$$3, phalcon_db_column_ce); + ZEPHIR_CALL_METHOD(NULL, &_33$$3, "__construct", &_41, 206, &columnName, &definition); zephir_check_call_status(); - zephir_array_append(&columns, &_31$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 308); + zephir_array_append(&columns, &_33$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 307); ZEPHIR_CPY_WRT(&oldColumn, &columnName); } ZEND_HASH_FOREACH_END(); } else { @@ -473,12 +474,12 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) add_assoc_long_ex(&_42$$28, SL("bindType"), 2); ZEPHIR_CPY_WRT(&definition, &_42$$28); ZEPHIR_OBS_NVAR(&columnType); - zephir_array_fetch_long(&columnType, &field, 2, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 128); - _43$$28 = zephir_memnstr_str(&columnType, SL("int"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 150); + zephir_array_fetch_long(&columnType, &field, 2, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 127); + _43$$28 = zephir_memnstr_str(&columnType, SL("int"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 149); if (!(_43$$28)) { - _43$$28 = zephir_memnstr_str(&columnType, SL("INT"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 150); + _43$$28 = zephir_memnstr_str(&columnType, SL("INT"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 149); } - if (zephir_memnstr_str(&columnType, SL("bigint"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 143)) { + if (zephir_memnstr_str(&columnType, SL("bigint"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 142)) { ZEPHIR_INIT_NVAR(&_44$$29); ZVAL_LONG(&_44$$29, 14); zephir_array_update_string(&definition, SL("type"), &_44$$29, PH_COPY | PH_SEPARATE); @@ -494,11 +495,11 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZEPHIR_INIT_NVAR(&_47$$30); ZVAL_LONG(&_47$$30, 1); zephir_array_update_string(&definition, SL("bindType"), &_47$$30, PH_COPY | PH_SEPARATE); - zephir_array_fetch_long(&_48$$30, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 158); + zephir_array_fetch_long(&_48$$30, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 157); if (zephir_is_true(&_48$$30)) { zephir_array_update_string(&definition, SL("autoIncrement"), &__$true, PH_COPY | PH_SEPARATE); } - } else if (zephir_memnstr_str(&columnType, SL("tinyint(1)"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 161)) { + } else if (zephir_memnstr_str(&columnType, SL("tinyint(1)"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 160)) { ZEPHIR_INIT_NVAR(&_49$$32); ZVAL_LONG(&_49$$32, 8); zephir_array_update_string(&definition, SL("type"), &_49$$32, PH_COPY | PH_SEPARATE); @@ -507,19 +508,19 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) zephir_array_update_string(&definition, SL("bindType"), &_50$$32, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&columnType); ZVAL_STRING(&columnType, "boolean"); - } else if (zephir_memnstr_str(&columnType, SL("enum"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 172)) { + } else if (zephir_memnstr_str(&columnType, SL("enum"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 171)) { ZEPHIR_INIT_NVAR(&_51$$33); ZVAL_LONG(&_51$$33, 5); zephir_array_update_string(&definition, SL("type"), &_51$$33, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("datetime"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 181)) { + } else if (zephir_memnstr_str(&columnType, SL("datetime"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 180)) { ZEPHIR_INIT_NVAR(&_52$$34); ZVAL_LONG(&_52$$34, 4); zephir_array_update_string(&definition, SL("type"), &_52$$34, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("date"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 186)) { + } else if (zephir_memnstr_str(&columnType, SL("date"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 185)) { ZEPHIR_INIT_NVAR(&_53$$35); ZVAL_LONG(&_53$$35, 1); zephir_array_update_string(&definition, SL("type"), &_53$$35, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("decimal"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 195)) { + } else if (zephir_memnstr_str(&columnType, SL("decimal"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 194)) { ZEPHIR_INIT_NVAR(&_54$$36); ZVAL_LONG(&_54$$36, 3); zephir_array_update_string(&definition, SL("type"), &_54$$36, PH_COPY | PH_SEPARATE); @@ -527,7 +528,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZEPHIR_INIT_NVAR(&_55$$36); ZVAL_LONG(&_55$$36, 32); zephir_array_update_string(&definition, SL("bindType"), &_55$$36, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("float"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 202)) { + } else if (zephir_memnstr_str(&columnType, SL("float"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 201)) { ZEPHIR_INIT_NVAR(&_56$$37); ZVAL_LONG(&_56$$37, 7); zephir_array_update_string(&definition, SL("type"), &_56$$37, PH_COPY | PH_SEPARATE); @@ -535,19 +536,19 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZEPHIR_INIT_NVAR(&_57$$37); ZVAL_LONG(&_57$$37, 3); zephir_array_update_string(&definition, SL("bindType"), &_57$$37, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("timestamp"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 213)) { + } else if (zephir_memnstr_str(&columnType, SL("timestamp"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 212)) { ZEPHIR_INIT_NVAR(&_58$$38); ZVAL_LONG(&_58$$38, 17); zephir_array_update_string(&definition, SL("type"), &_58$$38, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("varchar"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 222)) { + } else if (zephir_memnstr_str(&columnType, SL("varchar"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 221)) { ZEPHIR_INIT_NVAR(&_59$$39); ZVAL_LONG(&_59$$39, 2); zephir_array_update_string(&definition, SL("type"), &_59$$39, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("char"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 227)) { + } else if (zephir_memnstr_str(&columnType, SL("char"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 226)) { ZEPHIR_INIT_NVAR(&_60$$40); ZVAL_LONG(&_60$$40, 5); zephir_array_update_string(&definition, SL("type"), &_60$$40, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("text"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 232)) { + } else if (zephir_memnstr_str(&columnType, SL("text"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 231)) { ZEPHIR_INIT_NVAR(&_61$$41); ZVAL_LONG(&_61$$41, 6); zephir_array_update_string(&definition, SL("type"), &_61$$41, PH_COPY | PH_SEPARATE); @@ -556,7 +557,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZVAL_LONG(&_62$$42, 2); zephir_array_update_string(&definition, SL("type"), &_62$$42, PH_COPY | PH_SEPARATE); } - if (zephir_memnstr_str(&columnType, SL("("), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 249)) { + if (zephir_memnstr_str(&columnType, SL("("), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 248)) { ZEPHIR_INIT_NVAR(&matches); ZVAL_NULL(&matches); ZEPHIR_INIT_NVAR(&_63$$43); @@ -576,7 +577,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) } } } - if (zephir_memnstr_str(&columnType, SL("unsigned"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 265)) { + if (zephir_memnstr_str(&columnType, SL("unsigned"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 264)) { zephir_array_update_string(&definition, SL("unsigned"), &__$true, PH_COPY | PH_SEPARATE); } if (Z_TYPE_P(&oldColumn) == IS_NULL) { @@ -584,26 +585,27 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) } else { zephir_array_update_string(&definition, SL("after"), &oldColumn, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_66$$28, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 281); + zephir_array_fetch_long(&_66$$28, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 280); if (zephir_is_true(&_66$$28)) { zephir_array_update_string(&definition, SL("primary"), &__$true, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_67$$28, &field, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 288); + zephir_array_fetch_long(&_67$$28, &field, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 287); if (ZEPHIR_IS_LONG(&_67$$28, 0)) { zephir_array_update_string(&definition, SL("notNull"), &__$false, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_68$$28, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 296); - ZEPHIR_INIT_NVAR(&_69$$28); - ZVAL_STRING(&_69$$28, "null"); - ZEPHIR_CALL_FUNCTION(&_70$$28, "strcasecmp", &_33, 34, &_68$$28, &_69$$28); - zephir_check_call_status(); - _71$$28 = !ZEPHIR_IS_LONG(&_70$$28, 0); - if (_71$$28) { - zephir_array_fetch_long(&_72$$28, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 296); - _71$$28 = !ZEPHIR_IS_STRING(&_72$$28, ""); + ZEPHIR_OBS_NVAR(&_68$$28); + zephir_array_fetch_long(&_68$$28, &field, 4, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 295); + _69$$28 = !(ZEPHIR_IS_EMPTY(&_68$$28)); + if (_69$$28) { + zephir_array_fetch_long(&_70$$28, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 295); + ZEPHIR_INIT_NVAR(&_71$$28); + ZVAL_STRING(&_71$$28, "null"); + ZEPHIR_CALL_FUNCTION(&_72$$28, "strcasecmp", &_35, 34, &_70$$28, &_71$$28); + zephir_check_call_status(); + _69$$28 = !ZEPHIR_IS_LONG_IDENTICAL(&_72$$28, 0); } - if (_71$$28) { - zephir_array_fetch_long(&_73$$52, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 301); + if (_69$$28) { + zephir_array_fetch_long(&_73$$52, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 300); ZEPHIR_INIT_NVAR(&_74$$52); ZVAL_STRING(&_74$$52, "/^'|'$/"); ZEPHIR_INIT_NVAR(&_75$$52); @@ -613,12 +615,12 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) zephir_array_update_string(&definition, SL("default"), &_76$$52, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_NVAR(&columnName); - zephir_array_fetch_long(&columnName, &field, 1, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 307); - ZEPHIR_INIT_NVAR(&_69$$28); - object_init_ex(&_69$$28, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_69$$28, "__construct", &_41, 206, &columnName, &definition); + zephir_array_fetch_long(&columnName, &field, 1, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 306); + ZEPHIR_INIT_NVAR(&_71$$28); + object_init_ex(&_71$$28, phalcon_db_column_ce); + ZEPHIR_CALL_METHOD(NULL, &_71$$28, "__construct", &_41, 206, &columnName, &definition); zephir_check_call_status(); - zephir_array_append(&columns, &_69$$28, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 308); + zephir_array_append(&columns, &_71$$28, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 307); ZEPHIR_CPY_WRT(&oldColumn, &columnName); ZEPHIR_CALL_METHOD(NULL, &fields, "next", NULL, 0); zephir_check_call_status(); @@ -750,27 +752,27 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) ZVAL_LONG(&_3, 2); ZEPHIR_CALL_METHOD(&_0, this_ptr, "fetchall", NULL, 0, &_2, &_3); zephir_check_call_status(); - zephir_is_iterable(&_0, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 370); + zephir_is_iterable(&_0, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 369); if (Z_TYPE_P(&_0) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _4) { ZEPHIR_INIT_NVAR(&index); ZVAL_COPY(&index, _4); ZEPHIR_OBS_NVAR(&keyName); - zephir_array_fetch_string(&keyName, &index, SL("name"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 332); + zephir_array_fetch_string(&keyName, &index, SL("name"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 331); if (!(zephir_array_isset(&indexes, &keyName))) { ZEPHIR_INIT_NVAR(&_6$$4); array_init(&_6$$4); zephir_array_update_zval(&indexes, &keyName, &_6$$4, PH_COPY | PH_SEPARATE); } - zephir_array_fetch(&_7$$3, &indexes, &keyName, PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 338); + zephir_array_fetch(&_7$$3, &indexes, &keyName, PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 337); if (!(zephir_array_isset_string(&_7$$3, SL("columns")))) { ZEPHIR_INIT_NVAR(&columns); array_init(&columns); } else { - zephir_array_fetch(&_8$$6, &indexes, &keyName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 341); + zephir_array_fetch(&_8$$6, &indexes, &keyName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 340); ZEPHIR_OBS_NVAR(&columns); - zephir_array_fetch_string(&columns, &_8$$6, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 341); + zephir_array_fetch_string(&columns, &_8$$6, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 340); } zephir_read_property(&_9$$3, this_ptr, ZEND_STRL("dialect"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&_10$$3, &_9$$3, "describeindex", NULL, 0, &keyName); @@ -778,14 +780,14 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) ZVAL_LONG(&_11$$3, 2); ZEPHIR_CALL_METHOD(&describeIndexes, this_ptr, "fetchall", NULL, 0, &_10$$3, &_11$$3); zephir_check_call_status(); - zephir_is_iterable(&describeIndexes, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 353); + zephir_is_iterable(&describeIndexes, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 352); if (Z_TYPE_P(&describeIndexes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&describeIndexes), _12$$3) { ZEPHIR_INIT_NVAR(&describeIndex); ZVAL_COPY(&describeIndex, _12$$3); - zephir_array_fetch_string(&_14$$7, &describeIndex, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 350); - zephir_array_append(&columns, &_14$$7, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 350); + zephir_array_fetch_string(&_14$$7, &describeIndex, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 349); + zephir_array_append(&columns, &_14$$7, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 349); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &describeIndexes, "rewind", NULL, 0); @@ -798,8 +800,8 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) } ZEPHIR_CALL_METHOD(&describeIndex, &describeIndexes, "current", NULL, 0); zephir_check_call_status(); - zephir_array_fetch_string(&_15$$8, &describeIndex, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 350); - zephir_array_append(&columns, &_15$$8, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 350); + zephir_array_fetch_string(&_15$$8, &describeIndex, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 349); + zephir_array_append(&columns, &_15$$8, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 349); ZEPHIR_CALL_METHOD(NULL, &describeIndexes, "next", NULL, 0); zephir_check_call_status(); } @@ -811,7 +813,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&indexSql, this_ptr, "fetchcolumn", &_17, 0, &_16$$3); zephir_check_call_status(); - zephir_array_fetch_string(&_18$$3, &index, SL("unique"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 359); + zephir_array_fetch_string(&_18$$3, &index, SL("unique"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 358); if (zephir_is_true(&_18$$3)) { ZEPHIR_INIT_NVAR(&_19$$9); ZEPHIR_INIT_NVAR(&_20$$9); @@ -845,20 +847,20 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) ZEPHIR_CALL_METHOD(&index, &_0, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&keyName); - zephir_array_fetch_string(&keyName, &index, SL("name"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 332); + zephir_array_fetch_string(&keyName, &index, SL("name"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 331); if (!(zephir_array_isset(&indexes, &keyName))) { ZEPHIR_INIT_NVAR(&_25$$14); array_init(&_25$$14); zephir_array_update_zval(&indexes, &keyName, &_25$$14, PH_COPY | PH_SEPARATE); } - zephir_array_fetch(&_26$$13, &indexes, &keyName, PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 338); + zephir_array_fetch(&_26$$13, &indexes, &keyName, PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 337); if (!(zephir_array_isset_string(&_26$$13, SL("columns")))) { ZEPHIR_INIT_NVAR(&columns); array_init(&columns); } else { - zephir_array_fetch(&_27$$16, &indexes, &keyName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 341); + zephir_array_fetch(&_27$$16, &indexes, &keyName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 340); ZEPHIR_OBS_NVAR(&columns); - zephir_array_fetch_string(&columns, &_27$$16, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 341); + zephir_array_fetch_string(&columns, &_27$$16, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 340); } zephir_read_property(&_28$$13, this_ptr, ZEND_STRL("dialect"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&_29$$13, &_28$$13, "describeindex", NULL, 0, &keyName); @@ -866,14 +868,14 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) ZVAL_LONG(&_30$$13, 2); ZEPHIR_CALL_METHOD(&describeIndexes, this_ptr, "fetchall", NULL, 0, &_29$$13, &_30$$13); zephir_check_call_status(); - zephir_is_iterable(&describeIndexes, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 353); + zephir_is_iterable(&describeIndexes, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 352); if (Z_TYPE_P(&describeIndexes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&describeIndexes), _31$$13) { ZEPHIR_INIT_NVAR(&describeIndex); ZVAL_COPY(&describeIndex, _31$$13); - zephir_array_fetch_string(&_33$$17, &describeIndex, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 350); - zephir_array_append(&columns, &_33$$17, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 350); + zephir_array_fetch_string(&_33$$17, &describeIndex, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 349); + zephir_array_append(&columns, &_33$$17, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 349); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &describeIndexes, "rewind", NULL, 0); @@ -886,8 +888,8 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) } ZEPHIR_CALL_METHOD(&describeIndex, &describeIndexes, "current", NULL, 0); zephir_check_call_status(); - zephir_array_fetch_string(&_34$$18, &describeIndex, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 350); - zephir_array_append(&columns, &_34$$18, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 350); + zephir_array_fetch_string(&_34$$18, &describeIndex, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 349); + zephir_array_append(&columns, &_34$$18, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 349); ZEPHIR_CALL_METHOD(NULL, &describeIndexes, "next", NULL, 0); zephir_check_call_status(); } @@ -899,7 +901,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&indexSql, this_ptr, "fetchcolumn", &_17, 0, &_35$$13); zephir_check_call_status(); - zephir_array_fetch_string(&_36$$13, &index, SL("unique"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 359); + zephir_array_fetch_string(&_36$$13, &index, SL("unique"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 358); if (zephir_is_true(&_36$$13)) { ZEPHIR_INIT_NVAR(&_37$$19); ZEPHIR_INIT_NVAR(&_38$$19); @@ -927,7 +929,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) ZEPHIR_INIT_NVAR(&index); ZEPHIR_INIT_VAR(&indexObjects); array_init(&indexObjects); - zephir_is_iterable(&indexes, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 380); + zephir_is_iterable(&indexes, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 379); if (Z_TYPE_P(&indexes) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&indexes), _45, _46, _43) { @@ -941,8 +943,8 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) ZVAL_COPY(&index, _43); ZEPHIR_INIT_NVAR(&_47$$23); object_init_ex(&_47$$23, phalcon_db_index_ce); - zephir_array_fetch_string(&_48$$23, &index, SL("columns"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 375); - zephir_array_fetch_string(&_49$$23, &index, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 377); + zephir_array_fetch_string(&_48$$23, &index, SL("columns"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 374); + zephir_array_fetch_string(&_49$$23, &index, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 376); ZEPHIR_CALL_METHOD(NULL, &_47$$23, "__construct", &_50, 30, &name, &_48$$23, &_49$$23); zephir_check_call_status(); zephir_array_update_zval(&indexObjects, &name, &_47$$23, PH_COPY | PH_SEPARATE); @@ -962,8 +964,8 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_51$$24); object_init_ex(&_51$$24, phalcon_db_index_ce); - zephir_array_fetch_string(&_52$$24, &index, SL("columns"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 375); - zephir_array_fetch_string(&_53$$24, &index, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 377); + zephir_array_fetch_string(&_52$$24, &index, SL("columns"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 374); + zephir_array_fetch_string(&_53$$24, &index, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 376); ZEPHIR_CALL_METHOD(NULL, &_51$$24, "__construct", &_50, 30, &name, &_52$$24, &_53$$24); zephir_check_call_status(); zephir_array_update_zval(&indexObjects, &name, &_51$$24, PH_COPY | PH_SEPARATE); @@ -1074,7 +1076,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeReferences) ZVAL_LONG(&_3, 3); ZEPHIR_CALL_METHOD(&_0, this_ptr, "fetchall", NULL, 0, &_2, &_3); zephir_check_call_status(); - zephir_is_iterable(&_0, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 420); + zephir_is_iterable(&_0, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 419); if (Z_TYPE_P(&_0) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_0), _6, _7, _4) { @@ -1092,29 +1094,29 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeReferences) ZEPHIR_INIT_NVAR(&referencedSchema); ZVAL_NULL(&referencedSchema); ZEPHIR_OBS_NVAR(&referencedTable); - zephir_array_fetch_long(&referencedTable, &reference, 2, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 399); + zephir_array_fetch_long(&referencedTable, &reference, 2, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 398); ZEPHIR_INIT_NVAR(&columns); array_init(&columns); ZEPHIR_INIT_NVAR(&referencedColumns); array_init(&referencedColumns); } else { - zephir_array_fetch(&_8$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 403); + zephir_array_fetch(&_8$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 402); ZEPHIR_OBS_NVAR(&referencedSchema); - zephir_array_fetch_string(&referencedSchema, &_8$$5, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 403); - zephir_array_fetch(&_9$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 404); + zephir_array_fetch_string(&referencedSchema, &_8$$5, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 402); + zephir_array_fetch(&_9$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 403); ZEPHIR_OBS_NVAR(&referencedTable); - zephir_array_fetch_string(&referencedTable, &_9$$5, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 404); - zephir_array_fetch(&_10$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 405); + zephir_array_fetch_string(&referencedTable, &_9$$5, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 403); + zephir_array_fetch(&_10$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 404); ZEPHIR_OBS_NVAR(&columns); - zephir_array_fetch_string(&columns, &_10$$5, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 405); - zephir_array_fetch(&_11$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 406); + zephir_array_fetch_string(&columns, &_10$$5, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 404); + zephir_array_fetch(&_11$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 405); ZEPHIR_OBS_NVAR(&referencedColumns); - zephir_array_fetch_string(&referencedColumns, &_11$$5, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 406); + zephir_array_fetch_string(&referencedColumns, &_11$$5, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 405); } - zephir_array_fetch_long(&_12$$3, &reference, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 409); - zephir_array_append(&columns, &_12$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 409); - zephir_array_fetch_long(&_13$$3, &reference, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 410); - zephir_array_append(&referencedColumns, &_13$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 410); + zephir_array_fetch_long(&_12$$3, &reference, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 408); + zephir_array_append(&columns, &_12$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 408); + zephir_array_fetch_long(&_13$$3, &reference, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 409); + zephir_array_append(&referencedColumns, &_13$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 409); ZEPHIR_INIT_NVAR(&_14$$3); zephir_create_array(&_14$$3, 4, 0); zephir_array_update_string(&_14$$3, SL("referencedSchema"), &referencedSchema, PH_COPY | PH_SEPARATE); @@ -1142,29 +1144,29 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeReferences) ZEPHIR_INIT_NVAR(&referencedSchema); ZVAL_NULL(&referencedSchema); ZEPHIR_OBS_NVAR(&referencedTable); - zephir_array_fetch_long(&referencedTable, &reference, 2, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 399); + zephir_array_fetch_long(&referencedTable, &reference, 2, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 398); ZEPHIR_INIT_NVAR(&columns); array_init(&columns); ZEPHIR_INIT_NVAR(&referencedColumns); array_init(&referencedColumns); } else { - zephir_array_fetch(&_15$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 403); + zephir_array_fetch(&_15$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 402); ZEPHIR_OBS_NVAR(&referencedSchema); - zephir_array_fetch_string(&referencedSchema, &_15$$8, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 403); - zephir_array_fetch(&_16$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 404); + zephir_array_fetch_string(&referencedSchema, &_15$$8, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 402); + zephir_array_fetch(&_16$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 403); ZEPHIR_OBS_NVAR(&referencedTable); - zephir_array_fetch_string(&referencedTable, &_16$$8, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 404); - zephir_array_fetch(&_17$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 405); + zephir_array_fetch_string(&referencedTable, &_16$$8, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 403); + zephir_array_fetch(&_17$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 404); ZEPHIR_OBS_NVAR(&columns); - zephir_array_fetch_string(&columns, &_17$$8, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 405); - zephir_array_fetch(&_18$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 406); + zephir_array_fetch_string(&columns, &_17$$8, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 404); + zephir_array_fetch(&_18$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 405); ZEPHIR_OBS_NVAR(&referencedColumns); - zephir_array_fetch_string(&referencedColumns, &_18$$8, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 406); + zephir_array_fetch_string(&referencedColumns, &_18$$8, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 405); } - zephir_array_fetch_long(&_19$$6, &reference, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 409); - zephir_array_append(&columns, &_19$$6, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 409); - zephir_array_fetch_long(&_20$$6, &reference, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 410); - zephir_array_append(&referencedColumns, &_20$$6, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 410); + zephir_array_fetch_long(&_19$$6, &reference, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 408); + zephir_array_append(&columns, &_19$$6, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 408); + zephir_array_fetch_long(&_20$$6, &reference, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 409); + zephir_array_append(&referencedColumns, &_20$$6, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 409); ZEPHIR_INIT_NVAR(&_21$$6); zephir_create_array(&_21$$6, 4, 0); zephir_array_update_string(&_21$$6, SL("referencedSchema"), &referencedSchema, PH_COPY | PH_SEPARATE); @@ -1180,7 +1182,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeReferences) ZEPHIR_INIT_NVAR(&number); ZEPHIR_INIT_VAR(&referenceObjects); array_init(&referenceObjects); - zephir_is_iterable(&references, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 434); + zephir_is_iterable(&references, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 433); if (Z_TYPE_P(&references) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&references), _24, _25, _22) { @@ -1197,16 +1199,16 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeReferences) ZEPHIR_INIT_NVAR(&_27$$9); zephir_create_array(&_27$$9, 4, 0); ZEPHIR_OBS_NVAR(&_28$$9); - zephir_array_fetch_string(&_28$$9, &arrayReference, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 426); + zephir_array_fetch_string(&_28$$9, &arrayReference, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 425); zephir_array_update_string(&_27$$9, SL("referencedSchema"), &_28$$9, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_28$$9); - zephir_array_fetch_string(&_28$$9, &arrayReference, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 427); + zephir_array_fetch_string(&_28$$9, &arrayReference, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 426); zephir_array_update_string(&_27$$9, SL("referencedTable"), &_28$$9, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_28$$9); - zephir_array_fetch_string(&_28$$9, &arrayReference, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 428); + zephir_array_fetch_string(&_28$$9, &arrayReference, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 427); zephir_array_update_string(&_27$$9, SL("columns"), &_28$$9, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_28$$9); - zephir_array_fetch_string(&_28$$9, &arrayReference, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 430); + zephir_array_fetch_string(&_28$$9, &arrayReference, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 429); zephir_array_update_string(&_27$$9, SL("referencedColumns"), &_28$$9, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &_26$$9, "__construct", &_29, 31, &name, &_27$$9); zephir_check_call_status(); @@ -1230,16 +1232,16 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeReferences) ZEPHIR_INIT_NVAR(&_31$$10); zephir_create_array(&_31$$10, 4, 0); ZEPHIR_OBS_NVAR(&_32$$10); - zephir_array_fetch_string(&_32$$10, &arrayReference, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 426); + zephir_array_fetch_string(&_32$$10, &arrayReference, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 425); zephir_array_update_string(&_31$$10, SL("referencedSchema"), &_32$$10, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_32$$10); - zephir_array_fetch_string(&_32$$10, &arrayReference, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 427); + zephir_array_fetch_string(&_32$$10, &arrayReference, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 426); zephir_array_update_string(&_31$$10, SL("referencedTable"), &_32$$10, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_32$$10); - zephir_array_fetch_string(&_32$$10, &arrayReference, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 428); + zephir_array_fetch_string(&_32$$10, &arrayReference, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 427); zephir_array_update_string(&_31$$10, SL("columns"), &_32$$10, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_32$$10); - zephir_array_fetch_string(&_32$$10, &arrayReference, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 430); + zephir_array_fetch_string(&_32$$10, &arrayReference, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 429); zephir_array_update_string(&_31$$10, SL("referencedColumns"), &_32$$10, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &_30$$10, "__construct", &_29, 31, &name, &_31$$10); zephir_check_call_status(); diff --git a/ext/phalcon/filter/validation/validator/regex.zep.c b/ext/phalcon/filter/validation/validator/regex.zep.c index a07ec820af6..a4f26e39996 100644 --- a/ext/phalcon/filter/validation/validator/regex.zep.c +++ b/ext/phalcon/filter/validation/validator/regex.zep.c @@ -126,10 +126,10 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Regex, __construct) */ PHP_METHOD(Phalcon_Filter_Validation_Validator_Regex, validate) { - zend_bool failed = 0; + zend_bool failed = 0, _3; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *validation, validation_sub, *field, field_sub, matches, value, pattern, _0, _1, _2$$4, _3$$5, _4$$7; + zval *validation, validation_sub, *field, field_sub, matches, value, pattern, _0, _1, _2$$4, _4$$5, _5$$7; zval *this_ptr = getThis(); ZVAL_UNDEF(&validation_sub); @@ -140,8 +140,8 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Regex, validate) ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1); ZVAL_UNDEF(&_2$$4); - ZVAL_UNDEF(&_3$$5); - ZVAL_UNDEF(&_4$$7); + ZVAL_UNDEF(&_4$$5); + ZVAL_UNDEF(&_5$$7); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) @@ -172,18 +172,22 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Regex, validate) zephir_array_fetch(&_2$$4, &pattern, field, PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/Regex.zep", 94); ZEPHIR_CPY_WRT(&pattern, &_2$$4); } - ZEPHIR_INIT_NVAR(&_1); - zephir_preg_match(&_1, &pattern, &value, &matches, 0, 0 , 0 ); - if (zephir_is_true(&_1)) { - zephir_array_fetch_long(&_3$$5, &matches, 0, PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/Regex.zep", 98); - failed = !ZEPHIR_IS_EQUAL(&_3$$5, &value); + _3 = Z_TYPE_P(&value) != IS_NULL; + if (_3) { + ZEPHIR_INIT_NVAR(&_1); + zephir_preg_match(&_1, &pattern, &value, &matches, 0, 0 , 0 ); + _3 = zephir_is_true(&_1); + } + if (_3) { + zephir_array_fetch_long(&_4$$5, &matches, 0, PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/Regex.zep", 101); + failed = !ZEPHIR_IS_EQUAL(&_4$$5, &value); } else { failed = 1; } if (failed) { - ZEPHIR_CALL_METHOD(&_4$$7, this_ptr, "messagefactory", NULL, 0, validation, field); + ZEPHIR_CALL_METHOD(&_5$$7, this_ptr, "messagefactory", NULL, 0, validation, field); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, &_4$$7); + ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, &_5$$7); zephir_check_call_status(); RETURN_MM_BOOL(0); } diff --git a/ext/phalcon/mvc/application.zep.c b/ext/phalcon/mvc/application.zep.c index ae1e2cf6bc2..d0e57595505 100644 --- a/ext/phalcon/mvc/application.zep.c +++ b/ext/phalcon/mvc/application.zep.c @@ -13,10 +13,10 @@ #include "kernel/main.h" #include "kernel/object.h" +#include "kernel/operators.h" #include "kernel/exception.h" #include "kernel/memory.h" #include "kernel/fcall.h" -#include "kernel/operators.h" #include "Zend/zend_closures.h" #include "kernel/array.h" #include "kernel/file.h" @@ -103,12 +103,12 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Application) */ PHP_METHOD(Phalcon_Mvc_Application, handle) { - zval _17$$21; - zend_class_entry *_6$$8; - zend_bool returnedResponse = 0, _10$$7, _13$$12, _31$$31, _33$$31; + zval _17$$20; + zend_class_entry *_6$$7; + zend_bool returnedResponse = 0, _1, _10$$6, _13$$11, _31$$30, _33$$30; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *uri_param = NULL, __$false, container, eventsManager, router, dispatcher, response, view, module, moduleObject, moduleName, className, path, implicitView, controller, possibleResponse, renderStatus, matchedRoute, match, _0, _3, _4, _21, _22, _23, _24, _41, _1$$4, _2$$4, _5$$8, _7$$7, _8$$9, _9$$9, _11$$13, _12$$13, _14$$19, _15$$19, _16$$16, _18$$23, _19$$24, _20$$24, _25$$26, _26$$26, _27$$28, _28$$28, _29$$30, _30$$30, _32$$32, _34$$35, _35$$36, _36$$36, _37$$39, _38$$39, _39$$40, _40$$41; + zval *uri_param = NULL, __$false, container, eventsManager, router, dispatcher, response, view, module, moduleObject, moduleName, className, path, implicitView, controller, possibleResponse, renderStatus, matchedRoute, match, _0, _2, _3, _4, _21, _22, _23, _24, _41, _5$$7, _7$$6, _8$$8, _9$$8, _11$$12, _12$$12, _14$$18, _15$$18, _16$$15, _18$$22, _19$$23, _20$$23, _25$$25, _26$$25, _27$$27, _28$$27, _29$$29, _30$$29, _32$$31, _34$$34, _35$$35, _36$$35, _37$$38, _38$$38, _39$$39, _40$$40; zval uri; zval *this_ptr = getThis(); @@ -132,6 +132,7 @@ PHP_METHOD(Phalcon_Mvc_Application, handle) ZVAL_UNDEF(&matchedRoute); ZVAL_UNDEF(&match); ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_2); ZVAL_UNDEF(&_3); ZVAL_UNDEF(&_4); ZVAL_UNDEF(&_21); @@ -139,35 +140,33 @@ PHP_METHOD(Phalcon_Mvc_Application, handle) ZVAL_UNDEF(&_23); ZVAL_UNDEF(&_24); ZVAL_UNDEF(&_41); - ZVAL_UNDEF(&_1$$4); - ZVAL_UNDEF(&_2$$4); - ZVAL_UNDEF(&_5$$8); - ZVAL_UNDEF(&_7$$7); - ZVAL_UNDEF(&_8$$9); - ZVAL_UNDEF(&_9$$9); - ZVAL_UNDEF(&_11$$13); - ZVAL_UNDEF(&_12$$13); - ZVAL_UNDEF(&_14$$19); - ZVAL_UNDEF(&_15$$19); - ZVAL_UNDEF(&_16$$16); - ZVAL_UNDEF(&_18$$23); - ZVAL_UNDEF(&_19$$24); - ZVAL_UNDEF(&_20$$24); - ZVAL_UNDEF(&_25$$26); - ZVAL_UNDEF(&_26$$26); - ZVAL_UNDEF(&_27$$28); - ZVAL_UNDEF(&_28$$28); - ZVAL_UNDEF(&_29$$30); - ZVAL_UNDEF(&_30$$30); - ZVAL_UNDEF(&_32$$32); - ZVAL_UNDEF(&_34$$35); - ZVAL_UNDEF(&_35$$36); - ZVAL_UNDEF(&_36$$36); - ZVAL_UNDEF(&_37$$39); - ZVAL_UNDEF(&_38$$39); - ZVAL_UNDEF(&_39$$40); - ZVAL_UNDEF(&_40$$41); - ZVAL_UNDEF(&_17$$21); + ZVAL_UNDEF(&_5$$7); + ZVAL_UNDEF(&_7$$6); + ZVAL_UNDEF(&_8$$8); + ZVAL_UNDEF(&_9$$8); + ZVAL_UNDEF(&_11$$12); + ZVAL_UNDEF(&_12$$12); + ZVAL_UNDEF(&_14$$18); + ZVAL_UNDEF(&_15$$18); + ZVAL_UNDEF(&_16$$15); + ZVAL_UNDEF(&_18$$22); + ZVAL_UNDEF(&_19$$23); + ZVAL_UNDEF(&_20$$23); + ZVAL_UNDEF(&_25$$25); + ZVAL_UNDEF(&_26$$25); + ZVAL_UNDEF(&_27$$27); + ZVAL_UNDEF(&_28$$27); + ZVAL_UNDEF(&_29$$29); + ZVAL_UNDEF(&_30$$29); + ZVAL_UNDEF(&_32$$31); + ZVAL_UNDEF(&_34$$34); + ZVAL_UNDEF(&_35$$35); + ZVAL_UNDEF(&_36$$35); + ZVAL_UNDEF(&_37$$38); + ZVAL_UNDEF(&_38$$38); + ZVAL_UNDEF(&_39$$39); + ZVAL_UNDEF(&_40$$40); + ZVAL_UNDEF(&_17$$20); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -191,26 +190,28 @@ PHP_METHOD(Phalcon_Mvc_Application, handle) zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&container, &_0); - if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) { + if (Z_TYPE_P(&container) == IS_NULL) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_application_exception_ce, "A dependency injection container is required to access internal services", "phalcon/Mvc/Application.zep", 100); return; } zephir_read_property(&_0, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&eventsManager, &_0); - if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(&_2$$4); - ZVAL_STRING(&_2$$4, "application:boot"); - ZEPHIR_CALL_METHOD(&_1$$4, &eventsManager, "fire", NULL, 0, &_2$$4, this_ptr); + _1 = Z_TYPE_P(&eventsManager) != IS_NULL; + if (_1) { + ZEPHIR_INIT_VAR(&_3); + ZVAL_STRING(&_3, "application:boot"); + ZEPHIR_CALL_METHOD(&_2, &eventsManager, "fire", NULL, 0, &_3, this_ptr); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(&_1$$4)) { - RETURN_MM_BOOL(0); - } + _1 = ZEPHIR_IS_FALSE_IDENTICAL(&_2); + } + if (_1) { + RETURN_MM_BOOL(0); } - ZEPHIR_INIT_VAR(&_4); - ZVAL_STRING(&_4, "router"); - ZEPHIR_CALL_METHOD(&_3, &container, "getshared", NULL, 0, &_4); + ZEPHIR_INIT_NVAR(&_3); + ZVAL_STRING(&_3, "router"); + ZEPHIR_CALL_METHOD(&_4, &container, "getshared", NULL, 0, &_3); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&router, &_3); + ZEPHIR_CPY_WRT(&router, &_4); ZEPHIR_CALL_METHOD(NULL, &router, "handle", NULL, 0, &uri); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&matchedRoute, &router, "getmatchedroute", NULL, 0); @@ -220,31 +221,31 @@ PHP_METHOD(Phalcon_Mvc_Application, handle) zephir_check_call_status(); if (Z_TYPE_P(&match) != IS_NULL) { if (zephir_is_instance_of(&match, SL("Closure"))) { - _6$$8 = zephir_fetch_class_str_ex(SL("Closure"), ZEND_FETCH_CLASS_AUTO); - ZEPHIR_CALL_CE_STATIC(&_5$$8, _6$$8, "bind", NULL, 0, &match, &container); + _6$$7 = zephir_fetch_class_str_ex(SL("Closure"), ZEND_FETCH_CLASS_AUTO); + ZEPHIR_CALL_CE_STATIC(&_5$$7, _6$$7, "bind", NULL, 0, &match, &container); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&match, &_5$$8); + ZEPHIR_CPY_WRT(&match, &_5$$7); } - ZEPHIR_CALL_METHOD(&_7$$7, &router, "getparams", NULL, 0); + ZEPHIR_CALL_METHOD(&_7$$6, &router, "getparams", NULL, 0); zephir_check_call_status(); ZEPHIR_INIT_VAR(&possibleResponse); - ZEPHIR_CALL_USER_FUNC_ARRAY(&possibleResponse, &match, &_7$$7); + ZEPHIR_CALL_USER_FUNC_ARRAY(&possibleResponse, &match, &_7$$6); zephir_check_call_status(); if (Z_TYPE_P(&possibleResponse) == IS_STRING) { - ZEPHIR_INIT_VAR(&_9$$9); - ZVAL_STRING(&_9$$9, "response"); - ZEPHIR_CALL_METHOD(&_8$$9, &container, "getshared", NULL, 0, &_9$$9); + ZEPHIR_INIT_VAR(&_9$$8); + ZVAL_STRING(&_9$$8, "response"); + ZEPHIR_CALL_METHOD(&_8$$8, &container, "getshared", NULL, 0, &_9$$8); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&response, &_8$$9); + ZEPHIR_CPY_WRT(&response, &_8$$8); ZEPHIR_CALL_METHOD(NULL, &response, "setcontent", NULL, 0, &possibleResponse); zephir_check_call_status(); RETURN_CCTOR(&response); } - _10$$7 = Z_TYPE_P(&possibleResponse) == IS_OBJECT; - if (_10$$7) { - _10$$7 = zephir_instance_of_ev(&possibleResponse, phalcon_http_responseinterface_ce); + _10$$6 = Z_TYPE_P(&possibleResponse) == IS_OBJECT; + if (_10$$6) { + _10$$6 = zephir_instance_of_ev(&possibleResponse, phalcon_http_responseinterface_ce); } - if (_10$$7) { + if (_10$$6) { ZEPHIR_CALL_METHOD(NULL, &possibleResponse, "sendheaders", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &possibleResponse, "sendcookies", NULL, 0); @@ -263,22 +264,22 @@ PHP_METHOD(Phalcon_Mvc_Application, handle) ZVAL_NULL(&moduleObject); if (zephir_is_true(&moduleName)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(&_12$$13); - ZVAL_STRING(&_12$$13, "application:beforeStartModule"); - ZEPHIR_CALL_METHOD(&_11$$13, &eventsManager, "fire", NULL, 0, &_12$$13, this_ptr, &moduleName); + ZEPHIR_INIT_VAR(&_12$$12); + ZVAL_STRING(&_12$$12, "application:beforeStartModule"); + ZEPHIR_CALL_METHOD(&_11$$12, &eventsManager, "fire", NULL, 0, &_12$$12, this_ptr, &moduleName); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(&_11$$13)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(&_11$$12)) { RETURN_MM_BOOL(0); } } ZEPHIR_CALL_METHOD(&module, this_ptr, "getmodule", NULL, 0, &moduleName); zephir_check_call_status(); - _13$$12 = Z_TYPE_P(&module) != IS_ARRAY; - if (_13$$12) { - _13$$12 = Z_TYPE_P(&module) != IS_OBJECT; + _13$$11 = Z_TYPE_P(&module) != IS_ARRAY; + if (_13$$11) { + _13$$11 = Z_TYPE_P(&module) != IS_OBJECT; } - if (UNEXPECTED(_13$$12)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_application_exception_ce, "Invalid module definition", "phalcon/Mvc/Application.zep", 198); + if (UNEXPECTED(_13$$11)) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_application_exception_ce, "Invalid module definition", "phalcon/Mvc/Application.zep", 196); return; } if (Z_TYPE_P(&module) == IS_ARRAY) { @@ -290,13 +291,13 @@ PHP_METHOD(Phalcon_Mvc_Application, handle) ZEPHIR_OBS_VAR(&path); if (zephir_array_isset_string_fetch(&path, &module, SL("path"), 0)) { if (UNEXPECTED(!((zephir_file_exists(&path) == SUCCESS)))) { - ZEPHIR_INIT_VAR(&_14$$19); - object_init_ex(&_14$$19, phalcon_mvc_application_exception_ce); - ZEPHIR_INIT_VAR(&_15$$19); - ZEPHIR_CONCAT_SVS(&_15$$19, "Module definition path '", &path, "' doesn't exist"); - ZEPHIR_CALL_METHOD(NULL, &_14$$19, "__construct", NULL, 29, &_15$$19); + ZEPHIR_INIT_VAR(&_14$$18); + object_init_ex(&_14$$18, phalcon_mvc_application_exception_ce); + ZEPHIR_INIT_VAR(&_15$$18); + ZEPHIR_CONCAT_SVS(&_15$$18, "Module definition path '", &path, "' doesn't exist"); + ZEPHIR_CALL_METHOD(NULL, &_14$$18, "__construct", NULL, 29, &_15$$18); zephir_check_call_status(); - zephir_throw_exception_debug(&_14$$19, "phalcon/Mvc/Application.zep", 220); + zephir_throw_exception_debug(&_14$$18, "phalcon/Mvc/Application.zep", 218); ZEPHIR_MM_RESTORE(); return; } @@ -306,49 +307,49 @@ PHP_METHOD(Phalcon_Mvc_Application, handle) } } } - ZEPHIR_CALL_METHOD(&_16$$16, &container, "get", NULL, 0, &className); + ZEPHIR_CALL_METHOD(&_16$$15, &container, "get", NULL, 0, &className); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&moduleObject, &_16$$16); + ZEPHIR_CPY_WRT(&moduleObject, &_16$$15); ZEPHIR_CALL_METHOD(NULL, &moduleObject, "registerautoloaders", NULL, 0, &container); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &moduleObject, "registerservices", NULL, 0, &container); zephir_check_call_status(); } else { if (UNEXPECTED(!((zephir_is_instance_of(&module, SL("Closure")))))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_application_exception_ce, "Invalid module definition", "phalcon/Mvc/Application.zep", 241); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_application_exception_ce, "Invalid module definition", "phalcon/Mvc/Application.zep", 239); return; } - ZEPHIR_INIT_VAR(&_17$$21); - zephir_create_array(&_17$$21, 1, 0); - zephir_array_fast_append(&_17$$21, &container); + ZEPHIR_INIT_VAR(&_17$$20); + zephir_create_array(&_17$$20, 1, 0); + zephir_array_fast_append(&_17$$20, &container); ZEPHIR_INIT_NVAR(&moduleObject); - ZEPHIR_CALL_USER_FUNC_ARRAY(&moduleObject, &module, &_17$$21); + ZEPHIR_CALL_USER_FUNC_ARRAY(&moduleObject, &module, &_17$$20); zephir_check_call_status(); } if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(&_18$$23); - ZVAL_STRING(&_18$$23, "application:afterStartModule"); - ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_18$$23, this_ptr, &moduleObject); + ZEPHIR_INIT_VAR(&_18$$22); + ZVAL_STRING(&_18$$22, "application:afterStartModule"); + ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_18$$22, this_ptr, &moduleObject); zephir_check_call_status(); } } zephir_read_property(&_0, this_ptr, ZEND_STRL("implicitView"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&implicitView, &_0); if (ZEPHIR_IS_TRUE_IDENTICAL(&implicitView)) { - ZEPHIR_INIT_VAR(&_20$$24); - ZVAL_STRING(&_20$$24, "view"); - ZEPHIR_CALL_METHOD(&_19$$24, &container, "getshared", NULL, 0, &_20$$24); + ZEPHIR_INIT_VAR(&_20$$23); + ZVAL_STRING(&_20$$23, "view"); + ZEPHIR_CALL_METHOD(&_19$$23, &container, "getshared", NULL, 0, &_20$$23); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&view, &_19$$24); + ZEPHIR_CPY_WRT(&view, &_19$$23); } - ZEPHIR_INIT_NVAR(&_4); - ZVAL_STRING(&_4, "dispatcher"); - ZEPHIR_CALL_METHOD(&_3, &container, "getshared", NULL, 0, &_4); + ZEPHIR_INIT_NVAR(&_3); + ZVAL_STRING(&_3, "dispatcher"); + ZEPHIR_CALL_METHOD(&_4, &container, "getshared", NULL, 0, &_3); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&dispatcher, &_3); - ZEPHIR_CALL_METHOD(&_3, &router, "getmodulename", NULL, 0); + ZEPHIR_CPY_WRT(&dispatcher, &_4); + ZEPHIR_CALL_METHOD(&_4, &router, "getmodulename", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &dispatcher, "setmodulename", NULL, 0, &_3); + ZEPHIR_CALL_METHOD(NULL, &dispatcher, "setmodulename", NULL, 0, &_4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_21, &router, "getnamespacename", NULL, 0); zephir_check_call_status(); @@ -371,11 +372,11 @@ PHP_METHOD(Phalcon_Mvc_Application, handle) zephir_check_call_status(); } if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(&_26$$26); - ZVAL_STRING(&_26$$26, "application:beforeHandleRequest"); - ZEPHIR_CALL_METHOD(&_25$$26, &eventsManager, "fire", NULL, 0, &_26$$26, this_ptr, &dispatcher); + ZEPHIR_INIT_VAR(&_26$$25); + ZVAL_STRING(&_26$$25, "application:beforeHandleRequest"); + ZEPHIR_CALL_METHOD(&_25$$25, &eventsManager, "fire", NULL, 0, &_26$$25, this_ptr, &dispatcher); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(&_25$$26)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(&_25$$25)) { RETURN_MM_BOOL(0); } } @@ -384,52 +385,52 @@ PHP_METHOD(Phalcon_Mvc_Application, handle) ZEPHIR_CALL_METHOD(&possibleResponse, &dispatcher, "getreturnedvalue", NULL, 0); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&possibleResponse)) { - ZEPHIR_INIT_VAR(&_28$$28); - ZVAL_STRING(&_28$$28, "response"); - ZEPHIR_CALL_METHOD(&_27$$28, &container, "getshared", NULL, 0, &_28$$28); + ZEPHIR_INIT_VAR(&_28$$27); + ZVAL_STRING(&_28$$27, "response"); + ZEPHIR_CALL_METHOD(&_27$$27, &container, "getshared", NULL, 0, &_28$$27); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&response, &_27$$28); + ZEPHIR_CPY_WRT(&response, &_27$$27); } else { if (Z_TYPE_P(&possibleResponse) == IS_STRING) { - ZEPHIR_INIT_VAR(&_30$$30); - ZVAL_STRING(&_30$$30, "response"); - ZEPHIR_CALL_METHOD(&_29$$30, &container, "getshared", NULL, 0, &_30$$30); + ZEPHIR_INIT_VAR(&_30$$29); + ZVAL_STRING(&_30$$29, "response"); + ZEPHIR_CALL_METHOD(&_29$$29, &container, "getshared", NULL, 0, &_30$$29); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&response, &_29$$30); + ZEPHIR_CPY_WRT(&response, &_29$$29); ZEPHIR_CALL_METHOD(NULL, &response, "setcontent", NULL, 0, &possibleResponse); zephir_check_call_status(); } else { - _31$$31 = (Z_TYPE_P(&possibleResponse) == IS_OBJECT); - if (_31$$31) { - _31$$31 = (zephir_instance_of_ev(&possibleResponse, phalcon_http_responseinterface_ce)); + _31$$30 = (Z_TYPE_P(&possibleResponse) == IS_OBJECT); + if (_31$$30) { + _31$$30 = (zephir_instance_of_ev(&possibleResponse, phalcon_http_responseinterface_ce)); } - returnedResponse = _31$$31; + returnedResponse = _31$$30; if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(&_32$$32); - ZVAL_STRING(&_32$$32, "application:afterHandleRequest"); - ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_32$$32, this_ptr, &controller); + ZEPHIR_INIT_VAR(&_32$$31); + ZVAL_STRING(&_32$$31, "application:afterHandleRequest"); + ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_32$$31, this_ptr, &controller); zephir_check_call_status(); } - _33$$31 = returnedResponse == 0; - if (_33$$31) { - _33$$31 = ZEPHIR_IS_TRUE_IDENTICAL(&implicitView); + _33$$30 = returnedResponse == 0; + if (_33$$30) { + _33$$30 = ZEPHIR_IS_TRUE_IDENTICAL(&implicitView); } - if (_33$$31) { + if (_33$$30) { if (Z_TYPE_P(&controller) == IS_OBJECT) { ZEPHIR_INIT_VAR(&renderStatus); ZVAL_BOOL(&renderStatus, 1); if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(&_34$$35); - ZVAL_STRING(&_34$$35, "application:viewRender"); - ZEPHIR_CALL_METHOD(&renderStatus, &eventsManager, "fire", NULL, 0, &_34$$35, this_ptr, &view); + ZEPHIR_INIT_VAR(&_34$$34); + ZVAL_STRING(&_34$$34, "application:viewRender"); + ZEPHIR_CALL_METHOD(&renderStatus, &eventsManager, "fire", NULL, 0, &_34$$34, this_ptr, &view); zephir_check_call_status(); } if (!ZEPHIR_IS_FALSE_IDENTICAL(&renderStatus)) { - ZEPHIR_CALL_METHOD(&_35$$36, &dispatcher, "getcontrollername", NULL, 0); + ZEPHIR_CALL_METHOD(&_35$$35, &dispatcher, "getcontrollername", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_36$$36, &dispatcher, "getactionname", NULL, 0); + ZEPHIR_CALL_METHOD(&_36$$35, &dispatcher, "getactionname", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &view, "render", NULL, 0, &_35$$36, &_36$$36); + ZEPHIR_CALL_METHOD(NULL, &view, "render", NULL, 0, &_35$$35, &_36$$35); zephir_check_call_status(); } } @@ -441,24 +442,24 @@ PHP_METHOD(Phalcon_Mvc_Application, handle) if (returnedResponse == 1) { ZEPHIR_CPY_WRT(&response, &possibleResponse); } else { - ZEPHIR_INIT_VAR(&_38$$39); - ZVAL_STRING(&_38$$39, "response"); - ZEPHIR_CALL_METHOD(&_37$$39, &container, "getshared", NULL, 0, &_38$$39); + ZEPHIR_INIT_VAR(&_38$$38); + ZVAL_STRING(&_38$$38, "response"); + ZEPHIR_CALL_METHOD(&_37$$38, &container, "getshared", NULL, 0, &_38$$38); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&response, &_37$$39); + ZEPHIR_CPY_WRT(&response, &_37$$38); if (ZEPHIR_IS_TRUE_IDENTICAL(&implicitView)) { - ZEPHIR_CALL_METHOD(&_39$$40, &view, "getcontent", NULL, 0); + ZEPHIR_CALL_METHOD(&_39$$39, &view, "getcontent", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &response, "setcontent", NULL, 0, &_39$$40); + ZEPHIR_CALL_METHOD(NULL, &response, "setcontent", NULL, 0, &_39$$39); zephir_check_call_status(); } } } } if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(&_40$$41); - ZVAL_STRING(&_40$$41, "application:beforeSendResponse"); - ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_40$$41, this_ptr, &response); + ZEPHIR_INIT_VAR(&_40$$40); + ZVAL_STRING(&_40$$40, "application:beforeSendResponse"); + ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_40$$40, this_ptr, &response); zephir_check_call_status(); } zephir_read_property(&_0, this_ptr, ZEND_STRL("sendHeaders"), PH_NOISY_CC | PH_READONLY); diff --git a/ext/phalcon/mvc/micro/collection.zep.c b/ext/phalcon/mvc/micro/collection.zep.c index c9fd4c4b713..a938b2e0f67 100644 --- a/ext/phalcon/mvc/micro/collection.zep.c +++ b/ext/phalcon/mvc/micro/collection.zep.c @@ -775,7 +775,7 @@ PHP_METHOD(Phalcon_Mvc_Micro_Collection, setPrefix) * @param string|array method * @param string routePattern * @param callable handler - * @param string name + * @param string|null name */ PHP_METHOD(Phalcon_Mvc_Micro_Collection, addMap) { @@ -792,17 +792,18 @@ PHP_METHOD(Phalcon_Mvc_Micro_Collection, addMap) ZVAL_UNDEF(&_0); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(4, 4) + ZEND_PARSE_PARAMETERS_START(3, 4) Z_PARAM_ZVAL(method) Z_PARAM_STR(routePattern) Z_PARAM_ZVAL(handler) - Z_PARAM_STR(name) + Z_PARAM_OPTIONAL + Z_PARAM_STR_OR_NULL(name) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 4, 0, &method, &routePattern_param, &handler, &name_param); + zephir_fetch_params(1, 3, 1, &method, &routePattern_param, &handler, &name_param); if (UNEXPECTED(Z_TYPE_P(routePattern_param) != IS_STRING && Z_TYPE_P(routePattern_param) != IS_NULL)) { zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'routePattern' must be of the type string")); RETURN_MM_NULL(); @@ -812,7 +813,11 @@ PHP_METHOD(Phalcon_Mvc_Micro_Collection, addMap) } else { ZEPHIR_INIT_VAR(&routePattern); } - zephir_get_strval(&name, name_param); + if (!name_param) { + ZEPHIR_INIT_VAR(&name); + } else { + zephir_get_strval(&name, name_param); + } ZEPHIR_INIT_VAR(&_0); diff --git a/ext/phalcon/mvc/micro/collection.zep.h b/ext/phalcon/mvc/micro/collection.zep.h index 6a3fe7d933b..04eda9a7d75 100644 --- a/ext/phalcon/mvc/micro/collection.zep.h +++ b/ext/phalcon/mvc/micro/collection.zep.h @@ -102,12 +102,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_micro_collection_setp ZEND_ARG_TYPE_INFO(0, prefix, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_collection_addmap, 0, 4, IS_VOID, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_collection_addmap, 0, 3, IS_VOID, 0) ZEND_ARG_INFO(0, method) ZEND_ARG_TYPE_INFO(0, routePattern, IS_STRING, 0) ZEND_ARG_INFO(0, handler) - ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_micro_collection_zephir_init_properties_phalcon_mvc_micro_collection, 0, 0, 0) diff --git a/ext/phalcon/mvc/router.zep.c b/ext/phalcon/mvc/router.zep.c index 6d76279a395..40e1751540e 100644 --- a/ext/phalcon/mvc/router.zep.c +++ b/ext/phalcon/mvc/router.zep.c @@ -64,29 +64,29 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Router) ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Mvc, Router, phalcon, mvc_router, phalcon_di_abstractinjectionaware_ce, phalcon_mvc_router_method_entry, 0); /** - * @var string|null + * @var string */ - zend_declare_property_null(phalcon_mvc_router_ce, SL("action"), ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_mvc_router_ce, SL("action"), "", ZEND_ACC_PROTECTED); /** - * @var string|null + * @var string */ - zend_declare_property_null(phalcon_mvc_router_ce, SL("controller"), ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_mvc_router_ce, SL("controller"), "", ZEND_ACC_PROTECTED); /** - * @var string|null + * @var string */ - zend_declare_property_null(phalcon_mvc_router_ce, SL("defaultAction"), ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_mvc_router_ce, SL("defaultAction"), "", ZEND_ACC_PROTECTED); /** - * @var string|null + * @var string */ - zend_declare_property_null(phalcon_mvc_router_ce, SL("defaultController"), ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_mvc_router_ce, SL("defaultController"), "", ZEND_ACC_PROTECTED); /** * @var string */ zend_declare_property_string(phalcon_mvc_router_ce, SL("defaultModule"), "", ZEND_ACC_PROTECTED); /** - * @var string|null + * @var string */ - zend_declare_property_null(phalcon_mvc_router_ce, SL("defaultNamespace"), ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_mvc_router_ce, SL("defaultNamespace"), "", ZEND_ACC_PROTECTED); /** * @var array */ @@ -112,13 +112,13 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Router) */ zend_declare_property_null(phalcon_mvc_router_ce, SL("matches"), ZEND_ACC_PROTECTED); /** - * @var string|null + * @var string */ - zend_declare_property_null(phalcon_mvc_router_ce, SL("module"), ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_mvc_router_ce, SL("module"), "", ZEND_ACC_PROTECTED); /** - * @var string|null + * @var string */ - zend_declare_property_null(phalcon_mvc_router_ce, SL("namespaceName"), ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_mvc_router_ce, SL("namespaceName"), "", ZEND_ACC_PROTECTED); /** * @var array|string|null */ @@ -2704,6 +2704,7 @@ PHP_METHOD(Phalcon_Mvc_Router, setDefaultNamespace) */ PHP_METHOD(Phalcon_Mvc_Router, setDefaults) { + zval _0$$3; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zval *defaults_param = NULL, namespaceName, module, controller, action, params; zval defaults; @@ -2715,6 +2716,7 @@ PHP_METHOD(Phalcon_Mvc_Router, setDefaults) ZVAL_UNDEF(&controller); ZVAL_UNDEF(&action); ZVAL_UNDEF(¶ms); + ZVAL_UNDEF(&_0$$3); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -2729,7 +2731,8 @@ PHP_METHOD(Phalcon_Mvc_Router, setDefaults) if (zephir_array_isset_string_fetch(&namespaceName, &defaults, SL("namespace"), 1)) { - zephir_update_property_zval(this_ptr, ZEND_STRL("defaultNamespace"), &namespaceName); + zephir_cast_to_string(&_0$$3, &namespaceName); + zephir_update_property_zval(this_ptr, ZEND_STRL("defaultNamespace"), &_0$$3); } if (zephir_array_isset_string_fetch(&module, &defaults, SL("module"), 1)) { zephir_update_property_zval(this_ptr, ZEND_STRL("defaultModule"), &module); diff --git a/ext/phalcon/storage/serializer/base64.zep.c b/ext/phalcon/storage/serializer/base64.zep.c index dacd10156b7..d7a91bfe0eb 100644 --- a/ext/phalcon/storage/serializer/base64.zep.c +++ b/ext/phalcon/storage/serializer/base64.zep.c @@ -68,7 +68,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Base64, serialize) /** * Unserializes data * - * @param string $data + * @param mixed $data * * @retrun void */ @@ -76,34 +76,36 @@ PHP_METHOD(Phalcon_Storage_Serializer_Base64, unserialize) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *data_param = NULL, __$true, __$false, result, _0; - zval data; + zval data_sub, __$true, __$false, result, _0, _1; + zval *data; zval *this_ptr = getThis(); - ZVAL_UNDEF(&data); + ZVAL_UNDEF(&data_sub); ZVAL_BOOL(&__$true, 1); ZVAL_BOOL(&__$false, 0); ZVAL_UNDEF(&result); ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR(data) + Z_PARAM_ZVAL(data) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &data_param); - zephir_get_strval(&data, data_param); + zephir_fetch_params(1, 1, 0, &data); - if (1 != 1) { + ZEPHIR_INIT_VAR(&_0); + zephir_gettype(&_0, data); + if (!ZEPHIR_IS_STRING_IDENTICAL(&_0, "string")) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Data for the unserializer must of type string", "phalcon/Storage/Serializer/Base64.zep", 47); return; } - ZVAL_BOOL(&_0, 1); - ZEPHIR_CALL_METHOD(&result, this_ptr, "phpbase64decode", NULL, 0, &data, &_0); + ZVAL_BOOL(&_1, 1); + ZEPHIR_CALL_METHOD(&result, this_ptr, "phpbase64decode", NULL, 0, data, &_1); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_IS_FALSE_IDENTICAL(&result))) { if (0) { diff --git a/ext/phalcon/storage/serializer/igbinary.zep.c b/ext/phalcon/storage/serializer/igbinary.zep.c index 10bf83e9910..abfab6b9074 100644 --- a/ext/phalcon/storage/serializer/igbinary.zep.c +++ b/ext/phalcon/storage/serializer/igbinary.zep.c @@ -79,7 +79,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, serialize) /** * Unserializes data * - * @param string $data + * @param mixed $data * * @return void */ @@ -88,11 +88,11 @@ PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, unserialize) zend_bool _8$$4; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *data_param = NULL, __$false, __$true, result, version, _0, _1$$4, _2$$4, _3$$4, _4$$5, _5$$5, _6$$6, _7$$6; - zval data; + zval data_sub, __$false, __$true, result, version, _0, _1$$4, _2$$4, _3$$4, _4$$5, _5$$5, _6$$6, _7$$6; + zval *data; zval *this_ptr = getThis(); - ZVAL_UNDEF(&data); + ZVAL_UNDEF(&data_sub); ZVAL_BOOL(&__$false, 0); ZVAL_BOOL(&__$true, 1); ZVAL_UNDEF(&result); @@ -108,20 +108,19 @@ PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, unserialize) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR(data) + Z_PARAM_ZVAL(data) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &data_param); - zephir_get_strval(&data, data_param); + zephir_fetch_params(1, 1, 0, &data); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "isserializable", NULL, 0, &data); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "isserializable", NULL, 0, data); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &data); + zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); } else { ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 127); zephir_check_call_status(); @@ -147,7 +146,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, unserialize) ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 129, &_6$$6, &_7$$6); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&result, this_ptr, "dounserialize", NULL, 0, &data); + ZEPHIR_CALL_METHOD(&result, this_ptr, "dounserialize", NULL, 0, data); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 130); zephir_check_call_status(); diff --git a/ext/phalcon/storage/serializer/json.zep.c b/ext/phalcon/storage/serializer/json.zep.c index 6bc311e9e84..e5ca535eed8 100644 --- a/ext/phalcon/storage/serializer/json.zep.c +++ b/ext/phalcon/storage/serializer/json.zep.c @@ -96,7 +96,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Json, serialize) /** * Unserializes data * - * @param string $data + * @param mixed $data * * @return void */ @@ -104,32 +104,31 @@ PHP_METHOD(Phalcon_Storage_Serializer_Json, unserialize) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *data_param = NULL, _0, _1$$4; - zval data; + zval data_sub, _0, _1$$4; + zval *data; zval *this_ptr = getThis(); - ZVAL_UNDEF(&data); + ZVAL_UNDEF(&data_sub); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1$$4); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR(data) + Z_PARAM_ZVAL(data) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &data_param); - zephir_get_strval(&data, data_param); + zephir_fetch_params(1, 1, 0, &data); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "isserializable", NULL, 0, &data); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "isserializable", NULL, 0, data); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &data); + zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); } else { - ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "getdecode", NULL, 0, &data); + ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "getdecode", NULL, 0, data); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &_1$$4); } diff --git a/ext/phalcon/storage/serializer/none.zep.c b/ext/phalcon/storage/serializer/none.zep.c index 09d7b31f81e..9c7c5160f26 100644 --- a/ext/phalcon/storage/serializer/none.zep.c +++ b/ext/phalcon/storage/serializer/none.zep.c @@ -13,7 +13,6 @@ #include "kernel/main.h" #include "kernel/object.h" -#include "kernel/operators.h" #include "kernel/memory.h" @@ -35,7 +34,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Storage_Serializer_None) /** * Serializes data * - * @return string + * @return mixed */ PHP_METHOD(Phalcon_Storage_Serializer_None, serialize) { @@ -49,32 +48,28 @@ PHP_METHOD(Phalcon_Storage_Serializer_None, serialize) /** * Unserializes data * - * @param string $data + * @param mixed $data * * @retrun void */ PHP_METHOD(Phalcon_Storage_Serializer_None, unserialize) { - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *data_param = NULL; - zval data; + zval data_sub; + zval *data; zval *this_ptr = getThis(); - ZVAL_UNDEF(&data); + ZVAL_UNDEF(&data_sub); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR(data) + Z_PARAM_ZVAL(data) ZEND_PARSE_PARAMETERS_END(); #endif - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &data_param); - zephir_get_strval(&data, data_param); + zephir_fetch_params_without_memory_grow(1, 0, &data); - zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &data); - ZEPHIR_MM_RESTORE(); + zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); } diff --git a/ext/phalcon/storage/serializer/none.zep.h b/ext/phalcon/storage/serializer/none.zep.h index 346fa5e9ee8..8104c8a302c 100644 --- a/ext/phalcon/storage/serializer/none.zep.h +++ b/ext/phalcon/storage/serializer/none.zep.h @@ -6,7 +6,11 @@ ZEPHIR_INIT_CLASS(Phalcon_Storage_Serializer_None); PHP_METHOD(Phalcon_Storage_Serializer_None, serialize); PHP_METHOD(Phalcon_Storage_Serializer_None, unserialize); -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_none_serialize, 0, 0, IS_STRING, 1) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_none_serialize, 0, 0, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_none_serialize, 0, 0, IS_NULL, 0) +#endif ZEND_END_ARG_INFO() #if PHP_VERSION_ID >= 80000 diff --git a/ext/phalcon/storage/serializer/php.zep.c b/ext/phalcon/storage/serializer/php.zep.c index e1d200ce604..1bc9425ed18 100644 --- a/ext/phalcon/storage/serializer/php.zep.c +++ b/ext/phalcon/storage/serializer/php.zep.c @@ -16,8 +16,6 @@ #include "kernel/fcall.h" #include "kernel/object.h" #include "kernel/operators.h" -#include "kernel/exception.h" -#include "ext/spl/spl_exceptions.h" /** @@ -69,95 +67,90 @@ PHP_METHOD(Phalcon_Storage_Serializer_Php, serialize) /** * Unserializes data * - * @param string $data + * @param mixed $data */ PHP_METHOD(Phalcon_Storage_Serializer_Php, unserialize) { - zend_bool _8$$4; + zend_bool _8; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *data_param = NULL, __$false, __$true, result, version, _0, _1$$4, _2$$4, _3$$4, _4$$6, _5$$6, _6$$7, _7$$7; - zval data; + zval data_sub, __$false, __$true, result, version, _0, _1, _2, _3, _4$$4, _5$$4, _6$$5, _7$$5; + zval *data; zval *this_ptr = getThis(); - ZVAL_UNDEF(&data); + ZVAL_UNDEF(&data_sub); ZVAL_BOOL(&__$false, 0); ZVAL_BOOL(&__$true, 1); ZVAL_UNDEF(&result); ZVAL_UNDEF(&version); ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1$$4); - ZVAL_UNDEF(&_2$$4); - ZVAL_UNDEF(&_3$$4); - ZVAL_UNDEF(&_4$$6); - ZVAL_UNDEF(&_5$$6); - ZVAL_UNDEF(&_6$$7); - ZVAL_UNDEF(&_7$$7); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_4$$4); + ZVAL_UNDEF(&_5$$4); + ZVAL_UNDEF(&_6$$5); + ZVAL_UNDEF(&_7$$5); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR(data) + Z_PARAM_ZVAL(data) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &data_param); - zephir_get_strval(&data, data_param); + zephir_fetch_params(1, 1, 0, &data); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "isserializable", NULL, 0, &data); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "isserializable", NULL, 0, data); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &data); - } else { - if (1 != 1) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Data for the unserializer must of type string", "phalcon/Storage/Serializer/Php.zep", 46); - return; - } - ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 127); + zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); + RETURN_MM_NULL(); + } + ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 127); + zephir_check_call_status(); + ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$false); + ZEPHIR_INIT_VAR(&_1); + ZVAL_STRING(&_1, "8.0"); + ZEPHIR_INIT_VAR(&_2); + ZVAL_STRING(&_2, ">="); + ZEPHIR_CALL_FUNCTION(&_3, "version_compare", NULL, 128, &version, &_1, &_2); + zephir_check_call_status(); + if (zephir_is_true(&_3)) { + ZEPHIR_INIT_VAR(&_4$$4); + ZEPHIR_INIT_NVAR(&_4$$4); + zephir_create_closure_ex(&_4$$4, NULL, phalcon_11__closure_ce, SL("__invoke")); + ZVAL_LONG(&_5$$4, 8); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 129, &_4$$4, &_5$$4); zephir_check_call_status(); - ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$false); - ZEPHIR_INIT_VAR(&_1$$4); - ZVAL_STRING(&_1$$4, "8.0"); - ZEPHIR_INIT_VAR(&_2$$4); - ZVAL_STRING(&_2$$4, ">="); - ZEPHIR_CALL_FUNCTION(&_3$$4, "version_compare", NULL, 128, &version, &_1$$4, &_2$$4); + } else { + ZEPHIR_INIT_VAR(&_6$$5); + ZEPHIR_INIT_NVAR(&_6$$5); + zephir_create_closure_ex(&_6$$5, NULL, phalcon_12__closure_ce, SL("__invoke")); + ZVAL_LONG(&_7$$5, 8); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 129, &_6$$5, &_7$$5); zephir_check_call_status(); - if (zephir_is_true(&_3$$4)) { - ZEPHIR_INIT_VAR(&_4$$6); - ZEPHIR_INIT_NVAR(&_4$$6); - zephir_create_closure_ex(&_4$$6, NULL, phalcon_11__closure_ce, SL("__invoke")); - ZVAL_LONG(&_5$$6, 8); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 129, &_4$$6, &_5$$6); - zephir_check_call_status(); + } + ZEPHIR_CALL_METHOD(&result, this_ptr, "phpunserialize", NULL, 0, data); + zephir_check_call_status(); + ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 130); + zephir_check_call_status(); + _8 = ZEPHIR_GLOBAL(warning).enable; + if (!(_8)) { + _8 = ZEPHIR_IS_FALSE_IDENTICAL(&result); + } + if (UNEXPECTED(_8)) { + if (0) { + zephir_update_property_zval(this_ptr, ZEND_STRL("isSuccess"), &__$true); } else { - ZEPHIR_INIT_VAR(&_6$$7); - ZEPHIR_INIT_NVAR(&_6$$7); - zephir_create_closure_ex(&_6$$7, NULL, phalcon_12__closure_ce, SL("__invoke")); - ZVAL_LONG(&_7$$7, 8); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 129, &_6$$7, &_7$$7); - zephir_check_call_status(); - } - ZEPHIR_CALL_METHOD(&result, this_ptr, "phpunserialize", NULL, 0, &data); - zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 130); - zephir_check_call_status(); - _8$$4 = ZEPHIR_GLOBAL(warning).enable; - if (!(_8$$4)) { - _8$$4 = ZEPHIR_IS_FALSE_IDENTICAL(&result); - } - if (UNEXPECTED(_8$$4)) { - if (0) { - zephir_update_property_zval(this_ptr, ZEND_STRL("isSuccess"), &__$true); - } else { - zephir_update_property_zval(this_ptr, ZEND_STRL("isSuccess"), &__$false); - } - ZEPHIR_INIT_NVAR(&result); - ZVAL_STRING(&result, ""); + zephir_update_property_zval(this_ptr, ZEND_STRL("isSuccess"), &__$false); } - zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &result); + ZEPHIR_INIT_NVAR(&result); + ZVAL_STRING(&result, ""); } + zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &result); ZEPHIR_MM_RESTORE(); } @@ -165,7 +158,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Php, unserialize) * @param string $data * @param array $options * - * @return mixed|false + * @return mixed */ PHP_METHOD(Phalcon_Storage_Serializer_Php, phpUnserialize) { diff --git a/ext/phalcon/storage/serializer/php.zep.h b/ext/phalcon/storage/serializer/php.zep.h index 1aadb57bebb..ce6bc2f91f0 100644 --- a/ext/phalcon/storage/serializer/php.zep.h +++ b/ext/phalcon/storage/serializer/php.zep.h @@ -20,7 +20,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_php_u ZEND_END_ARG_INFO() #endif -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_php_phpunserialize, 0, 0, 1) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_php_phpunserialize, 0, 1, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_php_phpunserialize, 0, 1, IS_NULL, 0) +#endif ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0) #if PHP_VERSION_ID >= 80000 ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "[]") From 0f4e69baf1b7c527ae1089c3bf0096cd66fa33be Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 19:35:49 +0100 Subject: [PATCH 74/91] #15598 - Regenerate build/ directory --- build/phalcon/phalcon.zep.c | 13948 +++++++++------------------------- build/phalcon/phalcon.zep.h | 1945 ++--- build/phalcon/php_phalcon.h | 2 +- 3 files changed, 4063 insertions(+), 11832 deletions(-) diff --git a/build/phalcon/phalcon.zep.c b/build/phalcon/phalcon.zep.c index 7e648bb5461..5ee0a2c4aab 100644 --- a/build/phalcon/phalcon.zep.c +++ b/build/phalcon/phalcon.zep.c @@ -3943,7 +3943,7 @@ static void zephir_fast_count(zval *result, zval *value) } } - if (instanceof_function(Z_OBJCE_P(value), spl_ce_Countable)) { + if (instanceof_function(Z_OBJCE_P(value), zend_ce_countable)) { #if PHP_VERSION_ID >= 80000 zend_call_method_with_0_params(Z_OBJ_P(value), NULL, NULL, "count", &retval); #else @@ -3990,7 +3990,7 @@ static int zephir_fast_count_ev(zval *value) return (int) count > 0; } - if (instanceof_function(Z_OBJCE_P(value), spl_ce_Countable)) { + if (instanceof_function(Z_OBJCE_P(value), zend_ce_countable)) { #if PHP_VERSION_ID >= 80000 zend_call_method_with_0_params(Z_OBJ_P(value), NULL, NULL, "count", &retval); #else @@ -4035,7 +4035,7 @@ static int zephir_fast_count_int(zval *value) return (int) count; } - if (instanceof_function(Z_OBJCE_P(value), spl_ce_Countable)) { + if (instanceof_function(Z_OBJCE_P(value), zend_ce_countable)) { #if PHP_VERSION_ID >= 80000 zend_call_method_with_0_params(Z_OBJ_P(value), NULL, NULL, "count", &retval); #else @@ -9114,14 +9114,22 @@ static int zephir_require_ret(zval *return_value_ptr, const char *require_path) } #endif - ret = php_stream_open_for_zend_ex(require_path, &file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE); +#if PHP_VERSION_ID >= 80100 + zend_string *zend_string_path = zend_string_init(require_path, strlen(require_path), 0); + + zend_stream_init_filename_ex(&file_handle, zend_string_path); + ret = php_stream_open_for_zend_ex(&file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE); + + zval_ptr_dtor(zend_string_path); +#else + ret = php_stream_open_for_zend_ex(require_path, &file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE); +#endif if (ret != SUCCESS) { return FAILURE; } new_op_array = zend_compile_file(&file_handle, ZEND_REQUIRE); if (new_op_array) { - if (file_handle.handle.stream.handle) { ZVAL_NULL(&dummy); if (!file_handle.opened_path) { @@ -9176,7 +9184,16 @@ static int zephir_require_once_ret(zval *return_value_ptr, const char *require_p } #endif - ret = php_stream_open_for_zend_ex(require_path, &file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE); +#if PHP_VERSION_ID >= 80100 + zend_string *zend_string_path = zend_string_init(require_path, strlen(require_path), 0); + + zend_stream_init_filename_ex(&file_handle, zend_string_path); + ret = php_stream_open_for_zend_ex(&file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE); + + zval_ptr_dtor(zend_string_path); +#else + ret = php_stream_open_for_zend_ex(require_path, &file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE); +#endif if (ret != SUCCESS) { return FAILURE; } @@ -9272,7 +9289,13 @@ static int zephir_file_exists(zval *filename) return FAILURE; } +#if PHP_VERSION_ID >= 80100 + zend_string *file = zend_string_init(Z_STRVAL_P(filename), Z_STRLEN_P(filename), 0); + php_stat(file, FS_EXISTS, &return_value); + zval_ptr_dtor(file); +#else php_stat(Z_STRVAL_P(filename), (php_stat_len) Z_STRLEN_P(filename), FS_EXISTS, &return_value); +#endif if (Z_TYPE(return_value) != IS_TRUE) { return FAILURE; @@ -9489,7 +9512,13 @@ static void zephir_file_put_contents(zval *return_value, zval *filename, zval *d static void zephir_filemtime(zval *return_value, zval *path) { if (EXPECTED(Z_TYPE_P(path) == IS_STRING)) { +#if PHP_VERSION_ID >= 80100 + zend_string *file = zend_string_init(Z_STRVAL_P(path), Z_STRLEN_P(path), 0); + php_stat(file, FS_MTIME, return_value); + zval_ptr_dtor(file); +#else php_stat(Z_STRVAL_P(path), (php_stat_len)(Z_STRLEN_P(path)), FS_MTIME, return_value); +#endif } else { ZVAL_FALSE(return_value); } @@ -13824,108 +13853,13 @@ ZEPHIR_INIT_CLASS(phalcon_0__closure) static PHP_METHOD(phalcon_0__closure, __invoke) { - zval *number, number_sub, *message, message_sub, *file, file_sub, *line, line_sub, __$true; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&number_sub); - ZVAL_UNDEF(&message_sub); - ZVAL_UNDEF(&file_sub); - ZVAL_UNDEF(&line_sub); - ZVAL_BOOL(&__$true, 1); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(4, 4) - Z_PARAM_ZVAL(number) - Z_PARAM_ZVAL(message) - Z_PARAM_ZVAL(file) - Z_PARAM_ZVAL(line) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - zephir_fetch_params_without_memory_grow(4, 0, &number, &message, &file, &line); - - - ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$true); -} - - - - -#ifdef HAVE_CONFIG_H -#endif - - - - - -ZEPHIR_INIT_CLASS(phalcon_10__closure) -{ - ZEPHIR_REGISTER_CLASS(phalcon, 10__closure, phalcon, 10__closure, phalcon_10__closure_method_entry, ZEND_ACC_FINAL_CLASS); - - return SUCCESS; -} - -static PHP_METHOD(phalcon_10__closure, __invoke) -{ - zend_bool _1; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *element, element_sub, _0, _2; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&element_sub); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_2); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(element) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &element); - - - ZEPHIR_OBS_VAR(&_0); - zephir_array_fetch_long(&_0, element, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 81); - _1 = Z_TYPE_P(&_0) != IS_ARRAY; - if (!(_1)) { - ZEPHIR_OBS_VAR(&_2); - zephir_array_fetch_long(&_2, element, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 81); - _1 = !(zephir_instance_of_ev(&_2, phalcon_filter_validation_abstractcombinedfieldsvalidator_ce)); - } - RETURN_MM_BOOL(_1); -} - - - - -#ifdef HAVE_CONFIG_H -#endif - - - - - -ZEPHIR_INIT_CLASS(phalcon_11__closure) -{ - ZEPHIR_REGISTER_CLASS(phalcon, 11__closure, phalcon, 11__closure, phalcon_11__closure_method_entry, ZEND_ACC_FINAL_CLASS); - - return SUCCESS; -} - -static PHP_METHOD(phalcon_11__closure, __invoke) -{ - zend_bool _1; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *element, element_sub, _0, _2; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *element, element_sub, _0; zval *this_ptr = getThis(); ZVAL_UNDEF(&element_sub); ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_2); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -13938,15 +13872,10 @@ static PHP_METHOD(phalcon_11__closure, __invoke) zephir_fetch_params(1, 1, 0, &element); - ZEPHIR_OBS_VAR(&_0); - zephir_array_fetch_long(&_0, element, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 88); - _1 = Z_TYPE_P(&_0) == IS_ARRAY; - if (_1) { - ZEPHIR_OBS_VAR(&_2); - zephir_array_fetch_long(&_2, element, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 88); - _1 = zephir_instance_of_ev(&_2, phalcon_filter_validation_abstractcombinedfieldsvalidator_ce); - } - RETURN_MM_BOOL(_1); + ZEPHIR_CALL_FUNCTION(&_0, "mb_strtolower", NULL, 10, element); + zephir_check_call_status(); + zephir_ucfirst(return_value, &_0); + RETURN_MM(); } @@ -13959,14 +13888,14 @@ static PHP_METHOD(phalcon_11__closure, __invoke) -ZEPHIR_INIT_CLASS(phalcon_12__closure) +ZEPHIR_INIT_CLASS(phalcon_10__closure) { - ZEPHIR_REGISTER_CLASS(phalcon, 12__closure, phalcon, 12__closure, phalcon_12__closure_method_entry, ZEND_ACC_FINAL_CLASS); + ZEPHIR_REGISTER_CLASS(phalcon, 10__closure, phalcon, 10__closure, phalcon_10__closure_method_entry, ZEND_ACC_FINAL_CLASS); return SUCCESS; } -static PHP_METHOD(phalcon_12__closure, __invoke) +static PHP_METHOD(phalcon_10__closure, __invoke) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zval *action, action_sub, _0; @@ -14002,14 +13931,14 @@ static PHP_METHOD(phalcon_12__closure, __invoke) -ZEPHIR_INIT_CLASS(phalcon_13__closure) +ZEPHIR_INIT_CLASS(phalcon_11__closure) { - ZEPHIR_REGISTER_CLASS(phalcon, 13__closure, phalcon, 13__closure, phalcon_13__closure_method_entry, ZEND_ACC_FINAL_CLASS); + ZEPHIR_REGISTER_CLASS(phalcon, 11__closure, phalcon, 11__closure, phalcon_11__closure_method_entry, ZEND_ACC_FINAL_CLASS); return SUCCESS; } -static PHP_METHOD(phalcon_13__closure, __invoke) +static PHP_METHOD(phalcon_11__closure, __invoke) { zval *number, number_sub, *message, message_sub, *file, file_sub, *line, line_sub, __$true; zval *this_ptr = getThis(); @@ -14046,14 +13975,14 @@ static PHP_METHOD(phalcon_13__closure, __invoke) -ZEPHIR_INIT_CLASS(phalcon_14__closure) +ZEPHIR_INIT_CLASS(phalcon_12__closure) { - ZEPHIR_REGISTER_CLASS(phalcon, 14__closure, phalcon, 14__closure, phalcon_14__closure_method_entry, ZEND_ACC_FINAL_CLASS); + ZEPHIR_REGISTER_CLASS(phalcon, 12__closure, phalcon, 12__closure, phalcon_12__closure_method_entry, ZEND_ACC_FINAL_CLASS); return SUCCESS; } -static PHP_METHOD(phalcon_14__closure, __invoke) +static PHP_METHOD(phalcon_12__closure, __invoke) { zval *number, number_sub, *message, message_sub, *file, file_sub, *line, line_sub, *context, context_sub, __$true; zval *this_ptr = getThis(); @@ -14092,14 +14021,14 @@ static PHP_METHOD(phalcon_14__closure, __invoke) -ZEPHIR_INIT_CLASS(phalcon_15__closure) +ZEPHIR_INIT_CLASS(phalcon_13__closure) { - ZEPHIR_REGISTER_CLASS(phalcon, 15__closure, phalcon, 15__closure, phalcon_15__closure_method_entry, ZEND_ACC_FINAL_CLASS); + ZEPHIR_REGISTER_CLASS(phalcon, 13__closure, phalcon, 13__closure, phalcon_13__closure_method_entry, ZEND_ACC_FINAL_CLASS); return SUCCESS; } -static PHP_METHOD(phalcon_15__closure, __invoke) +static PHP_METHOD(phalcon_13__closure, __invoke) { zend_bool _0; zval *element, element_sub; @@ -14134,14 +14063,14 @@ static PHP_METHOD(phalcon_15__closure, __invoke) -ZEPHIR_INIT_CLASS(phalcon_16__closure) +ZEPHIR_INIT_CLASS(phalcon_14__closure) { - ZEPHIR_REGISTER_CLASS(phalcon, 16__closure, phalcon, 16__closure, phalcon_16__closure_method_entry, ZEND_ACC_FINAL_CLASS); + ZEPHIR_REGISTER_CLASS(phalcon, 14__closure, phalcon, 14__closure, phalcon_14__closure_method_entry, ZEND_ACC_FINAL_CLASS); return SUCCESS; } -static PHP_METHOD(phalcon_16__closure, __invoke) +static PHP_METHOD(phalcon_14__closure, __invoke) { zend_bool _0; zval *element, element_sub; @@ -14185,28 +14114,26 @@ ZEPHIR_INIT_CLASS(phalcon_1__closure) static PHP_METHOD(phalcon_1__closure, __invoke) { - zval *number, number_sub, *message, message_sub, *file, file_sub, *line, line_sub, *context, context_sub, __$true; + zval *number, number_sub, *message, message_sub, *file, file_sub, *line, line_sub, __$true; zval *this_ptr = getThis(); ZVAL_UNDEF(&number_sub); ZVAL_UNDEF(&message_sub); ZVAL_UNDEF(&file_sub); ZVAL_UNDEF(&line_sub); - ZVAL_UNDEF(&context_sub); ZVAL_BOOL(&__$true, 1); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(5, 5) + ZEND_PARSE_PARAMETERS_START(4, 4) Z_PARAM_ZVAL(number) Z_PARAM_ZVAL(message) Z_PARAM_ZVAL(file) Z_PARAM_ZVAL(line) - Z_PARAM_ZVAL(context) ZEND_PARSE_PARAMETERS_END(); #endif - zephir_fetch_params_without_memory_grow(5, 0, &number, &message, &file, &line, &context); + zephir_fetch_params_without_memory_grow(4, 0, &number, &message, &file, &line); ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$true); @@ -14231,29 +14158,31 @@ ZEPHIR_INIT_CLASS(phalcon_2__closure) static PHP_METHOD(phalcon_2__closure, __invoke) { - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *element, element_sub, _0; + zval *number, number_sub, *message, message_sub, *file, file_sub, *line, line_sub, *context, context_sub, __$true; zval *this_ptr = getThis(); - ZVAL_UNDEF(&element_sub); - ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&number_sub); + ZVAL_UNDEF(&message_sub); + ZVAL_UNDEF(&file_sub); + ZVAL_UNDEF(&line_sub); + ZVAL_UNDEF(&context_sub); + ZVAL_BOOL(&__$true, 1); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(element) + ZEND_PARSE_PARAMETERS_START(5, 5) + Z_PARAM_ZVAL(number) + Z_PARAM_ZVAL(message) + Z_PARAM_ZVAL(file) + Z_PARAM_ZVAL(line) + Z_PARAM_ZVAL(context) ZEND_PARSE_PARAMETERS_END(); #endif - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &element); + zephir_fetch_params_without_memory_grow(5, 0, &number, &message, &file, &line, &context); - ZEPHIR_CALL_FUNCTION(&_0, "mb_strtolower", NULL, 10, element); - zephir_check_call_status(); - zephir_ucfirst(return_value, &_0); - RETURN_MM(); + ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$true); } @@ -14455,29 +14384,22 @@ ZEPHIR_INIT_CLASS(phalcon_7__closure) static PHP_METHOD(phalcon_7__closure, __invoke) { - zval *number, number_sub, *message, message_sub, *file, file_sub, *line, line_sub, __$true; + zval *file, file_sub; zval *this_ptr = getThis(); - ZVAL_UNDEF(&number_sub); - ZVAL_UNDEF(&message_sub); ZVAL_UNDEF(&file_sub); - ZVAL_UNDEF(&line_sub); - ZVAL_BOOL(&__$true, 1); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(4, 4) - Z_PARAM_ZVAL(number) - Z_PARAM_ZVAL(message) + ZEND_PARSE_PARAMETERS_START(1, 1) Z_PARAM_ZVAL(file) - Z_PARAM_ZVAL(line) ZEND_PARSE_PARAMETERS_END(); #endif - zephir_fetch_params_without_memory_grow(4, 0, &number, &message, &file, &line); + zephir_fetch_params_without_memory_grow(1, 0, &file); - ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$true); + RETURN_BOOL(1); } @@ -14499,31 +14421,35 @@ ZEPHIR_INIT_CLASS(phalcon_8__closure) static PHP_METHOD(phalcon_8__closure, __invoke) { - zval *number, number_sub, *message, message_sub, *file, file_sub, *line, line_sub, *context, context_sub, __$true; + zend_bool _1; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *element, element_sub, _0, _2; zval *this_ptr = getThis(); - ZVAL_UNDEF(&number_sub); - ZVAL_UNDEF(&message_sub); - ZVAL_UNDEF(&file_sub); - ZVAL_UNDEF(&line_sub); - ZVAL_UNDEF(&context_sub); - ZVAL_BOOL(&__$true, 1); + ZVAL_UNDEF(&element_sub); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_2); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(5, 5) - Z_PARAM_ZVAL(number) - Z_PARAM_ZVAL(message) - Z_PARAM_ZVAL(file) - Z_PARAM_ZVAL(line) - Z_PARAM_ZVAL(context) + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_ZVAL(element) ZEND_PARSE_PARAMETERS_END(); #endif - zephir_fetch_params_without_memory_grow(5, 0, &number, &message, &file, &line, &context); + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &element); - ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$true); + ZEPHIR_OBS_VAR(&_0); + zephir_array_fetch_long(&_0, element, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 81); + _1 = Z_TYPE_P(&_0) != IS_ARRAY; + if (!(_1)) { + ZEPHIR_OBS_VAR(&_2); + zephir_array_fetch_long(&_2, element, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 81); + _1 = !(zephir_instance_of_ev(&_2, phalcon_filter_validation_abstractcombinedfieldsvalidator_ce)); + } + RETURN_MM_BOOL(_1); } @@ -14545,22 +14471,35 @@ ZEPHIR_INIT_CLASS(phalcon_9__closure) static PHP_METHOD(phalcon_9__closure, __invoke) { - zval *file, file_sub; + zend_bool _1; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *element, element_sub, _0, _2; zval *this_ptr = getThis(); - ZVAL_UNDEF(&file_sub); + ZVAL_UNDEF(&element_sub); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_2); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(file) + Z_PARAM_ZVAL(element) ZEND_PARSE_PARAMETERS_END(); #endif - zephir_fetch_params_without_memory_grow(1, 0, &file); + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &element); - RETURN_BOOL(1); + ZEPHIR_OBS_VAR(&_0); + zephir_array_fetch_long(&_0, element, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 88); + _1 = Z_TYPE_P(&_0) == IS_ARRAY; + if (_1) { + ZEPHIR_OBS_VAR(&_2); + zephir_array_fetch_long(&_2, element, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 88); + _1 = zephir_instance_of_ev(&_2, phalcon_filter_validation_abstractcombinedfieldsvalidator_ce); + } + RETURN_MM_BOOL(_1); } @@ -15050,7 +14989,7 @@ static PHP_METHOD(Phalcon_Tag, friendlyTitle) object_init_ex(&_3$$4, phalcon_tag_exception_ce); ZEPHIR_CALL_METHOD(&_4$$4, &ex, "getmessage", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_3$$4, "__construct", NULL, 31, &_4$$4); + ZEPHIR_CALL_METHOD(NULL, &_3$$4, "__construct", NULL, 29, &_4$$4); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$4, "phalcon/Tag.zep", 308); ZEPHIR_MM_RESTORE(); @@ -15350,7 +15289,7 @@ static PHP_METHOD(Phalcon_Tag, getTitle) zephir_read_static_property_ce(&_6$$3, phalcon_tag_ce, SL("documentPrependTitle"), PH_NOISY_CC); ZEPHIR_CPY_WRT(&documentPrependTitle, &_6$$3); if (!(ZEPHIR_IS_EMPTY(&documentPrependTitle))) { - ZEPHIR_CALL_FUNCTION(&tmp$$5, "array_reverse", NULL, 317, &documentPrependTitle); + ZEPHIR_CALL_FUNCTION(&tmp$$5, "array_reverse", NULL, 290, &documentPrependTitle); zephir_check_call_status(); zephir_is_iterable(&tmp$$5, 0, "phalcon/Tag.zep", 443); if (Z_TYPE_P(&tmp$$5) == IS_ARRAY) { @@ -16132,7 +16071,7 @@ static PHP_METHOD(Phalcon_Tag, preload) zephir_fast_str_replace(&_5$$5, &_6$$5, &_7$$5, &href); ZEPHIR_INIT_VAR(&_8$$5); ZVAL_STRING(&_8$$5, "preload"); - ZEPHIR_CALL_METHOD(NULL, &link, "__construct", NULL, 0, &_8$$5, &_5$$5, &attributes); + ZEPHIR_CALL_METHOD(NULL, &link, "__construct", NULL, 494, &_8$$5, &_5$$5, &attributes); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_8$$5); object_init_ex(&_8$$5, phalcon_html_link_serializer_header_ce); @@ -16144,7 +16083,7 @@ static PHP_METHOD(Phalcon_Tag, preload) ZEPHIR_INIT_VAR(&_10$$5); zephir_create_array(&_10$$5, 1, 0); zephir_array_fast_append(&_10$$5, &link); - ZEPHIR_CALL_METHOD(&_9$$5, &_8$$5, "serialize", NULL, 0, &_10$$5); + ZEPHIR_CALL_METHOD(&_9$$5, &_8$$5, "serialize", NULL, 495, &_10$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(&header); ZEPHIR_CONCAT_SV(&header, "Link: ", &_9$$5); @@ -16396,7 +16335,7 @@ static PHP_METHOD(Phalcon_Tag, renderAttributes) zephir_gettype(&_16$$13, &value); ZEPHIR_INIT_NVAR(&_17$$13); ZEPHIR_CONCAT_SVSVS(&_17$$13, "Value at index: '", &key, "' type: '", &_16$$13, "' cannot be rendered"); - ZEPHIR_CALL_METHOD(NULL, &_15$$13, "__construct", &_18, 31, &_17$$13); + ZEPHIR_CALL_METHOD(NULL, &_15$$13, "__construct", &_18, 29, &_17$$13); zephir_check_call_status(); zephir_throw_exception_debug(&_15$$13, "phalcon/Tag.zep", 952); ZEPHIR_MM_RESTORE(); @@ -16442,7 +16381,7 @@ static PHP_METHOD(Phalcon_Tag, renderAttributes) zephir_gettype(&_24$$18, &value); ZEPHIR_INIT_NVAR(&_25$$18); ZEPHIR_CONCAT_SVSVS(&_25$$18, "Value at index: '", &key, "' type: '", &_24$$18, "' cannot be rendered"); - ZEPHIR_CALL_METHOD(NULL, &_23$$18, "__construct", &_18, 31, &_25$$18); + ZEPHIR_CALL_METHOD(NULL, &_23$$18, "__construct", &_18, 29, &_25$$18); zephir_check_call_status(); zephir_throw_exception_debug(&_23$$18, "phalcon/Tag.zep", 952); ZEPHIR_MM_RESTORE(); @@ -17251,7 +17190,7 @@ static PHP_METHOD(Phalcon_Tag, textArea) ZVAL_STRING(&_1, "", &_2, ""); @@ -18116,10 +18055,10 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addComponent) } else { ZEPHIR_INIT_NVAR(&componentObject); object_init_ex(&componentObject, phalcon_acl_component_ce); - ZEPHIR_CALL_METHOD(NULL, &componentObject, "__construct", NULL, 165, componentValue); + ZEPHIR_CALL_METHOD(NULL, &componentObject, "__construct", NULL, 137, componentValue); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&componentName, &componentObject, "getname", NULL, 166); + ZEPHIR_CALL_METHOD(&componentName, &componentObject, "getname", NULL, 138); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("componentsNames"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset(&_1, &componentName))) { @@ -18173,7 +18112,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addComponentAccess) zephir_read_property(&_0, this_ptr, ZEND_STRL("componentsNames"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "Component"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 167, &_0, &componentName, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 139, &_0, &componentName, &_1); zephir_check_call_status(); _2 = Z_TYPE_P(accessList) != IS_ARRAY; if (_2) { @@ -18316,7 +18255,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZVAL_STRING(&_1, "Role"); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "role list"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 167, &_0, &roleName, &_1, &_2); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 139, &_0, &roleName, &_1, &_2); zephir_check_call_status(); zephir_read_property(&_3, this_ptr, ZEND_STRL("roleInherits"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset(&_3, &roleName))) { @@ -18358,7 +18297,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) object_init_ex(&_11$$10, phalcon_acl_exception_ce); ZEPHIR_INIT_NVAR(&_12$$10); ZEPHIR_CONCAT_SVS(&_12$$10, "Role '", &roleInheritName, "' (to inherit) does not exist in the role list"); - ZEPHIR_CALL_METHOD(NULL, &_11$$10, "__construct", &_13, 31, &_12$$10); + ZEPHIR_CALL_METHOD(NULL, &_11$$10, "__construct", &_13, 29, &_12$$10); zephir_check_call_status(); zephir_throw_exception_debug(&_11$$10, "phalcon/Acl/Adapter/Memory.zep", 317); ZEPHIR_MM_RESTORE(); @@ -18380,7 +18319,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_INIT_NVAR(&usedRoleToInherit); ZVAL_COPY(&usedRoleToInherit, _17$$12); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 168, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 140, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -18396,7 +18335,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_CALL_METHOD(&usedRoleToInherit, &_16$$12, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 168, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 140, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_16$$12, "next", NULL, 0); @@ -18411,7 +18350,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) break; } ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(&checkRoleToInherit, "array_shift", &_20, 23, &checkRoleToInherits); + ZEPHIR_CALL_FUNCTION(&checkRoleToInherit, "array_shift", &_20, 21, &checkRoleToInherits); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); if (zephir_array_isset(&usedRoleToInherits, &checkRoleToInherit)) { @@ -18423,7 +18362,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) object_init_ex(&_21$$17, phalcon_acl_exception_ce); ZEPHIR_INIT_NVAR(&_22$$17); ZEPHIR_CONCAT_SVS(&_22$$17, "Role '", &roleInheritName, "' (to inherit) produces an infinite loop"); - ZEPHIR_CALL_METHOD(NULL, &_21$$17, "__construct", &_13, 31, &_22$$17); + ZEPHIR_CALL_METHOD(NULL, &_21$$17, "__construct", &_13, 29, &_22$$17); zephir_check_call_status(); zephir_throw_exception_debug(&_21$$17, "phalcon/Acl/Adapter/Memory.zep", 349); ZEPHIR_MM_RESTORE(); @@ -18440,7 +18379,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_INIT_NVAR(&usedRoleToInherit); ZVAL_COPY(&usedRoleToInherit, _26$$18); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 168, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 140, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -18456,7 +18395,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_CALL_METHOD(&usedRoleToInherit, &_25$$18, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 168, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 140, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_25$$18, "next", NULL, 0); @@ -18501,7 +18440,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) object_init_ex(&_32$$25, phalcon_acl_exception_ce); ZEPHIR_INIT_NVAR(&_33$$25); ZEPHIR_CONCAT_SVS(&_33$$25, "Role '", &roleInheritName, "' (to inherit) does not exist in the role list"); - ZEPHIR_CALL_METHOD(NULL, &_32$$25, "__construct", &_13, 31, &_33$$25); + ZEPHIR_CALL_METHOD(NULL, &_32$$25, "__construct", &_13, 29, &_33$$25); zephir_check_call_status(); zephir_throw_exception_debug(&_32$$25, "phalcon/Acl/Adapter/Memory.zep", 317); ZEPHIR_MM_RESTORE(); @@ -18523,7 +18462,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_INIT_NVAR(&usedRoleToInherit); ZVAL_COPY(&usedRoleToInherit, _37$$27); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 168, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 140, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -18539,7 +18478,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_CALL_METHOD(&usedRoleToInherit, &_36$$27, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 168, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 140, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_36$$27, "next", NULL, 0); @@ -18554,7 +18493,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) break; } ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(&checkRoleToInherit, "array_shift", &_20, 23, &checkRoleToInherits); + ZEPHIR_CALL_FUNCTION(&checkRoleToInherit, "array_shift", &_20, 21, &checkRoleToInherits); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); if (zephir_array_isset(&usedRoleToInherits, &checkRoleToInherit)) { @@ -18566,7 +18505,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) object_init_ex(&_39$$32, phalcon_acl_exception_ce); ZEPHIR_INIT_NVAR(&_40$$32); ZEPHIR_CONCAT_SVS(&_40$$32, "Role '", &roleInheritName, "' (to inherit) produces an infinite loop"); - ZEPHIR_CALL_METHOD(NULL, &_39$$32, "__construct", &_13, 31, &_40$$32); + ZEPHIR_CALL_METHOD(NULL, &_39$$32, "__construct", &_13, 29, &_40$$32); zephir_check_call_status(); zephir_throw_exception_debug(&_39$$32, "phalcon/Acl/Adapter/Memory.zep", 349); ZEPHIR_MM_RESTORE(); @@ -18583,7 +18522,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_INIT_NVAR(&usedRoleToInherit); ZVAL_COPY(&usedRoleToInherit, _44$$33); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 168, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 140, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -18599,7 +18538,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_CALL_METHOD(&usedRoleToInherit, &_43$$33, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 168, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 140, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_43$$33, "next", NULL, 0); @@ -18660,13 +18599,13 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addRole) } else if (Z_TYPE_P(role) == IS_STRING) { ZEPHIR_INIT_NVAR(&roleObject); object_init_ex(&roleObject, phalcon_acl_role_ce); - ZEPHIR_CALL_METHOD(NULL, &roleObject, "__construct", NULL, 169, role); + ZEPHIR_CALL_METHOD(NULL, &roleObject, "__construct", NULL, 141, role); zephir_check_call_status(); } else { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_acl_exception_ce, "Role must be either a string or implement RoleInterface", "phalcon/Acl/Adapter/Memory.zep", 393); return; } - ZEPHIR_CALL_METHOD(&roleName, &roleObject, "getname", NULL, 170); + ZEPHIR_CALL_METHOD(&roleName, &roleObject, "getname", NULL, 142); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("roles"), PH_NOISY_CC | PH_READONLY); if (zephir_array_isset(&_1, &roleName)) { @@ -18741,7 +18680,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, allow) ZEPHIR_INIT_NVAR(&role); ZVAL_COPY(&role, _2); ZVAL_LONG(&_4$$4, 1); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 171, &role, &componentName, access, &_4$$4, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 143, &role, &componentName, access, &_4$$4, func); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -18756,7 +18695,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, allow) ZEPHIR_CALL_METHOD(&role, &rolesArray, "current", NULL, 0); zephir_check_call_status(); ZVAL_LONG(&_6$$5, 1); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 171, &role, &componentName, access, &_6$$5, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 143, &role, &componentName, access, &_6$$5, func); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &rolesArray, "next", NULL, 0); zephir_check_call_status(); @@ -18826,7 +18765,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, deny) ZEPHIR_INIT_NVAR(&role); ZVAL_COPY(&role, _2); ZVAL_LONG(&_4$$4, 0); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 171, &role, &componentName, access, &_4$$4, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 143, &role, &componentName, access, &_4$$4, func); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -18841,7 +18780,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, deny) ZEPHIR_CALL_METHOD(&role, &rolesArray, "current", NULL, 0); zephir_check_call_status(); ZVAL_LONG(&_6$$5, 0); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 171, &role, &componentName, access, &_6$$5, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 143, &role, &componentName, access, &_6$$5, func); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &rolesArray, "next", NULL, 0); zephir_check_call_status(); @@ -19136,7 +19075,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) object_init_ex(&_1$$6, phalcon_acl_exception_ce); ZEPHIR_INIT_VAR(&_2$$6); ZEPHIR_CONCAT_SS(&_2$$6, "Object passed as roleName must implement ", "Phalcon\\Acl\\RoleAwareInterface or Phalcon\\Acl\\RoleInterface"); - ZEPHIR_CALL_METHOD(NULL, &_1$$6, "__construct", NULL, 31, &_2$$6); + ZEPHIR_CALL_METHOD(NULL, &_1$$6, "__construct", NULL, 29, &_2$$6); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$6, "phalcon/Acl/Adapter/Memory.zep", 587); ZEPHIR_MM_RESTORE(); @@ -19157,7 +19096,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) object_init_ex(&_4$$10, phalcon_acl_exception_ce); ZEPHIR_INIT_VAR(&_5$$10); ZEPHIR_CONCAT_SS(&_5$$10, "Object passed as componentName must implement ", "Phalcon\\Acl\\ComponentAwareInterface or Phalcon\\Acl\\ComponentInterface"); - ZEPHIR_CALL_METHOD(NULL, &_4$$10, "__construct", NULL, 31, &_5$$10); + ZEPHIR_CALL_METHOD(NULL, &_4$$10, "__construct", NULL, 29, &_5$$10); zephir_check_call_status(); zephir_throw_exception_debug(&_4$$10, "phalcon/Acl/Adapter/Memory.zep", 601); ZEPHIR_MM_RESTORE(); @@ -19189,7 +19128,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) zephir_read_property(&_9$$12, this_ptr, ZEND_STRL("defaultAccess"), PH_NOISY_CC | PH_READONLY); RETURN_MM_BOOL((ZEPHIR_IS_LONG(&_9$$12, 1))); } - ZEPHIR_CALL_METHOD(&accessKey, this_ptr, "canaccess", NULL, 172, roleName, componentName, &access); + ZEPHIR_CALL_METHOD(&accessKey, this_ptr, "canaccess", NULL, 144, roleName, componentName, &access); zephir_check_call_status(); _10 = Z_TYPE_P(&accessKey) != IS_NULL; if (_10) { @@ -19218,9 +19157,9 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) if (zephir_is_callable(&funcAccess)) { ZEPHIR_INIT_VAR(&reflectionFunction); object_init_ex(&reflectionFunction, zephir_get_internal_ce(SL("reflectionfunction"))); - ZEPHIR_CALL_METHOD(NULL, &reflectionFunction, "__construct", NULL, 173, &funcAccess); + ZEPHIR_CALL_METHOD(NULL, &reflectionFunction, "__construct", NULL, 145, &funcAccess); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&reflectionParameters, &reflectionFunction, "getparameters", NULL, 174); + ZEPHIR_CALL_METHOD(&reflectionParameters, &reflectionFunction, "getparameters", NULL, 146); zephir_check_call_status(); ZEPHIR_INIT_VAR(¶meterNumber); ZVAL_LONG(¶meterNumber, zephir_fast_count_int(&reflectionParameters)); @@ -19236,7 +19175,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) } ZEPHIR_INIT_VAR(¶metersForFunction); array_init(¶metersForFunction); - ZEPHIR_CALL_METHOD(&numberOfRequiredParameters, &reflectionFunction, "getnumberofrequiredparameters", NULL, 175); + ZEPHIR_CALL_METHOD(&numberOfRequiredParameters, &reflectionFunction, "getnumberofrequiredparameters", NULL, 147); zephir_check_call_status(); ZEPHIR_CPY_WRT(&userParametersSizeShouldBe, ¶meterNumber); zephir_is_iterable(&reflectionParameters, 0, "phalcon/Acl/Adapter/Memory.zep", 736); @@ -19306,7 +19245,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_32$$21); ZEPHIR_CONCAT_SSSVSVSVSVSVS(&_32$$21, "Your passed parameter doesn't have the ", "same class as the parameter in defined function ", "when checking if ", roleName, " can ", &access, " ", componentName, ". Class passed: ", &_29$$21, " , Class in defined function: ", &_31$$21, "."); - ZEPHIR_CALL_METHOD(NULL, &_28$$21, "__construct", NULL, 31, &_32$$21); + ZEPHIR_CALL_METHOD(NULL, &_28$$21, "__construct", NULL, 29, &_32$$21); zephir_check_call_status(); zephir_throw_exception_debug(&_28$$21, "phalcon/Acl/Adapter/Memory.zep", 723); ZEPHIR_MM_RESTORE(); @@ -19390,7 +19329,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_49$$27); ZEPHIR_CONCAT_SSSVSVSVSVSVS(&_49$$27, "Your passed parameter doesn't have the ", "same class as the parameter in defined function ", "when checking if ", roleName, " can ", &access, " ", componentName, ". Class passed: ", &_46$$27, " , Class in defined function: ", &_48$$27, "."); - ZEPHIR_CALL_METHOD(NULL, &_45$$27, "__construct", NULL, 31, &_49$$27); + ZEPHIR_CALL_METHOD(NULL, &_45$$27, "__construct", NULL, 29, &_49$$27); zephir_check_call_status(); zephir_throw_exception_debug(&_45$$27, "phalcon/Acl/Adapter/Memory.zep", 723); ZEPHIR_MM_RESTORE(); @@ -19450,7 +19389,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) object_init_ex(&_60$$15, phalcon_acl_exception_ce); ZEPHIR_INIT_VAR(&_61$$15); ZEPHIR_CONCAT_SSVSVSVS(&_61$$15, "You did not provide all necessary parameters for the ", "defined function when checking if '", roleName, "' can '", &access, "' for '", componentName, "'."); - ZEPHIR_CALL_METHOD(NULL, &_60$$15, "__construct", NULL, 31, &_61$$15); + ZEPHIR_CALL_METHOD(NULL, &_60$$15, "__construct", NULL, 29, &_61$$15); zephir_check_call_status(); zephir_throw_exception_debug(&_60$$15, "phalcon/Acl/Adapter/Memory.zep", 777); ZEPHIR_MM_RESTORE(); @@ -19591,12 +19530,12 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, allowOrDeny) zephir_read_property(&_0, this_ptr, ZEND_STRL("roles"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "Role"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 167, &_0, &roleName, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 139, &_0, &roleName, &_1); zephir_check_call_status(); zephir_read_property(&_2, this_ptr, ZEND_STRL("componentsNames"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "Component"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 167, &_2, &componentName, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 139, &_2, &componentName, &_1); zephir_check_call_status(); zephir_read_property(&_3, this_ptr, ZEND_STRL("accessList"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&accessList, &_3); @@ -19614,7 +19553,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, allowOrDeny) object_init_ex(&_6$$5, phalcon_acl_exception_ce); ZEPHIR_INIT_NVAR(&_7$$5); ZEPHIR_CONCAT_SVSVS(&_7$$5, "Access '", &accessName, "' does not exist in component '", &componentName, "'"); - ZEPHIR_CALL_METHOD(NULL, &_6$$5, "__construct", &_8, 31, &_7$$5); + ZEPHIR_CALL_METHOD(NULL, &_6$$5, "__construct", &_8, 29, &_7$$5); zephir_check_call_status(); zephir_throw_exception_debug(&_6$$5, "phalcon/Acl/Adapter/Memory.zep", 829); ZEPHIR_MM_RESTORE(); @@ -19639,7 +19578,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, allowOrDeny) object_init_ex(&_9$$7, phalcon_acl_exception_ce); ZEPHIR_INIT_NVAR(&_10$$7); ZEPHIR_CONCAT_SVSVS(&_10$$7, "Access '", &accessName, "' does not exist in component '", &componentName, "'"); - ZEPHIR_CALL_METHOD(NULL, &_9$$7, "__construct", &_8, 31, &_10$$7); + ZEPHIR_CALL_METHOD(NULL, &_9$$7, "__construct", &_8, 29, &_10$$7); zephir_check_call_status(); zephir_throw_exception_debug(&_9$$7, "phalcon/Acl/Adapter/Memory.zep", 829); ZEPHIR_MM_RESTORE(); @@ -19694,7 +19633,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, allowOrDeny) object_init_ex(&_13$$14, phalcon_acl_exception_ce); ZEPHIR_INIT_VAR(&_14$$14); ZEPHIR_CONCAT_SVSVS(&_14$$14, "Access '", access, "' does not exist in component '", &componentName, "'"); - ZEPHIR_CALL_METHOD(NULL, &_13$$14, "__construct", &_8, 31, &_14$$14); + ZEPHIR_CALL_METHOD(NULL, &_13$$14, "__construct", &_8, 29, &_14$$14); zephir_check_call_status(); zephir_throw_exception_debug(&_13$$14, "phalcon/Acl/Adapter/Memory.zep", 849); ZEPHIR_MM_RESTORE(); @@ -19789,7 +19728,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, canAccess) ZEPHIR_INIT_NVAR(&usedRoleToInherit); ZVAL_COPY(&usedRoleToInherit, _3$$6); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 168, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 140, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -19805,7 +19744,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, canAccess) ZEPHIR_CALL_METHOD(&usedRoleToInherit, &_2$$6, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 168, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 140, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_2$$6, "next", NULL, 0); @@ -19820,7 +19759,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, canAccess) break; } ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(&checkRoleToInherit, "array_shift", &_6, 23, &checkRoleToInherits); + ZEPHIR_CALL_FUNCTION(&checkRoleToInherit, "array_shift", &_6, 21, &checkRoleToInherits); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); if (zephir_array_isset(&usedRoleToInherits, &checkRoleToInherit)) { @@ -19856,7 +19795,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, canAccess) ZEPHIR_INIT_NVAR(&usedRoleToInherit); ZVAL_COPY(&usedRoleToInherit, _13$$14); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 168, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 140, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -19872,7 +19811,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, canAccess) ZEPHIR_CALL_METHOD(&usedRoleToInherit, &_12$$14, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 168, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 140, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_12$$14, "next", NULL, 0); @@ -19931,7 +19870,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, checkExists) object_init_ex(&_0$$3, phalcon_acl_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZEPHIR_CONCAT_VSVSV(&_1$$3, &elementName, " '", &element, "' does not exist in the ", &suffix); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 31, &_1$$3); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 29, &_1$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Acl/Adapter/Memory.zep", 985); ZEPHIR_MM_RESTORE(); @@ -20163,7 +20102,7 @@ static PHP_METHOD(Phalcon_Annotations_Annotation, getExpression) ZEPHIR_INIT_NVAR(&item); ZVAL_COPY(&item, _1$$7); zephir_array_fetch_string(&_3$$8, &item, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Annotations/Annotation.zep", 139); - ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_4, 176, &_3$$8); + ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_4, 148, &_3$$8); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); if (zephir_array_isset_string_fetch(&name, &item, SL("name"), 0)) { @@ -20184,7 +20123,7 @@ static PHP_METHOD(Phalcon_Annotations_Annotation, getExpression) ZEPHIR_CALL_METHOD(&item, &_0$$7, "current", NULL, 0); zephir_check_call_status(); zephir_array_fetch_string(&_5$$11, &item, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Annotations/Annotation.zep", 139); - ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_4, 176, &_5$$11); + ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_4, 148, &_5$$11); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); if (zephir_array_isset_string_fetch(&name, &item, SL("name"), 0)) { @@ -20201,7 +20140,7 @@ static PHP_METHOD(Phalcon_Annotations_Annotation, getExpression) } if (ZEPHIR_IS_LONG(&type, 300)) { object_init_ex(return_value, phalcon_annotations_annotation_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 177, &expr); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 149, &expr); zephir_check_call_status(); RETURN_MM(); } @@ -20209,7 +20148,7 @@ static PHP_METHOD(Phalcon_Annotations_Annotation, getExpression) object_init_ex(&_6$$15, phalcon_annotations_exception_ce); ZEPHIR_INIT_VAR(&_7$$15); ZEPHIR_CONCAT_SVS(&_7$$15, "The expression ", &type, " is unknown"); - ZEPHIR_CALL_METHOD(NULL, &_6$$15, "__construct", NULL, 31, &_7$$15); + ZEPHIR_CALL_METHOD(NULL, &_6$$15, "__construct", NULL, 29, &_7$$15); zephir_check_call_status(); zephir_throw_exception_debug(&_6$$15, "phalcon/Annotations/Annotation.zep", 154); ZEPHIR_MM_RESTORE(); @@ -20467,7 +20406,7 @@ static PHP_METHOD(Phalcon_Annotations_AnnotationsFactory, load) array_init(&_2); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "options"); - ZEPHIR_CALL_METHOD(&options, &_1, "__invoke", NULL, 178, config, &_3, &_2); + ZEPHIR_CALL_METHOD(&options, &_1, "__invoke", NULL, 150, config, &_3, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "newinstance", NULL, 0, &name, &options); zephir_check_call_status(); @@ -20613,7 +20552,7 @@ static PHP_METHOD(Phalcon_Annotations_Collection, __construct) ZVAL_COPY(&annotationData, _0); ZEPHIR_INIT_NVAR(&_2$$3); object_init_ex(&_2$$3, phalcon_annotations_annotation_ce); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", &_3, 177, &annotationData); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", &_3, 149, &annotationData); zephir_check_call_status(); zephir_array_append(&annotations, &_2$$3, PH_SEPARATE, "phalcon/Annotations/Collection.zep", 55); } ZEND_HASH_FOREACH_END(); @@ -20630,7 +20569,7 @@ static PHP_METHOD(Phalcon_Annotations_Collection, __construct) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_4$$4); object_init_ex(&_4$$4, phalcon_annotations_annotation_ce); - ZEPHIR_CALL_METHOD(NULL, &_4$$4, "__construct", &_3, 177, &annotationData); + ZEPHIR_CALL_METHOD(NULL, &_4$$4, "__construct", &_3, 149, &annotationData); zephir_check_call_status(); zephir_array_append(&annotations, &_4$$4, PH_SEPARATE, "phalcon/Annotations/Collection.zep", 55); ZEPHIR_CALL_METHOD(NULL, &reflectionData, "next", NULL, 0); @@ -20743,7 +20682,7 @@ static PHP_METHOD(Phalcon_Annotations_Collection, get) object_init_ex(&_5, phalcon_annotations_exception_ce); ZEPHIR_INIT_VAR(&_6); ZEPHIR_CONCAT_SVS(&_6, "Collection doesn't have an annotation called '", &name, "'"); - ZEPHIR_CALL_METHOD(NULL, &_5, "__construct", NULL, 31, &_6); + ZEPHIR_CALL_METHOD(NULL, &_5, "__construct", NULL, 29, &_6); zephir_check_call_status(); zephir_throw_exception_debug(&_5, "phalcon/Annotations/Collection.zep", 100); ZEPHIR_MM_RESTORE(); @@ -22388,15 +22327,15 @@ static PHP_METHOD(Phalcon_Annotations_Reader, parse) array_init(&annotations); ZEPHIR_INIT_VAR(&reflection); object_init_ex(&reflection, zephir_get_internal_ce(SL("reflectionclass"))); - ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 179, &className); + ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 151, &className); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&comment, &reflection, "getdoccomment", NULL, 180); + ZEPHIR_CALL_METHOD(&comment, &reflection, "getdoccomment", NULL, 152); zephir_check_call_status(); if (Z_TYPE_P(&comment) == IS_STRING) { ZEPHIR_INIT_VAR(&classAnnotations); - ZEPHIR_CALL_METHOD(&_0$$3, &reflection, "getfilename", NULL, 181); + ZEPHIR_CALL_METHOD(&_0$$3, &reflection, "getfilename", NULL, 153); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, &reflection, "getstartline", NULL, 182); + ZEPHIR_CALL_METHOD(&_1$$3, &reflection, "getstartline", NULL, 154); zephir_check_call_status(); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&classAnnotations, &comment, &_0$$3, &_1$$3); zephir_check_call_status(); @@ -22404,7 +22343,7 @@ static PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_array_update_string(&annotations, SL("class"), &classAnnotations, PH_COPY | PH_SEPARATE); } } - ZEPHIR_CALL_METHOD(&properties, &reflection, "getproperties", NULL, 183); + ZEPHIR_CALL_METHOD(&properties, &reflection, "getproperties", NULL, 155); zephir_check_call_status(); if (zephir_fast_count_int(&properties)) { line = 1; @@ -22420,7 +22359,7 @@ static PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_check_call_status(); if (Z_TYPE_P(&comment) == IS_STRING) { ZEPHIR_INIT_NVAR(&propertyAnnotations); - ZEPHIR_CALL_METHOD(&_4$$7, &reflection, "getfilename", NULL, 181); + ZEPHIR_CALL_METHOD(&_4$$7, &reflection, "getfilename", NULL, 153); zephir_check_call_status(); ZVAL_LONG(&_5$$7, line); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&propertyAnnotations, &comment, &_4$$7, &_5$$7); @@ -22447,7 +22386,7 @@ static PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_check_call_status(); if (Z_TYPE_P(&comment) == IS_STRING) { ZEPHIR_INIT_NVAR(&propertyAnnotations); - ZEPHIR_CALL_METHOD(&_7$$10, &reflection, "getfilename", NULL, 181); + ZEPHIR_CALL_METHOD(&_7$$10, &reflection, "getfilename", NULL, 153); zephir_check_call_status(); ZVAL_LONG(&_8$$10, line); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&propertyAnnotations, &comment, &_7$$10, &_8$$10); @@ -22467,7 +22406,7 @@ static PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_array_update_string(&annotations, SL("properties"), &annotationsProperties, PH_COPY | PH_SEPARATE); } } - ZEPHIR_CALL_METHOD(&methods, &reflection, "getmethods", NULL, 184); + ZEPHIR_CALL_METHOD(&methods, &reflection, "getmethods", NULL, 156); zephir_check_call_status(); if (zephir_fast_count_int(&methods)) { ZEPHIR_INIT_VAR(&annotationsMethods); @@ -22677,7 +22616,7 @@ static PHP_METHOD(Phalcon_Annotations_Reflection, getClassAnnotations) if (zephir_array_isset_string_fetch(&reflectionClass, &_1$$3, SL("class"), 1)) { ZEPHIR_INIT_VAR(&_2$$4); object_init_ex(&_2$$4, phalcon_annotations_collection_ce); - ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 48, &reflectionClass); + ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 35, &reflectionClass); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("classAnnotations"), &_2$$4); } else { @@ -22739,7 +22678,7 @@ static PHP_METHOD(Phalcon_Annotations_Reflection, getMethodsAnnotations) ZVAL_COPY(&reflectionMethod, _3$$5); ZEPHIR_INIT_NVAR(&_7$$6); object_init_ex(&_7$$6, phalcon_annotations_collection_ce); - ZEPHIR_CALL_METHOD(NULL, &_7$$6, "__construct", &_8, 48, &reflectionMethod); + ZEPHIR_CALL_METHOD(NULL, &_7$$6, "__construct", &_8, 35, &reflectionMethod); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("methodAnnotations"), &methodName, &_7$$6); } ZEND_HASH_FOREACH_END(); @@ -22758,7 +22697,7 @@ static PHP_METHOD(Phalcon_Annotations_Reflection, getMethodsAnnotations) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_9$$7); object_init_ex(&_9$$7, phalcon_annotations_collection_ce); - ZEPHIR_CALL_METHOD(NULL, &_9$$7, "__construct", &_8, 48, &reflectionMethod); + ZEPHIR_CALL_METHOD(NULL, &_9$$7, "__construct", &_8, 35, &reflectionMethod); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("methodAnnotations"), &methodName, &_9$$7); ZEPHIR_CALL_METHOD(NULL, &reflectionMethods, "next", NULL, 0); @@ -22827,7 +22766,7 @@ static PHP_METHOD(Phalcon_Annotations_Reflection, getPropertiesAnnotations) ZVAL_COPY(&reflectionProperty, _3$$5); ZEPHIR_INIT_NVAR(&_7$$6); object_init_ex(&_7$$6, phalcon_annotations_collection_ce); - ZEPHIR_CALL_METHOD(NULL, &_7$$6, "__construct", &_8, 48, &reflectionProperty); + ZEPHIR_CALL_METHOD(NULL, &_7$$6, "__construct", &_8, 35, &reflectionProperty); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("propertyAnnotations"), &property, &_7$$6); } ZEND_HASH_FOREACH_END(); @@ -22846,7 +22785,7 @@ static PHP_METHOD(Phalcon_Annotations_Reflection, getPropertiesAnnotations) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_9$$7); object_init_ex(&_9$$7, phalcon_annotations_collection_ce); - ZEPHIR_CALL_METHOD(NULL, &_9$$7, "__construct", &_8, 48, &reflectionProperty); + ZEPHIR_CALL_METHOD(NULL, &_9$$7, "__construct", &_8, 35, &reflectionProperty); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("propertyAnnotations"), &property, &_9$$7); ZEPHIR_CALL_METHOD(NULL, &reflectionProperties, "next", NULL, 0); @@ -23850,7 +23789,7 @@ static PHP_METHOD(Phalcon_Annotations_Adapter_AbstractAdapter, get) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&classAnnotations); object_init_ex(&classAnnotations, phalcon_annotations_reflection_ce); - ZEPHIR_CALL_METHOD(NULL, &classAnnotations, "__construct", NULL, 46, &parsedAnnotations); + ZEPHIR_CALL_METHOD(NULL, &classAnnotations, "__construct", NULL, 33, &parsedAnnotations); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("annotations"), &realClassName, &classAnnotations); ZEPHIR_CALL_METHOD(NULL, this_ptr, "write", NULL, 0, &realClassName, &classAnnotations); @@ -23911,7 +23850,7 @@ static PHP_METHOD(Phalcon_Annotations_Adapter_AbstractAdapter, getMethod) } ZEPHIR_INIT_NVAR(&method); ZVAL_COPY(&method, _0$$3); - ZEPHIR_CALL_FUNCTION(&_4$$4, "strcasecmp", &_5, 47, &methodKey, &methodName); + ZEPHIR_CALL_FUNCTION(&_4$$4, "strcasecmp", &_5, 34, &methodKey, &methodName); zephir_check_call_status(); if (!(zephir_is_true(&_4$$4))) { RETURN_CCTOR(&method); @@ -23930,7 +23869,7 @@ static PHP_METHOD(Phalcon_Annotations_Adapter_AbstractAdapter, getMethod) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&method, &methods, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_6$$6, "strcasecmp", &_5, 47, &methodKey, &methodName); + ZEPHIR_CALL_FUNCTION(&_6$$6, "strcasecmp", &_5, 34, &methodKey, &methodName); zephir_check_call_status(); if (!(zephir_is_true(&_6$$6))) { RETURN_CCTOR(&method); @@ -23943,7 +23882,7 @@ static PHP_METHOD(Phalcon_Annotations_Adapter_AbstractAdapter, getMethod) ZEPHIR_INIT_NVAR(&methodKey); } object_init_ex(return_value, phalcon_annotations_collection_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 48); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 35); zephir_check_call_status(); RETURN_MM(); } @@ -24012,7 +23951,7 @@ static PHP_METHOD(Phalcon_Annotations_Adapter_AbstractAdapter, getProperty) zephir_check_call_status(); if (!(zephir_array_isset_fetch(&property, &properties, &propertyName, 1))) { object_init_ex(return_value, phalcon_annotations_collection_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 48); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 35); zephir_check_call_status(); RETURN_MM(); } @@ -24240,7 +24179,7 @@ static PHP_METHOD(Phalcon_Annotations_Adapter_Apcu, read) ZEPHIR_INIT_VAR(&_2); ZEPHIR_CONCAT_SVV(&_2, "_PHAN", &_1, &key); zephir_fast_strtolower(&_0, &_2); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_fetch", NULL, 135, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_fetch", NULL, 102, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -24287,7 +24226,7 @@ static PHP_METHOD(Phalcon_Annotations_Adapter_Apcu, write) ZEPHIR_CONCAT_SVV(&_2, "_PHAN", &_1, &key); zephir_fast_strtolower(&_0, &_2); zephir_read_property(&_3, this_ptr, ZEND_STRL("ttl"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_store", NULL, 136, &_0, data, &_3); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_store", NULL, 103, &_0, data, &_3); zephir_check_call_status(); RETURN_MM(); } @@ -24496,33 +24435,33 @@ static PHP_METHOD(Phalcon_Annotations_Adapter_Stream, read) RETURN_MM_BOOL(0); } ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$false); - ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 87); + ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 127); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); ZVAL_STRING(&_4, "8.0"); ZEPHIR_INIT_VAR(&_5); ZVAL_STRING(&_5, ">="); - ZEPHIR_CALL_FUNCTION(&_6, "version_compare", NULL, 88, &version, &_4, &_5); + ZEPHIR_CALL_FUNCTION(&_6, "version_compare", NULL, 128, &version, &_4, &_5); zephir_check_call_status(); if (zephir_is_true(&_6)) { ZEPHIR_INIT_VAR(&_7$$5); ZEPHIR_INIT_NVAR(&_7$$5); - zephir_create_closure_ex(&_7$$5, NULL, phalcon_7__closure_ce, SL("__invoke")); + zephir_create_closure_ex(&_7$$5, NULL, phalcon_5__closure_ce, SL("__invoke")); ZVAL_LONG(&_8$$5, 2); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 89, &_7$$5, &_8$$5); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 129, &_7$$5, &_8$$5); zephir_check_call_status(); } else { ZEPHIR_INIT_VAR(&_9$$6); ZEPHIR_INIT_NVAR(&_9$$6); - zephir_create_closure_ex(&_9$$6, NULL, phalcon_8__closure_ce, SL("__invoke")); + zephir_create_closure_ex(&_9$$6, NULL, phalcon_6__closure_ce, SL("__invoke")); ZVAL_LONG(&_10$$6, 2); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 89, &_9$$6, &_10$$6); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 129, &_9$$6, &_10$$6); zephir_check_call_status(); } ZEPHIR_CALL_FUNCTION(&_11, "unserialize", NULL, 16, &contents); zephir_check_call_status(); ZEPHIR_CPY_WRT(&contents, &_11); - ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 91); + ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 130); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_GLOBAL(warning).enable)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_RuntimeException, "Cannot read annotation data", "phalcon/Annotations/Adapter/Stream.zep", 102); @@ -24604,7 +24543,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Application_AbstractApplication) ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Application, AbstractApplication, phalcon, application_abstractapplication, phalcon_di_injectable_ce, phalcon_application_abstractapplication_method_entry, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); zend_declare_property_null(phalcon_application_abstractapplication_ce, SL("container"), ZEND_ACC_PROTECTED); - zend_declare_property_null(phalcon_application_abstractapplication_ce, SL("defaultModule"), ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_application_abstractapplication_ce, SL("defaultModule"), "", ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_application_abstractapplication_ce, SL("eventsManager"), ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_application_abstractapplication_ce, SL("modules"), ZEND_ACC_PROTECTED); phalcon_application_abstractapplication_ce->create_object = zephir_init_properties_Phalcon_Application_AbstractApplication; @@ -24700,7 +24639,7 @@ static PHP_METHOD(Phalcon_Application_AbstractApplication, getModule) object_init_ex(&_1$$3, phalcon_application_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZEPHIR_CONCAT_SVS(&_2$$3, "Module '", &name, "' is not registered in the application container"); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 31, &_2$$3); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_2$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Application/AbstractApplication.zep", 83); ZEPHIR_MM_RESTORE(); @@ -25052,7 +24991,7 @@ static PHP_METHOD(Phalcon_Assets_Asset, getAssetKey) ZEPHIR_CONCAT_VSV(&key, &_0, ":", &_1); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "sha256"); - ZEPHIR_RETURN_CALL_FUNCTION("hash", NULL, 99, &_2, &key); + ZEPHIR_RETURN_CALL_FUNCTION("hash", NULL, 68, &_2, &key); zephir_check_call_status(); RETURN_MM(); } @@ -25102,7 +25041,7 @@ static PHP_METHOD(Phalcon_Assets_Asset, getContent) ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "sourcePath"); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkpath", NULL, 100, &_1); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkpath", NULL, 69, &_1); zephir_check_call_status(); ZEPHIR_INIT_VAR(&completePath); ZEPHIR_CONCAT_VV(&completePath, &basePath, &_0); @@ -25114,13 +25053,13 @@ static PHP_METHOD(Phalcon_Assets_Asset, getContent) _3 = !ZEPHIR_IS_TRUE_IDENTICAL(&_4); } if (_3) { - ZEPHIR_CALL_METHOD(NULL, this_ptr, "throwexception", NULL, 101, &completePath); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "throwexception", NULL, 70, &completePath); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&content, this_ptr, "phpfilegetcontents", NULL, 0, &completePath); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&content)) { - ZEPHIR_CALL_METHOD(NULL, this_ptr, "throwexception", NULL, 101, &completePath); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "throwexception", NULL, 70, &completePath); zephir_check_call_status(); } RETURN_CCTOR(&content); @@ -25161,13 +25100,13 @@ static PHP_METHOD(Phalcon_Assets_Asset, getRealSourcePath) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "sourcePath"); - ZEPHIR_CALL_METHOD(&source, this_ptr, "checkpath", NULL, 100, &_0); + ZEPHIR_CALL_METHOD(&source, this_ptr, "checkpath", NULL, 69, &_0); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("isLocal"), PH_NOISY_CC | PH_READONLY); if (zephir_is_true(&_1)) { ZEPHIR_INIT_VAR(&_2$$3); ZEPHIR_CONCAT_VV(&_2$$3, &basePath, &source); - ZEPHIR_CALL_FUNCTION(&_3$$3, "realpath", NULL, 102, &_2$$3); + ZEPHIR_CALL_FUNCTION(&_3$$3, "realpath", NULL, 71, &_2$$3); zephir_check_call_status(); zephir_cast_to_string(&_4$$3, &_3$$3); ZEPHIR_CPY_WRT(&source, &_4$$3); @@ -25210,7 +25149,7 @@ static PHP_METHOD(Phalcon_Assets_Asset, getRealTargetPath) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "targetPath"); - ZEPHIR_CALL_METHOD(&target, this_ptr, "checkpath", NULL, 100, &_0); + ZEPHIR_CALL_METHOD(&target, this_ptr, "checkpath", NULL, 69, &_0); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("isLocal"), PH_NOISY_CC | PH_READONLY); if (zephir_is_true(&_1)) { @@ -25219,7 +25158,7 @@ static PHP_METHOD(Phalcon_Assets_Asset, getRealTargetPath) ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "phpfileexists", NULL, 0, &completePath); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_2$$3)) { - ZEPHIR_CALL_FUNCTION(&_3$$4, "realpath", NULL, 102, &completePath); + ZEPHIR_CALL_FUNCTION(&_3$$4, "realpath", NULL, 71, &completePath); zephir_check_call_status(); ZEPHIR_CPY_WRT(&completePath, &_3$$4); if (ZEPHIR_IS_FALSE_IDENTICAL(&completePath)) { @@ -25255,7 +25194,7 @@ static PHP_METHOD(Phalcon_Assets_Asset, getRealTargetUri) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "targetUri"); - ZEPHIR_CALL_METHOD(&target, this_ptr, "checkpath", NULL, 100, &_0); + ZEPHIR_CALL_METHOD(&target, this_ptr, "checkpath", NULL, 69, &_0); zephir_check_call_status(); ZEPHIR_OBS_VAR(&ver); zephir_read_property(&ver, this_ptr, ZEND_STRL("version"), PH_NOISY_CC); @@ -25625,7 +25564,7 @@ static PHP_METHOD(Phalcon_Assets_Asset, throwException) object_init_ex(&_0, phalcon_assets_exception_ce); ZEPHIR_INIT_VAR(&_1); ZEPHIR_CONCAT_SVS(&_1, "Asset's content for '", &completePath, "' cannot be read"); - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 31, &_1); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 29, &_1); zephir_check_call_status(); zephir_throw_exception_debug(&_0, "phalcon/Assets/Asset.zep", 441); ZEPHIR_MM_RESTORE(); @@ -25858,7 +25797,7 @@ static PHP_METHOD(Phalcon_Assets_Collection, add) zephir_fetch_params(1, 1, 0, &asset); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 185, asset); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 157, asset); zephir_check_call_status(); RETURN_THIS(); } @@ -25937,7 +25876,7 @@ static PHP_METHOD(Phalcon_Assets_Collection, addCss) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processadd", NULL, 186, &_0, &path, isLocal, &_1, &attributes, &version, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processadd", NULL, 158, &_0, &path, isLocal, &_1, &attributes, &version, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -25983,7 +25922,7 @@ static PHP_METHOD(Phalcon_Assets_Collection, addInline) zephir_fetch_params(1, 1, 0, &code); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 185, code); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 157, code); zephir_check_call_status(); RETURN_THIS(); } @@ -26036,7 +25975,7 @@ static PHP_METHOD(Phalcon_Assets_Collection, addInlineCss) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 187, &_0, &content, &_1, &attributes); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 159, &_0, &content, &_1, &attributes); zephir_check_call_status(); RETURN_MM(); } @@ -26089,7 +26028,7 @@ static PHP_METHOD(Phalcon_Assets_Collection, addInlineJs) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 187, &_0, &content, &_1, &attributes); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 159, &_0, &content, &_1, &attributes); zephir_check_call_status(); RETURN_MM(); } @@ -26168,7 +26107,7 @@ static PHP_METHOD(Phalcon_Assets_Collection, addJs) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processadd", NULL, 186, &_0, &path, isLocal, &_1, &attributes, &version, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processadd", NULL, 158, &_0, &path, isLocal, &_1, &attributes, &version, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -26241,7 +26180,7 @@ static PHP_METHOD(Phalcon_Assets_Collection, getRealTargetPath) ZEPHIR_INIT_VAR(&completePath); ZEPHIR_CONCAT_VV(&completePath, &basePath, &_0); if (1 == (zephir_file_exists(&completePath) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("realpath", NULL, 102, &completePath); + ZEPHIR_RETURN_CALL_FUNCTION("realpath", NULL, 71, &completePath); zephir_check_call_status(); RETURN_MM(); } @@ -26731,7 +26670,7 @@ static PHP_METHOD(Phalcon_Assets_Collection, processAdd) ZEPHIR_CPY_WRT(&name, &_0); ZEPHIR_OBS_VAR(&flag); zephir_read_property(&flag, this_ptr, ZEND_STRL("isLocal"), PH_NOISY_CC); - ZEPHIR_CALL_METHOD(&attrs, this_ptr, "processattributes", NULL, 188, &attributes); + ZEPHIR_CALL_METHOD(&attrs, this_ptr, "processattributes", NULL, 160, &attributes); zephir_check_call_status(); if (Z_TYPE_P(isLocal) != IS_NULL) { ZEPHIR_INIT_NVAR(&flag); @@ -26817,7 +26756,7 @@ static PHP_METHOD(Phalcon_Assets_Collection, processAddInline) ZEPHIR_INIT_VAR(&_0); ZEPHIR_CONCAT_SV(&_0, "Phalcon\\Assets\\Inline\\", &className); ZEPHIR_CPY_WRT(&name, &_0); - ZEPHIR_CALL_METHOD(&attrs, this_ptr, "processattributes", NULL, 188, &attributes); + ZEPHIR_CALL_METHOD(&attrs, this_ptr, "processattributes", NULL, 160, &attributes); zephir_check_call_status(); ZEPHIR_INIT_VAR(&asset); zephir_fetch_safe_class(&_1, &name); @@ -27091,7 +27030,7 @@ static PHP_METHOD(Phalcon_Assets_Inline, getAssetKey) ZEPHIR_CONCAT_VSV(&key, &_0, ":", &_1); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "sha256"); - ZEPHIR_RETURN_CALL_FUNCTION("hash", NULL, 99, &_2, &key); + ZEPHIR_RETURN_CALL_FUNCTION("hash", NULL, 68, &_2, &key); zephir_check_call_status(); RETURN_MM(); } @@ -27292,7 +27231,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, addAssetByType) } - ZEPHIR_CALL_METHOD(&collection, this_ptr, "checkandcreatecollection", NULL, 189, &type); + ZEPHIR_CALL_METHOD(&collection, this_ptr, "checkandcreatecollection", NULL, 161, &type); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &collection, "add", NULL, 0, asset); zephir_check_call_status(); @@ -27387,7 +27326,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, addCss) } else { ZVAL_BOOL(&_3, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 190, &path, &_1, &_2, &attributes, &version, &_3); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 162, &path, &_1, &_2, &attributes, &version, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); ZVAL_STRING(&_4, "css"); @@ -27457,7 +27396,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, addInlineCodeByType) } - ZEPHIR_CALL_METHOD(&collection, this_ptr, "checkandcreatecollection", NULL, 189, &type); + ZEPHIR_CALL_METHOD(&collection, this_ptr, "checkandcreatecollection", NULL, 161, &type); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &collection, "addinline", NULL, 0, code); zephir_check_call_status(); @@ -27513,7 +27452,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, addInlineCss) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 191, &content, &_1, &attributes); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 163, &content, &_1, &attributes); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "css"); @@ -27571,7 +27510,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, addInlineJs) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 192, &content, &_1, &attributes); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 164, &content, &_1, &attributes); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "js"); @@ -27668,7 +27607,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, addJs) } else { ZVAL_BOOL(&_3, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 193, &path, &_1, &_2, &attributes, &version, &_3); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 165, &path, &_1, &_2, &attributes, &version, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); ZVAL_STRING(&_4, "js"); @@ -27699,7 +27638,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, collection) zephir_get_strval(&name, name_param); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 189, &name); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 161, &name); zephir_check_call_status(); RETURN_MM(); } @@ -27882,7 +27821,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, getCss) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "css"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 189, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 161, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -27901,7 +27840,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, getJs) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "js"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 189, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 161, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -28121,20 +28060,20 @@ static PHP_METHOD(Phalcon_Assets_Manager, output) object_init_ex(&_3$$9, phalcon_assets_exception_ce); ZEPHIR_INIT_VAR(&_4$$9); ZEPHIR_CONCAT_SVS(&_4$$9, "Path '", &completeTargetPath, "' is not a valid target path (1)"); - ZEPHIR_CALL_METHOD(NULL, &_3$$9, "__construct", NULL, 31, &_4$$9); + ZEPHIR_CALL_METHOD(NULL, &_3$$9, "__construct", NULL, 29, &_4$$9); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$9, "phalcon/Assets/Manager.zep", 462); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_FUNCTION(&_5$$8, "is_dir", NULL, 160, &completeTargetPath); + ZEPHIR_CALL_FUNCTION(&_5$$8, "is_dir", NULL, 131, &completeTargetPath); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_5$$8)) { ZEPHIR_INIT_VAR(&_6$$10); object_init_ex(&_6$$10, phalcon_assets_exception_ce); ZEPHIR_INIT_VAR(&_7$$10); ZEPHIR_CONCAT_SVS(&_7$$10, "Path '", &completeTargetPath, "' is not a valid target path (2), it is a directory."); - ZEPHIR_CALL_METHOD(NULL, &_6$$10, "__construct", NULL, 31, &_7$$10); + ZEPHIR_CALL_METHOD(NULL, &_6$$10, "__construct", NULL, 29, &_7$$10); zephir_check_call_status(); zephir_throw_exception_debug(&_6$$10, "phalcon/Assets/Manager.zep", 468); ZEPHIR_MM_RESTORE(); @@ -28165,7 +28104,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, output) object_init_ex(&_11$$14, phalcon_assets_exception_ce); ZEPHIR_INIT_NVAR(&_12$$14); ZEPHIR_CONCAT_SVS(&_12$$14, "Asset '", &sourcePath, "' does not have a valid source path"); - ZEPHIR_CALL_METHOD(NULL, &_11$$14, "__construct", NULL, 31, &_12$$14); + ZEPHIR_CALL_METHOD(NULL, &_11$$14, "__construct", NULL, 29, &_12$$14); zephir_check_call_status(); zephir_throw_exception_debug(&_11$$14, "phalcon/Assets/Manager.zep", 498); ZEPHIR_MM_RESTORE(); @@ -28179,7 +28118,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, output) object_init_ex(&_13$$15, phalcon_assets_exception_ce); ZEPHIR_INIT_NVAR(&_14$$15); ZEPHIR_CONCAT_SVS(&_14$$15, "Asset '", &sourcePath, "' does not have a valid target path"); - ZEPHIR_CALL_METHOD(NULL, &_13$$15, "__construct", NULL, 31, &_14$$15); + ZEPHIR_CALL_METHOD(NULL, &_13$$15, "__construct", NULL, 29, &_14$$15); zephir_check_call_status(); zephir_throw_exception_debug(&_13$$15, "phalcon/Assets/Manager.zep", 514); ZEPHIR_MM_RESTORE(); @@ -28193,7 +28132,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, output) object_init_ex(&_16$$17, phalcon_assets_exception_ce); ZEPHIR_INIT_NVAR(&_17$$17); ZEPHIR_CONCAT_SVS(&_17$$17, "Asset '", &targetPath, "' have the same source and target paths"); - ZEPHIR_CALL_METHOD(NULL, &_16$$17, "__construct", NULL, 31, &_17$$17); + ZEPHIR_CALL_METHOD(NULL, &_16$$17, "__construct", NULL, 29, &_17$$17); zephir_check_call_status(); zephir_throw_exception_debug(&_16$$17, "phalcon/Assets/Manager.zep", 524); ZEPHIR_MM_RESTORE(); @@ -28216,13 +28155,13 @@ static PHP_METHOD(Phalcon_Assets_Manager, output) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_21$$21, &asset, "getrealsourcepath", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 194, collection, &_20$$21, &_21$$21); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 166, collection, &_20$$21, &_21$$21); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_23$$21, &asset, "getattributes", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_24$$21, &asset, "islocal", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 195, &callback, &_23$$21, &prefixedPath, &_24$$21); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 167, &callback, &_23$$21, &prefixedPath, &_24$$21); zephir_check_call_status(); zephir_read_property(&_26$$21, this_ptr, ZEND_STRL("implicitOutput"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_26$$21)) { @@ -28299,12 +28238,12 @@ static PHP_METHOD(Phalcon_Assets_Manager, output) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_31$$36, &asset, "getrealsourcepath", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 194, collection, &_30$$36, &_31$$36); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 166, collection, &_30$$36, &_31$$36); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_32$$36, collection, "getattributes", &_33, 0); zephir_check_call_status(); ZVAL_BOOL(&_34$$36, 1); - ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 195, &callback, &_32$$36, &prefixedPath, &_34$$36); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 167, &callback, &_32$$36, &prefixedPath, &_34$$36); zephir_check_call_status(); zephir_read_property(&_34$$36, this_ptr, ZEND_STRL("implicitOutput"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_34$$36)) { @@ -28342,7 +28281,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, output) object_init_ex(&_36$$42, phalcon_assets_exception_ce); ZEPHIR_INIT_NVAR(&_37$$42); ZEPHIR_CONCAT_SVS(&_37$$42, "Asset '", &sourcePath, "' does not have a valid source path"); - ZEPHIR_CALL_METHOD(NULL, &_36$$42, "__construct", NULL, 31, &_37$$42); + ZEPHIR_CALL_METHOD(NULL, &_36$$42, "__construct", NULL, 29, &_37$$42); zephir_check_call_status(); zephir_throw_exception_debug(&_36$$42, "phalcon/Assets/Manager.zep", 498); ZEPHIR_MM_RESTORE(); @@ -28356,7 +28295,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, output) object_init_ex(&_38$$43, phalcon_assets_exception_ce); ZEPHIR_INIT_NVAR(&_39$$43); ZEPHIR_CONCAT_SVS(&_39$$43, "Asset '", &sourcePath, "' does not have a valid target path"); - ZEPHIR_CALL_METHOD(NULL, &_38$$43, "__construct", NULL, 31, &_39$$43); + ZEPHIR_CALL_METHOD(NULL, &_38$$43, "__construct", NULL, 29, &_39$$43); zephir_check_call_status(); zephir_throw_exception_debug(&_38$$43, "phalcon/Assets/Manager.zep", 514); ZEPHIR_MM_RESTORE(); @@ -28370,7 +28309,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, output) object_init_ex(&_41$$45, phalcon_assets_exception_ce); ZEPHIR_INIT_NVAR(&_42$$45); ZEPHIR_CONCAT_SVS(&_42$$45, "Asset '", &targetPath, "' have the same source and target paths"); - ZEPHIR_CALL_METHOD(NULL, &_41$$45, "__construct", NULL, 31, &_42$$45); + ZEPHIR_CALL_METHOD(NULL, &_41$$45, "__construct", NULL, 29, &_42$$45); zephir_check_call_status(); zephir_throw_exception_debug(&_41$$45, "phalcon/Assets/Manager.zep", 524); ZEPHIR_MM_RESTORE(); @@ -28393,13 +28332,13 @@ static PHP_METHOD(Phalcon_Assets_Manager, output) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_46$$49, &asset, "getrealsourcepath", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 194, collection, &_45$$49, &_46$$49); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 166, collection, &_45$$49, &_46$$49); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_47$$49, &asset, "getattributes", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_48$$49, &asset, "islocal", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 195, &callback, &_47$$49, &prefixedPath, &_48$$49); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 167, &callback, &_47$$49, &prefixedPath, &_48$$49); zephir_check_call_status(); zephir_read_property(&_49$$49, this_ptr, ZEND_STRL("implicitOutput"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_49$$49)) { @@ -28476,12 +28415,12 @@ static PHP_METHOD(Phalcon_Assets_Manager, output) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_54$$64, &asset, "getrealsourcepath", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 194, collection, &_53$$64, &_54$$64); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 166, collection, &_53$$64, &_54$$64); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_55$$64, collection, "getattributes", &_33, 0); zephir_check_call_status(); ZVAL_BOOL(&_56$$64, 1); - ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 195, &callback, &_55$$64, &prefixedPath, &_56$$64); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 167, &callback, &_55$$64, &prefixedPath, &_56$$64); zephir_check_call_status(); zephir_read_property(&_56$$64, this_ptr, ZEND_STRL("implicitOutput"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_56$$64)) { @@ -28503,13 +28442,13 @@ static PHP_METHOD(Phalcon_Assets_Manager, output) zephir_file_put_contents(NULL, &completeTargetPath, &filteredJoinedContent); ZEPHIR_CALL_METHOD(&_58$$67, collection, "gettargeturi", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 194, collection, &_58$$67, &completeTargetPath); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 166, collection, &_58$$67, &completeTargetPath); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_59$$67, collection, "getattributes", &_33, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_60$$67, collection, "gettargetislocal", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 195, &callback, &_59$$67, &prefixedPath, &_60$$67); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 167, &callback, &_59$$67, &prefixedPath, &_60$$67); zephir_check_call_status(); zephir_read_property(&_61$$67, this_ptr, ZEND_STRL("implicitOutput"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_61$$67)) { @@ -28629,7 +28568,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, outputInline) ZEPHIR_CALL_METHOD(&join, collection, "getjoin", NULL, 0); zephir_check_call_status(); if (1 != ZEPHIR_IS_EMPTY(&codes)) { - zephir_is_iterable(&codes, 0, "phalcon/Assets/Manager.zep", 770); + zephir_is_iterable(&codes, 0, "phalcon/Assets/Manager.zep", 769); if (Z_TYPE_P(&codes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&codes), _0$$3) { @@ -28639,14 +28578,14 @@ static PHP_METHOD(Phalcon_Assets_Manager, outputInline) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&content, &code, "getcontent", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&filters, 0, "phalcon/Assets/Manager.zep", 758); + zephir_is_iterable(&filters, 0, "phalcon/Assets/Manager.zep", 757); if (Z_TYPE_P(&filters) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&filters), _2$$4) { ZEPHIR_INIT_NVAR(&filter); ZVAL_COPY(&filter, _2$$4); if (Z_TYPE_P(&filter) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_assets_exception_ce, "The filter is not valid", "phalcon/Assets/Manager.zep", 748); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_assets_exception_ce, "The filter is not valid", "phalcon/Assets/Manager.zep", 747); return; } ZEPHIR_CALL_METHOD(&_4$$5, &filter, "filter", NULL, 0, &content); @@ -28665,7 +28604,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, outputInline) ZEPHIR_CALL_METHOD(&filter, &filters, "current", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&filter) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_assets_exception_ce, "The filter is not valid", "phalcon/Assets/Manager.zep", 748); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_assets_exception_ce, "The filter is not valid", "phalcon/Assets/Manager.zep", 747); return; } ZEPHIR_CALL_METHOD(&_5$$7, &filter, "filter", NULL, 0, &content); @@ -28705,14 +28644,14 @@ static PHP_METHOD(Phalcon_Assets_Manager, outputInline) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&content, &code, "getcontent", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&filters, 0, "phalcon/Assets/Manager.zep", 758); + zephir_is_iterable(&filters, 0, "phalcon/Assets/Manager.zep", 757); if (Z_TYPE_P(&filters) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&filters), _11$$11) { ZEPHIR_INIT_NVAR(&filter); ZVAL_COPY(&filter, _11$$11); if (Z_TYPE_P(&filter) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_assets_exception_ce, "The filter is not valid", "phalcon/Assets/Manager.zep", 748); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_assets_exception_ce, "The filter is not valid", "phalcon/Assets/Manager.zep", 747); return; } ZEPHIR_CALL_METHOD(&_13$$12, &filter, "filter", NULL, 0, &content); @@ -28731,7 +28670,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, outputInline) ZEPHIR_CALL_METHOD(&filter, &filters, "current", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&filter) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_assets_exception_ce, "The filter is not valid", "phalcon/Assets/Manager.zep", 748); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_assets_exception_ce, "The filter is not valid", "phalcon/Assets/Manager.zep", 747); return; } ZEPHIR_CALL_METHOD(&_14$$14, &filter, "filter", NULL, 0, &content); @@ -29103,7 +29042,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, checkAndCreateCollection) zephir_update_property_array(this_ptr, SL("collections"), &type, &_1$$3); } zephir_read_property(&_2, this_ptr, ZEND_STRL("collections"), PH_NOISY_CC | PH_READONLY); - zephir_array_fetch(&_3, &_2, &type, PH_NOISY | PH_READONLY, "phalcon/Assets/Manager.zep", 934); + zephir_array_fetch(&_3, &_2, &type, PH_NOISY | PH_READONLY, "phalcon/Assets/Manager.zep", 933); RETURN_CTOR(&_3); } @@ -29155,7 +29094,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, cssLink) ZVAL_STRING(&_2, "text/css"); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "href"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processparameters", NULL, 196, parameters, &_0, &_1, &_2, &_3); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processparameters", NULL, 168, parameters, &_0, &_1, &_2, &_3); zephir_check_call_status(); RETURN_MM(); } @@ -29207,7 +29146,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, doCallback) } ZEPHIR_INIT_VAR(&_1); ZVAL_BOOL(&_1, local); - zephir_array_append(¶meters, &_1, PH_SEPARATE, "phalcon/Assets/Manager.zep", 982); + zephir_array_append(¶meters, &_1, PH_SEPARATE, "phalcon/Assets/Manager.zep", 981); ZEPHIR_CALL_USER_FUNC_ARRAY(return_value, callback, ¶meters); zephir_check_call_status(); RETURN_MM(); @@ -29261,7 +29200,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, jsLink) ZVAL_STRING(&_2, "application/javascript"); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "src"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processparameters", NULL, 196, parameters, &_0, &_1, &_2, &_3); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processparameters", NULL, 168, parameters, &_0, &_1, &_2, &_3); zephir_check_call_status(); RETURN_MM(); } @@ -29328,13 +29267,13 @@ static PHP_METHOD(Phalcon_Assets_Manager, processParameters) } if (1 == zephir_array_isset_long(¶ms, 1)) { ZEPHIR_OBS_VAR(&_2$$4); - zephir_array_fetch_long(&_2$$4, ¶ms, 1, PH_NOISY, "phalcon/Assets/Manager.zep", 1026); + zephir_array_fetch_long(&_2$$4, ¶ms, 1, PH_NOISY, "phalcon/Assets/Manager.zep", 1025); local = zephir_get_boolval(&_2$$4); zephir_array_unset_long(¶ms, 1, PH_SEPARATE); } else { if (1 == zephir_array_isset_string(¶ms, SL("local"))) { ZEPHIR_OBS_VAR(&_3$$6); - zephir_array_fetch_string(&_3$$6, ¶ms, SL("local"), PH_NOISY, "phalcon/Assets/Manager.zep", 1030); + zephir_array_fetch_string(&_3$$6, ¶ms, SL("local"), PH_NOISY, "phalcon/Assets/Manager.zep", 1029); local = zephir_get_boolval(&_3$$6); zephir_array_unset_string(¶ms, SL("local"), PH_SEPARATE); } @@ -29354,13 +29293,13 @@ static PHP_METHOD(Phalcon_Assets_Manager, processParameters) ZVAL_STRING(&_6$$9, ""); zephir_array_update_zval(¶ms, &name, &_6$$9, PH_COPY | PH_SEPARATE); if (1 == zephir_array_isset_long(¶ms, 0)) { - zephir_array_fetch_long(&_7$$10, ¶ms, 0, PH_NOISY | PH_READONLY, "phalcon/Assets/Manager.zep", 1050); + zephir_array_fetch_long(&_7$$10, ¶ms, 0, PH_NOISY | PH_READONLY, "phalcon/Assets/Manager.zep", 1049); zephir_array_update_zval(¶ms, &name, &_7$$10, PH_COPY | PH_SEPARATE); zephir_array_unset_long(¶ms, 0, PH_SEPARATE); } } ZEPHIR_OBS_VAR(&tag); - zephir_array_fetch(&tag, ¶ms, &name, PH_NOISY, "phalcon/Assets/Manager.zep", 1055); + zephir_array_fetch(&tag, ¶ms, &name, PH_NOISY, "phalcon/Assets/Manager.zep", 1054); zephir_array_unset(¶ms, &name, PH_SEPARATE); if (local) { ZEPHIR_INIT_VAR(&_8$$11); @@ -30024,7 +29963,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, __construct) ZVAL_STRING(&_0, "sha256"); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "php"); - ZEPHIR_CALL_FUNCTION(&_2, "hash", NULL, 99, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "hash", NULL, 68, &_0, &_1); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "php"); @@ -30091,7 +30030,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, addDirectory) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "sha256"); - ZEPHIR_CALL_FUNCTION(&_1, "hash", NULL, 99, &_0, &directory); + ZEPHIR_CALL_FUNCTION(&_1, "hash", NULL, 68, &_0, &directory); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("directories"), &_1, &directory); RETURN_THIS(); @@ -30123,7 +30062,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, addExtension) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "sha256"); - ZEPHIR_CALL_FUNCTION(&_1, "hash", NULL, 99, &_0, &extension); + ZEPHIR_CALL_FUNCTION(&_1, "hash", NULL, 68, &_0, &extension); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("extensions"), &_1, &extension); RETURN_THIS(); @@ -30155,7 +30094,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, addFile) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "sha256"); - ZEPHIR_CALL_FUNCTION(&_1, "hash", NULL, 99, &_0, &file); + ZEPHIR_CALL_FUNCTION(&_1, "hash", NULL, 68, &_0, &file); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("files"), &_1, &file); RETURN_THIS(); @@ -30217,7 +30156,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, addNamespace) ZEPHIR_INIT_VAR(&_1); ZEPHIR_CONCAT_VV(&_1, &_0, &nsSeparator); ZEPHIR_CPY_WRT(&nsName, &_1); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkdirectories", NULL, 197, directories, &dirSeparator); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkdirectories", NULL, 169, directories, &dirSeparator); zephir_check_call_status(); ZEPHIR_CPY_WRT(directories, &_2); zephir_read_property(&_3, this_ptr, ZEND_STRL("namespaces"), PH_NOISY_CC | PH_READONLY); @@ -30242,7 +30181,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, addNamespace) } ZEPHIR_INIT_VAR(&_7); zephir_fast_array_merge(&_7, &source, &target); - ZEPHIR_CALL_FUNCTION(&_2, "array_unique", NULL, 198, &_7); + ZEPHIR_CALL_FUNCTION(&_2, "array_unique", NULL, 170, &_7); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("namespaces"), &nsName, &_2); RETURN_THIS(); @@ -30286,40 +30225,40 @@ static PHP_METHOD(Phalcon_Autoload_Loader, autoload) zephir_update_property_zval(this_ptr, ZEND_STRL("debug"), &_0); ZEPHIR_INIT_VAR(&_1); ZEPHIR_CONCAT_SV(&_1, "Loading: ", &className); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 199, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 171, &_1); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "loader:beforeCheckClass"); ZEPHIR_CALL_METHOD(NULL, this_ptr, "firemanagerevent", NULL, 0, &_2, &className); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "autoloadcheckclasses", NULL, 200, &className); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "autoloadcheckclasses", NULL, 172, &className); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_3)) { RETURN_MM_BOOL(1); } ZEPHIR_INIT_VAR(&_4); ZEPHIR_CONCAT_SV(&_4, "Class: 404: ", &className); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 199, &_4); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 171, &_4); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_5, this_ptr, "autoloadchecknamespaces", NULL, 201, &className); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "autoloadchecknamespaces", NULL, 173, &className); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_5)) { RETURN_MM_BOOL(1); } ZEPHIR_INIT_VAR(&_6); ZEPHIR_CONCAT_SV(&_6, "Namespace: 404: ", &className); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 199, &_6); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 171, &_6); zephir_check_call_status(); zephir_read_property(&_8, this_ptr, ZEND_STRL("directories"), PH_NOISY_CC | PH_READONLY); ZVAL_BOOL(&_9, 1); - ZEPHIR_CALL_METHOD(&_7, this_ptr, "autoloadcheckdirectories", NULL, 202, &_8, &className, &_9); + ZEPHIR_CALL_METHOD(&_7, this_ptr, "autoloadcheckdirectories", NULL, 174, &_8, &className, &_9); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_7)) { RETURN_MM_BOOL(1); } ZEPHIR_INIT_VAR(&_10); ZEPHIR_CONCAT_SV(&_10, "Directories: 404: ", &className); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 199, &_10); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 171, &_10); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "loader:afterCheckClass"); @@ -30520,7 +30459,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, register) ZVAL_STRING(&_2$$3, "autoload"); zephir_array_fast_append(&_1$$3, &_2$$3); ZVAL_BOOL(&_3$$3, (prepend ? 1 : 0)); - ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_register", NULL, 203, &_1$$3, &__$true, &_3$$3); + ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_register", NULL, 175, &_1$$3, &__$true, &_3$$3); zephir_check_call_status(); if (1) { zephir_update_property_zval(this_ptr, ZEND_STRL("isRegistered"), &__$true); @@ -30654,7 +30593,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, setDirectories) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 204, &directories, &_0, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 176, &directories, &_0, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -30704,7 +30643,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, setExtensions) ZVAL_STRING(&_1$$3, "sha256"); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "php"); - ZEPHIR_CALL_FUNCTION(&_3$$3, "hash", NULL, 99, &_1$$3, &_2$$3); + ZEPHIR_CALL_FUNCTION(&_3$$3, "hash", NULL, 68, &_1$$3, &_2$$3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_1$$3); ZVAL_STRING(&_1$$3, "php"); @@ -30771,7 +30710,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, setFileCheckingCallback) } else if (Z_TYPE_P(method) == IS_NULL) { ZEPHIR_INIT_VAR(&_0$$4); ZEPHIR_INIT_NVAR(&_0$$4); - zephir_create_closure_ex(&_0$$4, NULL, phalcon_9__closure_ce, SL("__invoke")); + zephir_create_closure_ex(&_0$$4, NULL, phalcon_7__closure_ce, SL("__invoke")); zephir_update_property_zval(this_ptr, ZEND_STRL("fileCheckingCallback"), &_0$$4); } else { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_autoload_exception_ce, "The 'method' parameter must be either a callable or NULL", "phalcon/Autoload/Loader.zep", 453); @@ -30822,7 +30761,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, setFiles) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 204, &files, &_0, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 176, &files, &_0, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -30886,7 +30825,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, setNamespaces) } ZEPHIR_INIT_NVAR(&directories); ZVAL_COPY(&directories, _1); - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "checkdirectories", &_6, 197, &directories, &dirSeparator); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "checkdirectories", &_6, 169, &directories, &dirSeparator); zephir_check_call_status(); ZEPHIR_CPY_WRT(&directories, &_5$$4); ZEPHIR_CALL_METHOD(NULL, this_ptr, "addnamespace", &_7, 0, &name, &directories); @@ -30905,7 +30844,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, setNamespaces) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&directories, &namespaces, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_8$$5, this_ptr, "checkdirectories", &_6, 197, &directories, &dirSeparator); + ZEPHIR_CALL_METHOD(&_8$$5, this_ptr, "checkdirectories", &_6, 169, &directories, &dirSeparator); zephir_check_call_status(); ZEPHIR_CPY_WRT(&directories, &_8$$5); ZEPHIR_CALL_METHOD(NULL, this_ptr, "addnamespace", &_7, 0, &name, &directories); @@ -30944,7 +30883,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, unregister) ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "autoload"); zephir_array_fast_append(&_1$$3, &_2$$3); - ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_unregister", NULL, 205, &_1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_unregister", NULL, 177, &_1$$3); zephir_check_call_status(); if (0) { zephir_update_property_zval(this_ptr, ZEND_STRL("isRegistered"), &__$true); @@ -30983,7 +30922,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, requireFile) zephir_read_property(&_0, this_ptr, ZEND_STRL("fileCheckingCallback"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_1, "call_user_func", NULL, 206, &_0, &file); + ZEPHIR_CALL_FUNCTION(&_1, "call_user_func", NULL, 178, &_0, &file); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&_1)) { ZEPHIR_INIT_VAR(&_2$$3); @@ -30992,7 +30931,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, requireFile) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3$$3); ZEPHIR_CONCAT_SV(&_3$$3, "Require: ", &file); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 199, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 171, &_3$$3); zephir_check_call_status(); if (zephir_require_once_zval(&file) == FAILURE) { RETURN_MM_NULL(); @@ -31001,7 +30940,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, requireFile) } ZEPHIR_INIT_VAR(&_4); ZEPHIR_CONCAT_SV(&_4, "Require: 404: ", &file); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 199, &_4); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 171, &_4); zephir_check_call_status(); RETURN_MM_BOOL(0); } @@ -31150,7 +31089,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckClasses) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3$$3); ZEPHIR_CONCAT_SV(&_3$$3, "Class: load: ", &filePath); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 199, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 171, &_3$$3); zephir_check_call_status(); RETURN_MM_BOOL(1); } @@ -31255,7 +31194,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckDirectories) if (isDirectory) { ZEPHIR_INIT_NVAR(&_11$$6); ZEPHIR_CONCAT_SV(&_11$$6, "Directories: ", &filePath); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 199, &_11$$6); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 171, &_11$$6); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -31285,7 +31224,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckDirectories) if (isDirectory) { ZEPHIR_INIT_NVAR(&_15$$9); ZEPHIR_CONCAT_SV(&_15$$9, "Directories: ", &filePath); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 199, &_15$$9); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 171, &_15$$9); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -31330,7 +31269,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckDirectories) if (isDirectory) { ZEPHIR_INIT_NVAR(&_21$$13); ZEPHIR_CONCAT_SV(&_21$$13, "Directories: ", &filePath); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 199, &_21$$13); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 171, &_21$$13); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -31360,7 +31299,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckDirectories) if (isDirectory) { ZEPHIR_INIT_NVAR(&_24$$16); ZEPHIR_CONCAT_SV(&_24$$16, "Directories: ", &filePath); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 199, &_24$$16); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 171, &_24$$16); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -31449,13 +31388,13 @@ static PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckNamespaces) ZVAL_LONG(&_7$$3, zephir_fast_strlen_ev(&prefix)); ZEPHIR_INIT_NVAR(&fileName); zephir_substr(&fileName, &className, zephir_get_intval(&_7$$3), 0, ZEPHIR_SUBSTR_NO_LENGTH); - ZEPHIR_CALL_METHOD(&_8$$3, this_ptr, "autoloadcheckdirectories", &_9, 202, &directories, &fileName); + ZEPHIR_CALL_METHOD(&_8$$3, this_ptr, "autoloadcheckdirectories", &_9, 174, &directories, &fileName); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_8$$3)) { zephir_read_property(&_10$$5, this_ptr, ZEND_STRL("checkedPath"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_11$$5); ZEPHIR_CONCAT_SVSV(&_11$$5, "Namespace: ", &prefix, " - ", &_10$$5); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 199, &_11$$5); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 171, &_11$$5); zephir_check_call_status(); RETURN_MM_BOOL(1); } @@ -31484,13 +31423,13 @@ static PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckNamespaces) ZVAL_LONG(&_15$$6, zephir_fast_strlen_ev(&prefix)); ZEPHIR_INIT_NVAR(&fileName); zephir_substr(&fileName, &className, zephir_get_intval(&_15$$6), 0, ZEPHIR_SUBSTR_NO_LENGTH); - ZEPHIR_CALL_METHOD(&_16$$6, this_ptr, "autoloadcheckdirectories", &_9, 202, &directories, &fileName); + ZEPHIR_CALL_METHOD(&_16$$6, this_ptr, "autoloadcheckdirectories", &_9, 174, &directories, &fileName); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_16$$6)) { zephir_read_property(&_17$$8, this_ptr, ZEND_STRL("checkedPath"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_18$$8); ZEPHIR_CONCAT_SVSV(&_18$$8, "Namespace: ", &prefix, " - ", &_17$$8); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 199, &_18$$8); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 171, &_18$$8); zephir_check_call_status(); RETURN_MM_BOOL(1); } @@ -31572,7 +31511,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, checkDirectories) ZEPHIR_CPY_WRT(&directory, &_5$$5); ZEPHIR_INIT_NVAR(&_6$$5); ZVAL_STRING(&_6$$5, "sha256"); - ZEPHIR_CALL_FUNCTION(&_7$$5, "hash", &_8, 99, &_6$$5, &directory); + ZEPHIR_CALL_FUNCTION(&_7$$5, "hash", &_8, 68, &_6$$5, &directory); zephir_check_call_status(); zephir_array_update_zval(&results, &_7$$5, &directory, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -31594,7 +31533,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, checkDirectories) ZEPHIR_CPY_WRT(&directory, &_10$$6); ZEPHIR_INIT_NVAR(&_11$$6); ZVAL_STRING(&_11$$6, "sha256"); - ZEPHIR_CALL_FUNCTION(&_12$$6, "hash", &_8, 99, &_11$$6, &directory); + ZEPHIR_CALL_FUNCTION(&_12$$6, "hash", &_8, 68, &_11$$6, &directory); zephir_check_call_status(); zephir_array_update_zval(&results, &_12$$6, &directory, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, directories, "next", NULL, 0); @@ -31906,7 +31845,7 @@ static PHP_METHOD(Phalcon_Cache_AbstractCache, doDeleteMultiple) ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkkeys", NULL, 0, keys); zephir_check_call_status(); result = 1; - zephir_is_iterable(keys, 0, "phalcon/Cache/AbstractCache.zep", 144); + zephir_is_iterable(keys, 0, "phalcon/Cache/AbstractCache.zep", 135); if (Z_TYPE_P(keys) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(keys), _0) { @@ -32021,7 +31960,7 @@ static PHP_METHOD(Phalcon_Cache_AbstractCache, doGetMultiple) zephir_check_call_status(); ZEPHIR_INIT_VAR(&results); array_init(&results); - zephir_is_iterable(keys, 0, "phalcon/Cache/AbstractCache.zep", 191); + zephir_is_iterable(keys, 0, "phalcon/Cache/AbstractCache.zep", 171); if (Z_TYPE_P(keys) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(keys), _0) { @@ -32165,7 +32104,7 @@ static PHP_METHOD(Phalcon_Cache_AbstractCache, doSetMultiple) ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkkeys", NULL, 0, values); zephir_check_call_status(); result = 1; - zephir_is_iterable(values, 0, "phalcon/Cache/AbstractCache.zep", 266); + zephir_is_iterable(values, 0, "phalcon/Cache/AbstractCache.zep", 232); if (Z_TYPE_P(values) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(values), _2, _3, _0) { @@ -32735,7 +32674,7 @@ static PHP_METHOD(Phalcon_Cache_CacheFactory, newInstance) ZEPHIR_CALL_METHOD(&adapter, &_0, "newinstance", NULL, 0, &name, &options); zephir_check_call_status(); object_init_ex(return_value, phalcon_cache_cache_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 207, &adapter); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 179, &adapter); zephir_check_call_status(); RETURN_MM(); } @@ -33057,7 +32996,7 @@ static PHP_METHOD(Phalcon_Cli_Console, handle) object_init_ex(&_10$$12, phalcon_cli_console_exception_ce); ZEPHIR_INIT_VAR(&_11$$12); ZEPHIR_CONCAT_SVS(&_11$$12, "Module '", &moduleName, "' isn't registered in the console container"); - ZEPHIR_CALL_METHOD(NULL, &_10$$12, "__construct", NULL, 31, &_11$$12); + ZEPHIR_CALL_METHOD(NULL, &_10$$12, "__construct", NULL, 29, &_11$$12); zephir_check_call_status(); zephir_throw_exception_debug(&_10$$12, "phalcon/Cli/Console.zep", 91); ZEPHIR_MM_RESTORE(); @@ -33081,7 +33020,7 @@ static PHP_METHOD(Phalcon_Cli_Console, handle) object_init_ex(&_12$$16, phalcon_cli_console_exception_ce); ZEPHIR_INIT_VAR(&_13$$16); ZEPHIR_CONCAT_SVS(&_13$$16, "Module definition path '", &path, "' doesn't exist"); - ZEPHIR_CALL_METHOD(NULL, &_12$$16, "__construct", NULL, 31, &_13$$16); + ZEPHIR_CALL_METHOD(NULL, &_12$$16, "__construct", NULL, 29, &_13$$16); zephir_check_call_status(); zephir_throw_exception_debug(&_12$$16, "phalcon/Cli/Console.zep", 108); ZEPHIR_MM_RESTORE(); @@ -33264,7 +33203,7 @@ static PHP_METHOD(Phalcon_Cli_Console, setArgument) } if (_0) { ZEPHIR_MAKE_REF(&arguments); - ZEPHIR_CALL_FUNCTION(NULL, "array_shift", NULL, 23, &arguments); + ZEPHIR_CALL_FUNCTION(NULL, "array_shift", NULL, 21, &arguments); ZEPHIR_UNREF(&arguments); zephir_check_call_status(); } @@ -33278,7 +33217,7 @@ static PHP_METHOD(Phalcon_Cli_Console, setArgument) ZEPHIR_INIT_NVAR(&_3$$5); ZVAL_STRING(&_3$$5, "--"); ZVAL_LONG(&_4$$5, 2); - ZEPHIR_CALL_FUNCTION(&_5$$5, "strncmp", &_6, 208, &arg, &_3$$5, &_4$$5); + ZEPHIR_CALL_FUNCTION(&_5$$5, "strncmp", &_6, 180, &arg, &_3$$5, &_4$$5); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_5$$5, 0)) { ZEPHIR_INIT_NVAR(&_7$$6); @@ -33310,7 +33249,7 @@ static PHP_METHOD(Phalcon_Cli_Console, setArgument) ZEPHIR_INIT_NVAR(&_18$$9); ZVAL_STRING(&_18$$9, "-"); ZVAL_LONG(&_19$$9, 1); - ZEPHIR_CALL_FUNCTION(&_20$$9, "strncmp", &_6, 208, &arg, &_18$$9, &_19$$9); + ZEPHIR_CALL_FUNCTION(&_20$$9, "strncmp", &_6, 180, &arg, &_18$$9, &_19$$9); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_20$$9, 0)) { ZVAL_LONG(&_21$$10, 1); @@ -33340,7 +33279,7 @@ static PHP_METHOD(Phalcon_Cli_Console, setArgument) ZEPHIR_INIT_NVAR(&_23$$14); ZVAL_STRING(&_23$$14, "--"); ZVAL_LONG(&_24$$14, 2); - ZEPHIR_CALL_FUNCTION(&_25$$14, "strncmp", &_6, 208, &arg, &_23$$14, &_24$$14); + ZEPHIR_CALL_FUNCTION(&_25$$14, "strncmp", &_6, 180, &arg, &_23$$14, &_24$$14); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_25$$14, 0)) { ZEPHIR_INIT_NVAR(&_26$$15); @@ -33372,7 +33311,7 @@ static PHP_METHOD(Phalcon_Cli_Console, setArgument) ZEPHIR_INIT_NVAR(&_37$$18); ZVAL_STRING(&_37$$18, "-"); ZVAL_LONG(&_38$$18, 1); - ZEPHIR_CALL_FUNCTION(&_39$$18, "strncmp", &_6, 208, &arg, &_37$$18, &_38$$18); + ZEPHIR_CALL_FUNCTION(&_39$$18, "strncmp", &_6, 180, &arg, &_37$$18, &_38$$18); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_39$$18, 0)) { ZVAL_LONG(&_40$$19, 1); @@ -33400,14 +33339,14 @@ static PHP_METHOD(Phalcon_Cli_Console, setArgument) } else { if (zephir_fast_count_int(&args)) { ZEPHIR_MAKE_REF(&args); - ZEPHIR_CALL_FUNCTION(&_45$$24, "array_shift", NULL, 23, &args); + ZEPHIR_CALL_FUNCTION(&_45$$24, "array_shift", NULL, 21, &args); ZEPHIR_UNREF(&args); zephir_check_call_status(); zephir_array_update_string(&handleArgs, SL("task"), &_45$$24, PH_COPY | PH_SEPARATE); } if (zephir_fast_count_int(&args)) { ZEPHIR_MAKE_REF(&args); - ZEPHIR_CALL_FUNCTION(&_46$$25, "array_shift", NULL, 23, &args); + ZEPHIR_CALL_FUNCTION(&_46$$25, "array_shift", NULL, 21, &args); ZEPHIR_UNREF(&args); zephir_check_call_status(); zephir_array_update_string(&handleArgs, SL("action"), &_46$$25, PH_COPY | PH_SEPARATE); @@ -33853,7 +33792,7 @@ static PHP_METHOD(Phalcon_Cli_Dispatcher, throwDispatchException) ZEPHIR_INIT_VAR(&exception); object_init_ex(&exception, phalcon_cli_dispatcher_exception_ce); ZVAL_LONG(&_0, exceptionCode); - ZEPHIR_CALL_METHOD(NULL, &exception, "__construct", NULL, 31, &message, &_0); + ZEPHIR_CALL_METHOD(NULL, &exception, "__construct", NULL, 29, &message, &_0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_1, this_ptr, "handleexception", NULL, 0, &exception); zephir_check_call_status(); @@ -33964,12 +33903,12 @@ ZEPHIR_INIT_CLASS(Phalcon_Cli_Router) zend_declare_property_null(phalcon_cli_router_ce, SL("action"), ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_cli_router_ce, SL("defaultAction"), ZEND_ACC_PROTECTED); - zend_declare_property_null(phalcon_cli_router_ce, SL("defaultModule"), ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_cli_router_ce, SL("defaultModule"), "", ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_cli_router_ce, SL("defaultParams"), ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_cli_router_ce, SL("defaultTask"), ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_cli_router_ce, SL("matchedRoute"), ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_cli_router_ce, SL("matches"), ZEND_ACC_PROTECTED); - zend_declare_property_null(phalcon_cli_router_ce, SL("module"), ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_cli_router_ce, SL("module"), "", ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_cli_router_ce, SL("params"), ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_cli_router_ce, SL("routes"), ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_cli_router_ce, SL("task"), ZEND_ACC_PROTECTED); @@ -34022,7 +33961,7 @@ static PHP_METHOD(Phalcon_Cli_Router, __construct) add_assoc_long_ex(&_1$$3, SL("task"), 1); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "#^(?::delimiter)?([a-zA-Z0-9\\_\\-]+)[:delimiter]{0,1}$#"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 209, &_2$$3, &_1$$3); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 181, &_2$$3, &_1$$3); zephir_check_call_status(); zephir_array_append(&routes, &_0$$3, PH_SEPARATE, "phalcon/Cli/Router.zep", 120); ZEPHIR_INIT_NVAR(&_2$$3); @@ -34034,7 +33973,7 @@ static PHP_METHOD(Phalcon_Cli_Router, __construct) add_assoc_long_ex(&_3$$3, SL("params"), 3); ZEPHIR_INIT_VAR(&_4$$3); ZVAL_STRING(&_4$$3, "#^(?::delimiter)?([a-zA-Z0-9\\_\\-]+):delimiter([a-zA-Z0-9\\.\\_]+)(:delimiter.*)*$#"); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 209, &_4$$3, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 181, &_4$$3, &_3$$3); zephir_check_call_status(); zephir_array_append(&routes, &_2$$3, PH_SEPARATE, "phalcon/Cli/Router.zep", 129); } @@ -34083,7 +34022,7 @@ static PHP_METHOD(Phalcon_Cli_Router, add) ZEPHIR_INIT_VAR(&route); object_init_ex(&route, phalcon_cli_router_route_ce); - ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 209, &pattern, paths); + ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 181, &pattern, paths); zephir_check_call_status(); zephir_update_property_array_append(this_ptr, SL("routes"), &route); RETURN_CCTOR(&route); @@ -35719,7 +35658,7 @@ static PHP_METHOD(Phalcon_Cli_Router_Route, getReversedPaths) ZEPHIR_MM_GROW(); zephir_read_property(&_0, this_ptr, ZEND_STRL("paths"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_FUNCTION("array_flip", NULL, 128, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("array_flip", NULL, 95, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -36101,7 +36040,7 @@ static PHP_METHOD(Phalcon_Config_Config, merge) ZEPHIR_CALL_METHOD(NULL, this_ptr, "clear", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(toMerge) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&result, this_ptr, "internalmerge", NULL, 22, &source, toMerge); + ZEPHIR_CALL_METHOD(&result, this_ptr, "internalmerge", NULL, 20, &source, toMerge); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "init", NULL, 0, &result); zephir_check_call_status(); @@ -36114,7 +36053,7 @@ static PHP_METHOD(Phalcon_Config_Config, merge) if (_0) { ZEPHIR_CALL_METHOD(&_1$$4, toMerge, "toarray", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&result, this_ptr, "internalmerge", NULL, 22, &source, &_1$$4); + ZEPHIR_CALL_METHOD(&result, this_ptr, "internalmerge", NULL, 20, &source, &_1$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "init", NULL, 0, &result); zephir_check_call_status(); @@ -36193,7 +36132,7 @@ static PHP_METHOD(Phalcon_Config_Config, path) break; } ZEPHIR_MAKE_REF(&keys); - ZEPHIR_CALL_FUNCTION(&key, "array_shift", &_2, 23, &keys); + ZEPHIR_CALL_FUNCTION(&key, "array_shift", &_2, 21, &keys); ZEPHIR_UNREF(&keys); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_3$$5, &config, "has", NULL, 0, &key); @@ -36391,7 +36330,7 @@ static PHP_METHOD(Phalcon_Config_Config, internalMerge) } if (_5$$3) { zephir_array_fetch(&_8$$4, &source, &key, PH_NOISY | PH_READONLY, "phalcon/Config/Config.zep", 226); - ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "internalmerge", &_9, 22, &_8$$4, &value); + ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "internalmerge", &_9, 20, &_8$$4, &value); zephir_check_call_status(); zephir_array_update_zval(&source, &key, &_7$$4, PH_COPY | PH_SEPARATE); continue; @@ -36423,7 +36362,7 @@ static PHP_METHOD(Phalcon_Config_Config, internalMerge) } if (_11$$5) { zephir_array_fetch(&_14$$6, &source, &key, PH_NOISY | PH_READONLY, "phalcon/Config/Config.zep", 226); - ZEPHIR_CALL_METHOD(&_13$$6, this_ptr, "internalmerge", &_9, 22, &_14$$6, &value); + ZEPHIR_CALL_METHOD(&_13$$6, this_ptr, "internalmerge", &_9, 20, &_14$$6, &value); zephir_check_call_status(); zephir_array_update_zval(&source, &key, &_13$$6, PH_COPY | PH_SEPARATE); continue; @@ -36482,7 +36421,7 @@ static PHP_METHOD(Phalcon_Config_Config, setData) if (Z_TYPE_P(value) == IS_ARRAY) { ZEPHIR_INIT_VAR(&_2$$3); object_init_ex(&_2$$3, phalcon_config_config_ce); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 24, value); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 22, value); zephir_check_call_status(); zephir_array_update_zval(&data, element, &_2$$3, PH_COPY | PH_SEPARATE); } else { @@ -36579,10 +36518,10 @@ static PHP_METHOD(Phalcon_Config_ConfigFactory, load) ZEPHIR_OBS_VAR(&filePath); zephir_array_fetch_string(&filePath, &configArray, SL("filePath"), PH_NOISY, "phalcon/Config/ConfigFactory.zep", 61); ZVAL_LONG(&_1, 4); - ZEPHIR_CALL_FUNCTION(&_2, "pathinfo", NULL, 118, &filePath, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "pathinfo", NULL, 85, &filePath, &_1); zephir_check_call_status(); if (1 == ZEPHIR_IS_EMPTY(&_2)) { - ZEPHIR_CALL_FUNCTION(&_3$$3, "lcfirst", NULL, 104, &adapter); + ZEPHIR_CALL_FUNCTION(&_3$$3, "lcfirst", NULL, 73, &adapter); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4$$3); ZEPHIR_CONCAT_SV(&_4$$3, ".", &_3$$3); @@ -36727,7 +36666,7 @@ static PHP_METHOD(Phalcon_Config_ConfigFactory, parseConfig) if (Z_TYPE_P(config) == IS_STRING) { ZEPHIR_CPY_WRT(&oldConfig, config); ZVAL_LONG(&_0$$3, 4); - ZEPHIR_CALL_FUNCTION(&extension, "pathinfo", NULL, 118, config, &_0$$3); + ZEPHIR_CALL_FUNCTION(&extension, "pathinfo", NULL, 85, config, &_0$$3); zephir_check_call_status(); if (1 == ZEPHIR_IS_EMPTY(&extension)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_config_exception_ce, "You need to provide the extension in the file path", "phalcon/Config/ConfigFactory.zep", 161); @@ -36752,7 +36691,7 @@ static PHP_METHOD(Phalcon_Config_ConfigFactory, parseConfig) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_config_exception_ce, "Config must be array or Phalcon\\Config\\Config object", "phalcon/Config/ConfigFactory.zep", 177); return; } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkconfigarray", NULL, 219, config); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkconfigarray", NULL, 192, config); zephir_check_call_status(); RETVAL_ZVAL(config, 1, 0); RETURN_MM(); @@ -36938,9 +36877,9 @@ static PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) if (ZEPHIR_IS_IDENTICAL(&_6$$5, &defaultAdapter)) { ZEPHIR_INIT_NVAR(&_7$$6); object_init_ex(&_7$$6, phalcon_config_configfactory_ce); - ZEPHIR_CALL_METHOD(NULL, &_7$$6, "__construct", &_8, 210); + ZEPHIR_CALL_METHOD(NULL, &_7$$6, "__construct", &_8, 182); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_9$$6, &_7$$6, "load", &_10, 211, &configName); + ZEPHIR_CALL_METHOD(&_9$$6, &_7$$6, "load", &_10, 183, &configName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "merge", &_5, 0, &_9$$6); zephir_check_call_status(); @@ -36963,7 +36902,7 @@ static PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) object_init_ex(&_14$$9, phalcon_config_exception_ce); ZEPHIR_INIT_NVAR(&_15$$9); ZEPHIR_CONCAT_SS(&_15$$9, "To use 'array' adapter you have to specify ", "the 'config' as an array."); - ZEPHIR_CALL_METHOD(NULL, &_14$$9, "__construct", &_16, 31, &_15$$9); + ZEPHIR_CALL_METHOD(NULL, &_14$$9, "__construct", &_16, 29, &_15$$9); zephir_check_call_status(); zephir_throw_exception_debug(&_14$$9, "phalcon/Config/Adapter/Grouped.zep", 110); ZEPHIR_MM_RESTORE(); @@ -36973,14 +36912,14 @@ static PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) zephir_array_fetch_string(&configArray, &configInstance, SL("config"), PH_NOISY, "phalcon/Config/Adapter/Grouped.zep", 113); ZEPHIR_INIT_NVAR(&configInstance); object_init_ex(&configInstance, phalcon_config_config_ce); - ZEPHIR_CALL_METHOD(NULL, &configInstance, "__construct", &_17, 24, &configArray); + ZEPHIR_CALL_METHOD(NULL, &configInstance, "__construct", &_17, 22, &configArray); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&_18$$10); object_init_ex(&_18$$10, phalcon_config_configfactory_ce); - ZEPHIR_CALL_METHOD(NULL, &_18$$10, "__construct", &_8, 210); + ZEPHIR_CALL_METHOD(NULL, &_18$$10, "__construct", &_8, 182); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_19$$10, &_18$$10, "load", &_10, 211, &configInstance); + ZEPHIR_CALL_METHOD(&_19$$10, &_18$$10, "load", &_10, 183, &configInstance); zephir_check_call_status(); ZEPHIR_CPY_WRT(&configInstance, &_19$$10); } @@ -37013,9 +36952,9 @@ static PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) if (ZEPHIR_IS_IDENTICAL(&_21$$13, &defaultAdapter)) { ZEPHIR_INIT_NVAR(&_22$$14); object_init_ex(&_22$$14, phalcon_config_configfactory_ce); - ZEPHIR_CALL_METHOD(NULL, &_22$$14, "__construct", &_8, 210); + ZEPHIR_CALL_METHOD(NULL, &_22$$14, "__construct", &_8, 182); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_23$$14, &_22$$14, "load", &_10, 211, &configName); + ZEPHIR_CALL_METHOD(&_23$$14, &_22$$14, "load", &_10, 183, &configName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "merge", &_5, 0, &_23$$14); zephir_check_call_status(); @@ -37038,7 +36977,7 @@ static PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) object_init_ex(&_27$$17, phalcon_config_exception_ce); ZEPHIR_INIT_NVAR(&_28$$17); ZEPHIR_CONCAT_SS(&_28$$17, "To use 'array' adapter you have to specify ", "the 'config' as an array."); - ZEPHIR_CALL_METHOD(NULL, &_27$$17, "__construct", &_16, 31, &_28$$17); + ZEPHIR_CALL_METHOD(NULL, &_27$$17, "__construct", &_16, 29, &_28$$17); zephir_check_call_status(); zephir_throw_exception_debug(&_27$$17, "phalcon/Config/Adapter/Grouped.zep", 110); ZEPHIR_MM_RESTORE(); @@ -37048,14 +36987,14 @@ static PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) zephir_array_fetch_string(&configArray, &configInstance, SL("config"), PH_NOISY, "phalcon/Config/Adapter/Grouped.zep", 113); ZEPHIR_INIT_NVAR(&configInstance); object_init_ex(&configInstance, phalcon_config_config_ce); - ZEPHIR_CALL_METHOD(NULL, &configInstance, "__construct", &_17, 24, &configArray); + ZEPHIR_CALL_METHOD(NULL, &configInstance, "__construct", &_17, 22, &configArray); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&_29$$18); object_init_ex(&_29$$18, phalcon_config_configfactory_ce); - ZEPHIR_CALL_METHOD(NULL, &_29$$18, "__construct", &_8, 210); + ZEPHIR_CALL_METHOD(NULL, &_29$$18, "__construct", &_8, 182); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_30$$18, &_29$$18, "load", &_10, 211, &configInstance); + ZEPHIR_CALL_METHOD(&_30$$18, &_29$$18, "load", &_10, 183, &configInstance); zephir_check_call_status(); ZEPHIR_CPY_WRT(&configInstance, &_30$$18); } @@ -37159,7 +37098,7 @@ static PHP_METHOD(Phalcon_Config_Adapter_Ini, __construct) zephir_basename(&_3$$3, &filePath); ZEPHIR_INIT_VAR(&_4$$3); ZEPHIR_CONCAT_SVS(&_4$$3, "Configuration file ", &_3$$3, " cannot be loaded"); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 31, &_4$$3); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 29, &_4$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_2$$3, "phalcon/Config/Adapter/Ini.zep", 79); ZEPHIR_MM_RESTORE(); @@ -37519,7 +37458,7 @@ static PHP_METHOD(Phalcon_Config_Adapter_Ini, parseIniString) ZEPHIR_INIT_VAR(&_3); zephir_substr(&_3, &path, zephir_get_intval(&_2), 0, ZEPHIR_SUBSTR_NO_LENGTH); zephir_get_strval(&path, &_3); - ZEPHIR_CALL_METHOD(&result, this_ptr, "parseinistring", NULL, 212, &path, &castValue); + ZEPHIR_CALL_METHOD(&result, this_ptr, "parseinistring", NULL, 184, &path, &castValue); zephir_check_call_status(); zephir_create_array(return_value, 1, 0); zephir_array_update_zval(return_value, &key, &result, PH_COPY); @@ -37566,7 +37505,7 @@ static PHP_METHOD(Phalcon_Config_Adapter_Ini, phpParseIniFile) ZVAL_BOOL(&_0, (processSections ? 1 : 0)); ZVAL_LONG(&_1, scannerMode); - ZEPHIR_RETURN_CALL_FUNCTION("parse_ini_file", NULL, 213, &filename, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("parse_ini_file", NULL, 185, &filename, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -37625,7 +37564,7 @@ static PHP_METHOD(Phalcon_Config_Adapter_Json, __construct) ZEPHIR_INIT_VAR(&_2); zephir_file_get_contents(&_2, &filePath); ZVAL_BOOL(&_3, 1); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "decode", NULL, 214, &_2, &_3); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "decode", NULL, 186, &_2, &_3); zephir_check_call_status(); ZEPHIR_CALL_PARENT(NULL, phalcon_config_adapter_json_ce, getThis(), "__construct", &_0, 0, &_1); zephir_check_call_status(); @@ -37695,16 +37634,16 @@ static PHP_METHOD(Phalcon_Config_Adapter_Json, decode) ZVAL_LONG(&_2, options); ZEPHIR_INIT_VAR(&decoded); zephir_json_decode(&decoded, &data, zephir_get_intval(&_0) ); - ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 215); + ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 187); zephir_check_call_status(); if (UNEXPECTED(!ZEPHIR_IS_LONG_IDENTICAL(&_3, 0))) { ZEPHIR_INIT_VAR(&_4$$3); object_init_ex(&_4$$3, spl_ce_InvalidArgumentException); - ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 216); + ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 188); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6$$3); ZEPHIR_CONCAT_SV(&_6$$3, "json_decode error: ", &_5$$3); - ZEPHIR_CALL_METHOD(NULL, &_4$$3, "__construct", NULL, 40, &_6$$3); + ZEPHIR_CALL_METHOD(NULL, &_4$$3, "__construct", NULL, 189, &_6$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_4$$3, "phalcon/Config/Adapter/Json.zep", 68); ZEPHIR_MM_RESTORE(); @@ -37861,7 +37800,7 @@ static PHP_METHOD(Phalcon_Config_Adapter_Yaml, __construct) zephir_basename(&_5$$6, &filePath); ZEPHIR_INIT_VAR(&_6$$6); ZEPHIR_CONCAT_SVS(&_6$$6, "Configuration file ", &_5$$6, " can't be loaded"); - ZEPHIR_CALL_METHOD(NULL, &_4$$6, "__construct", NULL, 31, &_6$$6); + ZEPHIR_CALL_METHOD(NULL, &_4$$6, "__construct", NULL, 29, &_6$$6); zephir_check_call_status(); zephir_throw_exception_debug(&_4$$6, "phalcon/Config/Adapter/Yaml.zep", 76); ZEPHIR_MM_RESTORE(); @@ -37915,7 +37854,7 @@ static PHP_METHOD(Phalcon_Config_Adapter_Yaml, phpYamlParseFile) ZEPHIR_MAKE_REF(ndocs); - ZEPHIR_RETURN_CALL_FUNCTION("yaml_parse_file", NULL, 217, filename, pos, ndocs, callbacks); + ZEPHIR_RETURN_CALL_FUNCTION("yaml_parse_file", NULL, 190, filename, pos, ndocs, callbacks); ZEPHIR_UNREF(ndocs); zephir_check_call_status(); RETURN_MM(); @@ -37943,7 +37882,7 @@ static PHP_METHOD(Phalcon_Config_Adapter_Yaml, phpExtensionLoaded) zephir_get_strval(&name, name_param); - ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 218, &name); + ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 191, &name); zephir_check_call_status(); RETURN_MM(); } @@ -38055,7 +37994,7 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Connection, __construct) zephir_array_fetch_long(&_2$$3, &parts, 0, PH_NOISY | PH_READONLY, "phalcon/DataMapper/Pdo/Connection.zep", 71); ZEPHIR_INIT_VAR(&_3$$3); ZEPHIR_CONCAT_SVS(&_3$$3, "Driver not supported [", &_2$$3, "]"); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 40, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 189, &_3$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/DataMapper/Pdo/Connection.zep", 72); ZEPHIR_MM_RESTORE(); @@ -38077,7 +38016,7 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Connection, __construct) if (Z_TYPE_P(profiler) == IS_NULL) { ZEPHIR_INIT_NVAR(profiler); object_init_ex(profiler, phalcon_datamapper_pdo_profiler_profiler_ce); - ZEPHIR_CALL_METHOD(NULL, profiler, "__construct", NULL, 220); + ZEPHIR_CALL_METHOD(NULL, profiler, "__construct", NULL, 193); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, this_ptr, "setprofiler", NULL, 0, profiler); @@ -38624,7 +38563,7 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_ConnectionLocator, getConnection) ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, ""); if (ZEPHIR_IS_IDENTICAL(&_1, &requested)) { - ZEPHIR_CALL_FUNCTION(&requested, "array_rand", NULL, 221, &collection); + ZEPHIR_CALL_FUNCTION(&requested, "array_rand", NULL, 194, &collection); zephir_check_call_status(); } if (!(zephir_array_isset(&collection, &requested))) { @@ -38632,7 +38571,7 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_ConnectionLocator, getConnection) object_init_ex(&_2$$5, phalcon_datamapper_pdo_exception_connectionnotfound_ce); ZEPHIR_INIT_VAR(&_3$$5); ZEPHIR_CONCAT_SVSV(&_3$$5, "Connection not found: ", &type, ":", &requested); - ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 31, &_3$$5); + ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 29, &_3$$5); zephir_check_call_status(); zephir_throw_exception_debug(&_2$$5, "phalcon/DataMapper/Pdo/ConnectionLocator.zep", 210); ZEPHIR_MM_RESTORE(); @@ -38775,7 +38714,7 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Connection_AbstractConnection, __call) ZEPHIR_CONCAT_SVSVS(&message, "Class '", &className, "' does not have a method '", name, "'"); ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, spl_ce_BadMethodCallException); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 103, &message); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 72, &message); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/DataMapper/Pdo/Connection/AbstractConnection.zep", 62); ZEPHIR_MM_RESTORE(); @@ -40352,7 +40291,7 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Connection_Decorated, __construct) if (Z_TYPE_P(profiler) == IS_NULL) { ZEPHIR_INIT_NVAR(profiler); object_init_ex(profiler, phalcon_datamapper_pdo_profiler_profiler_ce); - ZEPHIR_CALL_METHOD(NULL, profiler, "__construct", NULL, 220); + ZEPHIR_CALL_METHOD(NULL, profiler, "__construct", NULL, 193); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, this_ptr, "setprofiler", NULL, 0, profiler); @@ -40472,37 +40411,31 @@ ZEPHIR_INIT_CLASS(Phalcon_DataMapper_Pdo_Exception_Exception) ZEPHIR_INIT_CLASS(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger) { - ZEPHIR_REGISTER_CLASS_EX(Phalcon\\DataMapper\\Pdo\\Profiler, MemoryLogger, phalcon, datamapper_pdo_profiler_memorylogger, zephir_get_internal_ce(SL("psrext\\log\\abstractlogger")), phalcon_datamapper_pdo_profiler_memorylogger_method_entry, 0); + ZEPHIR_REGISTER_CLASS(Phalcon\\DataMapper\\Pdo\\Profiler, MemoryLogger, phalcon, datamapper_pdo_profiler_memorylogger, phalcon_datamapper_pdo_profiler_memorylogger_method_entry, 0); zend_declare_property_null(phalcon_datamapper_pdo_profiler_memorylogger_ce, SL("messages"), ZEND_ACC_PROTECTED); phalcon_datamapper_pdo_profiler_memorylogger_ce->create_object = zephir_init_properties_Phalcon_DataMapper_Pdo_Profiler_MemoryLogger; + zend_class_implements(phalcon_datamapper_pdo_profiler_memorylogger_ce, 1, phalcon_logger_loggerinterface_ce); return SUCCESS; } -static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, getMessages) -{ - zval *this_ptr = getThis(); - - - - RETURN_MEMBER(getThis(), "messages"); -} - -static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, emergency) +static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, alert) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval context; - zval *message, message_sub, *context_param = NULL; + zval *message_param = NULL, *context_param = NULL, _0; + zval message; zval *this_ptr = getThis(); - ZVAL_UNDEF(&message_sub); + ZVAL_UNDEF(&message); + ZVAL_UNDEF(&_0); ZVAL_UNDEF(&context); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_ZVAL(message) + Z_PARAM_STR(message) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(context) ZEND_PARSE_PARAMETERS_END(); @@ -40510,7 +40443,8 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, emergency) ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 1, &message, &context_param); + zephir_fetch_params(1, 1, 1, &message_param, &context_param); + zephir_get_strval(&message, message_param); if (!context_param) { ZEPHIR_INIT_VAR(&context); array_init(&context); @@ -40519,25 +40453,28 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, emergency) } - ZEPHIR_CALL_PARENT(NULL, phalcon_datamapper_pdo_profiler_memorylogger_ce, getThis(), "emergency", NULL, 0, message, &context); + ZVAL_LONG(&_0, 2); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "log", NULL, 0, &_0, &message, &context); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } -static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, alert) +static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, critical) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval context; - zval *message, message_sub, *context_param = NULL; + zval *message_param = NULL, *context_param = NULL, _0; + zval message; zval *this_ptr = getThis(); - ZVAL_UNDEF(&message_sub); + ZVAL_UNDEF(&message); + ZVAL_UNDEF(&_0); ZVAL_UNDEF(&context); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_ZVAL(message) + Z_PARAM_STR(message) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(context) ZEND_PARSE_PARAMETERS_END(); @@ -40545,7 +40482,8 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, alert) ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 1, &message, &context_param); + zephir_fetch_params(1, 1, 1, &message_param, &context_param); + zephir_get_strval(&message, message_param); if (!context_param) { ZEPHIR_INIT_VAR(&context); array_init(&context); @@ -40554,25 +40492,28 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, alert) } - ZEPHIR_CALL_PARENT(NULL, phalcon_datamapper_pdo_profiler_memorylogger_ce, getThis(), "alert", NULL, 0, message, &context); + ZVAL_LONG(&_0, 1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "log", NULL, 0, &_0, &message, &context); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } -static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, critical) +static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, debug) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval context; - zval *message, message_sub, *context_param = NULL; + zval *message_param = NULL, *context_param = NULL, _0; + zval message; zval *this_ptr = getThis(); - ZVAL_UNDEF(&message_sub); + ZVAL_UNDEF(&message); + ZVAL_UNDEF(&_0); ZVAL_UNDEF(&context); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_ZVAL(message) + Z_PARAM_STR(message) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(context) ZEND_PARSE_PARAMETERS_END(); @@ -40580,7 +40521,8 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, critical) ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 1, &message, &context_param); + zephir_fetch_params(1, 1, 1, &message_param, &context_param); + zephir_get_strval(&message, message_param); if (!context_param) { ZEPHIR_INIT_VAR(&context); array_init(&context); @@ -40589,25 +40531,28 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, critical) } - ZEPHIR_CALL_PARENT(NULL, phalcon_datamapper_pdo_profiler_memorylogger_ce, getThis(), "critical", NULL, 0, message, &context); + ZVAL_LONG(&_0, 7); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "log", NULL, 0, &_0, &message, &context); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } -static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, error) +static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, emergency) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval context; - zval *message, message_sub, *context_param = NULL; + zval *message_param = NULL, *context_param = NULL, _0; + zval message; zval *this_ptr = getThis(); - ZVAL_UNDEF(&message_sub); + ZVAL_UNDEF(&message); + ZVAL_UNDEF(&_0); ZVAL_UNDEF(&context); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_ZVAL(message) + Z_PARAM_STR(message) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(context) ZEND_PARSE_PARAMETERS_END(); @@ -40615,7 +40560,8 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, error) ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 1, &message, &context_param); + zephir_fetch_params(1, 1, 1, &message_param, &context_param); + zephir_get_strval(&message, message_param); if (!context_param) { ZEPHIR_INIT_VAR(&context); array_init(&context); @@ -40624,25 +40570,28 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, error) } - ZEPHIR_CALL_PARENT(NULL, phalcon_datamapper_pdo_profiler_memorylogger_ce, getThis(), "error", NULL, 0, message, &context); + ZVAL_LONG(&_0, 0); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "log", NULL, 0, &_0, &message, &context); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } -static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, warning) +static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, error) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval context; - zval *message, message_sub, *context_param = NULL; + zval *message_param = NULL, *context_param = NULL, _0; + zval message; zval *this_ptr = getThis(); - ZVAL_UNDEF(&message_sub); + ZVAL_UNDEF(&message); + ZVAL_UNDEF(&_0); ZVAL_UNDEF(&context); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_ZVAL(message) + Z_PARAM_STR(message) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(context) ZEND_PARSE_PARAMETERS_END(); @@ -40650,7 +40599,8 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, warning) ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 1, &message, &context_param); + zephir_fetch_params(1, 1, 1, &message_param, &context_param); + zephir_get_strval(&message, message_param); if (!context_param) { ZEPHIR_INIT_VAR(&context); array_init(&context); @@ -40659,25 +40609,96 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, warning) } - ZEPHIR_CALL_PARENT(NULL, phalcon_datamapper_pdo_profiler_memorylogger_ce, getThis(), "warning", NULL, 0, message, &context); + ZVAL_LONG(&_0, 3); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "log", NULL, 0, &_0, &message, &context); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } -static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, notice) +static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, getAdapter) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *name_param = NULL; + zval name; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&name); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_STR(name) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &name_param); + zephir_get_strval(&name, name_param); + + + object_init_ex(return_value, phalcon_logger_adapter_noop_ce); + if (zephir_has_constructor(return_value)) { + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 0); + zephir_check_call_status(); + } + + RETURN_MM(); +} + +static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, getAdapters) +{ + zval *this_ptr = getThis(); + + + + array_init(return_value); + return; +} + +static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, getLogLevel) +{ + zval *this_ptr = getThis(); + + + + RETURN_LONG(8); +} + +static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, getMessages) +{ + zval *this_ptr = getThis(); + + + + RETURN_MEMBER(getThis(), "messages"); +} + +static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, getName) +{ + zval *this_ptr = getThis(); + + + + RETURN_STRING("memory logger"); +} + +static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, info) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval context; - zval *message, message_sub, *context_param = NULL; + zval *message_param = NULL, *context_param = NULL, _0; + zval message; zval *this_ptr = getThis(); - ZVAL_UNDEF(&message_sub); + ZVAL_UNDEF(&message); + ZVAL_UNDEF(&_0); ZVAL_UNDEF(&context); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_ZVAL(message) + Z_PARAM_STR(message) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(context) ZEND_PARSE_PARAMETERS_END(); @@ -40685,7 +40706,8 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, notice) ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 1, &message, &context_param); + zephir_fetch_params(1, 1, 1, &message_param, &context_param); + zephir_get_strval(&message, message_param); if (!context_param) { ZEPHIR_INIT_VAR(&context); array_init(&context); @@ -40694,25 +40716,28 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, notice) } - ZEPHIR_CALL_PARENT(NULL, phalcon_datamapper_pdo_profiler_memorylogger_ce, getThis(), "notice", NULL, 0, message, &context); + ZVAL_LONG(&_0, 6); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "log", NULL, 0, &_0, &message, &context); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } -static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, info) +static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, notice) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval context; - zval *message, message_sub, *context_param = NULL; + zval *message_param = NULL, *context_param = NULL, _0; + zval message; zval *this_ptr = getThis(); - ZVAL_UNDEF(&message_sub); + ZVAL_UNDEF(&message); + ZVAL_UNDEF(&_0); ZVAL_UNDEF(&context); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_ZVAL(message) + Z_PARAM_STR(message) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(context) ZEND_PARSE_PARAMETERS_END(); @@ -40720,7 +40745,8 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, info) ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 1, &message, &context_param); + zephir_fetch_params(1, 1, 1, &message_param, &context_param); + zephir_get_strval(&message, message_param); if (!context_param) { ZEPHIR_INIT_VAR(&context); array_init(&context); @@ -40729,25 +40755,28 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, info) } - ZEPHIR_CALL_PARENT(NULL, phalcon_datamapper_pdo_profiler_memorylogger_ce, getThis(), "info", NULL, 0, message, &context); + ZVAL_LONG(&_0, 5); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "log", NULL, 0, &_0, &message, &context); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } -static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, debug) +static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, warning) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval context; - zval *message, message_sub, *context_param = NULL; + zval *message_param = NULL, *context_param = NULL, _0; + zval message; zval *this_ptr = getThis(); - ZVAL_UNDEF(&message_sub); + ZVAL_UNDEF(&message); + ZVAL_UNDEF(&_0); ZVAL_UNDEF(&context); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_ZVAL(message) + Z_PARAM_STR(message) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(context) ZEND_PARSE_PARAMETERS_END(); @@ -40755,7 +40784,8 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, debug) ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 1, &message, &context_param); + zephir_fetch_params(1, 1, 1, &message_param, &context_param); + zephir_get_strval(&message, message_param); if (!context_param) { ZEPHIR_INIT_VAR(&context); array_init(&context); @@ -40764,7 +40794,8 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, debug) } - ZEPHIR_CALL_PARENT(NULL, phalcon_datamapper_pdo_profiler_memorylogger_ce, getThis(), "debug", NULL, 0, message, &context); + ZVAL_LONG(&_0, 4); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "log", NULL, 0, &_0, &message, &context); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -40776,24 +40807,25 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, log) zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval context, replace; - zval *level, level_sub, *message, message_sub, *context_param = NULL, key, value, *_0, _1, _6, _4$$3, _5$$4; + zval message; + zval *level, level_sub, *message_param = NULL, *context_param = NULL, key, value, *_0, _1, _6, _4$$3, _5$$4; zval *this_ptr = getThis(); ZVAL_UNDEF(&level_sub); - ZVAL_UNDEF(&message_sub); ZVAL_UNDEF(&key); ZVAL_UNDEF(&value); ZVAL_UNDEF(&_1); ZVAL_UNDEF(&_6); ZVAL_UNDEF(&_4$$3); ZVAL_UNDEF(&_5$$4); + ZVAL_UNDEF(&message); ZVAL_UNDEF(&context); ZVAL_UNDEF(&replace); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 3) Z_PARAM_ZVAL(level) - Z_PARAM_ZVAL(message) + Z_PARAM_STR(message) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(context) ZEND_PARSE_PARAMETERS_END(); @@ -40801,7 +40833,8 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, log) ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 2, 1, &level, &message, &context_param); + zephir_fetch_params(1, 2, 1, &level, &message_param, &context_param); + zephir_get_strval(&message, message_param); if (!context_param) { ZEPHIR_INIT_VAR(&context); array_init(&context); @@ -40812,7 +40845,7 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, log) ZEPHIR_INIT_VAR(&replace); array_init(&replace); - zephir_is_iterable(&context, 0, "phalcon/DataMapper/Pdo/Profiler/MemoryLogger.zep", 130); + zephir_is_iterable(&context, 0, "phalcon/DataMapper/Pdo/Profiler/MemoryLogger.zep", 172); if (Z_TYPE_P(&context) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&context), _2, _3, _0) { @@ -40850,7 +40883,7 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, log) } ZEPHIR_INIT_NVAR(&value); ZEPHIR_INIT_NVAR(&key); - ZEPHIR_CALL_FUNCTION(&_6, "strtr", NULL, 5, message, &replace); + ZEPHIR_CALL_FUNCTION(&_6, "strtr", NULL, 5, &message, &replace); zephir_check_call_status(); zephir_update_property_array_append(this_ptr, SL("messages"), &_6); ZEPHIR_MM_RESTORE(); @@ -40909,17 +40942,18 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, __construct) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *logger = NULL, logger_sub, __$null, _0; + zval *logger = NULL, logger_sub, __$null, _0, _1; zval *this_ptr = getThis(); ZVAL_UNDEF(&logger_sub); ZVAL_NULL(&__$null); ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 1) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(logger, zephir_get_internal_ce(SL("psr\\log\\loggerinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(logger, phalcon_logger_loggerinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -40947,9 +40981,9 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, __construct) ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "{method} ({duration}s): {statement} {backtrace}"); zephir_update_property_zval(this_ptr, ZEND_STRL("logFormat"), &_0); - ZEPHIR_INIT_NVAR(&_0); - ZVAL_STRING(&_0, "debug"); - zephir_update_property_zval(this_ptr, ZEND_STRL("logLevel"), &_0); + ZEPHIR_INIT_ZVAL_NREF(_1); + ZVAL_LONG(&_1, 7); + zephir_update_property_zval(this_ptr, ZEND_STRL("logLevel"), &_1); zephir_update_property_zval(this_ptr, ZEND_STRL("logger"), logger); ZEPHIR_MM_RESTORE(); } @@ -41012,11 +41046,11 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, finish) if (UNEXPECTED(zephir_is_true(&_0))) { ZEPHIR_INIT_VAR(&ex); object_init_ex(&ex, phalcon_datamapper_pdo_exception_exception_ce); - ZEPHIR_CALL_METHOD(NULL, &ex, "__construct", NULL, 31); + ZEPHIR_CALL_METHOD(NULL, &ex, "__construct", NULL, 29); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&finish, "hrtime", NULL, 222, &__$true); + ZEPHIR_CALL_FUNCTION(&finish, "hrtime", NULL, 195, &__$true); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, &ex, "gettraceasstring", NULL, 223); + ZEPHIR_CALL_METHOD(&_1$$3, &ex, "gettraceasstring", NULL, 196); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "backtrace"); @@ -41039,7 +41073,7 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, finish) ZEPHIR_INIT_NVAR(&_5$$3); ZVAL_STRING(&_5$$3, ""); } else { - ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "encode", NULL, 224, &values); + ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "encode", NULL, 197, &values); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_9$$3); @@ -41204,7 +41238,7 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, start) ZEPHIR_INIT_VAR(&_1$$3); zephir_create_array(&_1$$3, 2, 0); zephir_array_update_string(&_1$$3, SL("method"), &method, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_FUNCTION(&_2$$3, "hrtime", NULL, 222, &__$true); + ZEPHIR_CALL_FUNCTION(&_2$$3, "hrtime", NULL, 195, &__$true); zephir_check_call_status(); zephir_array_update_string(&_1$$3, SL("start"), &_2$$3, PH_COPY | PH_SEPARATE); zephir_update_property_zval(this_ptr, ZEND_STRL("context"), &_1$$3); @@ -41256,16 +41290,16 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, encode) ZVAL_LONG(&_1, depth); ZEPHIR_INIT_VAR(&encoded); zephir_json_encode(&encoded, data, zephir_get_intval(&_0) ); - ZEPHIR_CALL_FUNCTION(&_2, "json_last_error", NULL, 215); + ZEPHIR_CALL_FUNCTION(&_2, "json_last_error", NULL, 187); zephir_check_call_status(); if (UNEXPECTED(!ZEPHIR_IS_LONG_IDENTICAL(&_2, 0))) { ZEPHIR_INIT_VAR(&_3$$3); object_init_ex(&_3$$3, spl_ce_InvalidArgumentException); - ZEPHIR_CALL_FUNCTION(&_4$$3, "json_last_error_msg", NULL, 216); + ZEPHIR_CALL_FUNCTION(&_4$$3, "json_last_error_msg", NULL, 188); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5$$3); ZEPHIR_CONCAT_SV(&_5$$3, "json_encode error: ", &_4$$3); - ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 40, &_5$$3); + ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 189, &_5$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$3, "phalcon/DataMapper/Pdo/Profiler/Profiler.zep", 215); ZEPHIR_MM_RESTORE(); @@ -42121,7 +42155,7 @@ static PHP_METHOD(Phalcon_DataMapper_Query_AbstractConditions, appendCondition) } zephir_read_property(&_5, this_ptr, ZEND_STRL("store"), PH_NOISY_CC | PH_READONLY); zephir_array_fetch(&_6, &_5, &store, PH_NOISY | PH_READONLY, "phalcon/DataMapper/Query/AbstractConditions.zep", 331); - ZEPHIR_CALL_FUNCTION(&key, "array_key_last", NULL, 49, &_6); + ZEPHIR_CALL_FUNCTION(&key, "array_key_last", NULL, 36, &_6); zephir_check_call_status(); zephir_read_property(&_7, this_ptr, ZEND_STRL("store"), PH_NOISY_CC | PH_READONLY); zephir_array_fetch(&_8, &_7, &store, PH_NOISY | PH_READONLY, "phalcon/DataMapper/Query/AbstractConditions.zep", 333); @@ -43528,7 +43562,7 @@ static PHP_METHOD(Phalcon_DataMapper_Query_Insert, getStatement) zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("store"), PH_NOISY_CC | PH_READONLY); zephir_array_fetch_string(&_2, &_1, SL("FROM"), PH_NOISY | PH_READONLY, "phalcon/DataMapper/Query/Insert.zep", 113); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 225); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 198); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_4, this_ptr, "buildreturning", NULL, 0); zephir_check_call_status(); @@ -43836,7 +43870,7 @@ static PHP_METHOD(Phalcon_DataMapper_Query_QueryFactory, newDelete) object_init_ex(return_value, phalcon_datamapper_query_delete_ce); ZEPHIR_CALL_METHOD(&_0, this_ptr, "newbind", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 226, connection, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 199, connection, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -43865,7 +43899,7 @@ static PHP_METHOD(Phalcon_DataMapper_Query_QueryFactory, newInsert) object_init_ex(return_value, phalcon_datamapper_query_insert_ce); ZEPHIR_CALL_METHOD(&_0, this_ptr, "newbind", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 227, connection, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 200, connection, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -43938,7 +43972,7 @@ static PHP_METHOD(Phalcon_DataMapper_Query_QueryFactory, newUpdate) object_init_ex(return_value, phalcon_datamapper_query_update_ce); ZEPHIR_CALL_METHOD(&_0, this_ptr, "newbind", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 228, connection, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 201, connection, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -44042,7 +44076,7 @@ static PHP_METHOD(Phalcon_DataMapper_Query_Select, __call) object_init_ex(&_5, spl_ce_BadMethodCallException); ZEPHIR_INIT_VAR(&_6); ZEPHIR_CONCAT_SVS(&_6, "Unknown method: [", &method, "]"); - ZEPHIR_CALL_METHOD(NULL, &_5, "__construct", NULL, 103, &_6); + ZEPHIR_CALL_METHOD(NULL, &_5, "__construct", NULL, 72, &_6); zephir_check_call_status(); zephir_throw_exception_debug(&_5, "phalcon/DataMapper/Query/Select.zep", 97); ZEPHIR_MM_RESTORE(); @@ -44223,12 +44257,12 @@ static PHP_METHOD(Phalcon_DataMapper_Query_Select, appendJoin) } zephir_read_property(&_3, this_ptr, ZEND_STRL("store"), PH_NOISY_CC | PH_READONLY); zephir_array_fetch_string(&_4, &_3, SL("FROM"), PH_NOISY | PH_READONLY, "phalcon/DataMapper/Query/Select.zep", 172); - ZEPHIR_CALL_FUNCTION(&end, "array_key_last", NULL, 49, &_4); + ZEPHIR_CALL_FUNCTION(&end, "array_key_last", NULL, 36, &_4); zephir_check_call_status(); zephir_read_property(&_5, this_ptr, ZEND_STRL("store"), PH_NOISY_CC | PH_READONLY); zephir_array_fetch_string(&_6, &_5, SL("FROM"), PH_NOISY | PH_READONLY, "phalcon/DataMapper/Query/Select.zep", 173); zephir_array_fetch(&_7, &_6, &end, PH_NOISY | PH_READONLY, "phalcon/DataMapper/Query/Select.zep", 173); - ZEPHIR_CALL_FUNCTION(&key, "array_key_last", NULL, 49, &_7); + ZEPHIR_CALL_FUNCTION(&key, "array_key_last", NULL, 36, &_7); zephir_check_call_status(); zephir_read_property(&_8, this_ptr, ZEND_STRL("store"), PH_NOISY_CC | PH_READONLY); zephir_array_fetch_string(&_9, &_8, SL("FROM"), PH_NOISY | PH_READONLY, "phalcon/DataMapper/Query/Select.zep", 175); @@ -44600,7 +44634,7 @@ static PHP_METHOD(Phalcon_DataMapper_Query_Select, join) } zephir_read_property(&_19, this_ptr, ZEND_STRL("store"), PH_NOISY_CC | PH_READONLY); zephir_array_fetch_string(&_20, &_19, SL("FROM"), PH_NOISY | PH_READONLY, "phalcon/DataMapper/Query/Select.zep", 330); - ZEPHIR_CALL_FUNCTION(&key, "array_key_last", NULL, 49, &_20); + ZEPHIR_CALL_FUNCTION(&key, "array_key_last", NULL, 36, &_20); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_21); ZEPHIR_CONCAT_VSVSV(&_21, &join, " ", &table, " ", &condition); @@ -44702,7 +44736,7 @@ static PHP_METHOD(Phalcon_DataMapper_Query_Select, subSelect) object_init_ex(return_value, phalcon_datamapper_query_select_ce); zephir_read_property(&_0, this_ptr, ZEND_STRL("connection"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_1, this_ptr, ZEND_STRL("bind"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 229, &_0, &_1); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 202, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -44808,9 +44842,9 @@ static PHP_METHOD(Phalcon_DataMapper_Query_Select, getCurrentStatement) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_2, this_ptr, "buildlimitearly", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 230); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 203); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "buildfrom", NULL, 231); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "buildfrom", NULL, 204); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6); ZVAL_STRING(&_6, "WHERE"); @@ -44925,7 +44959,7 @@ static PHP_METHOD(Phalcon_DataMapper_Query_Select, buildFrom) ZEPHIR_INIT_NVAR(&table); ZVAL_COPY(&table, _4); ZEPHIR_MAKE_REF(&table); - ZEPHIR_CALL_FUNCTION(&_6$$4, "array_shift", &_7, 23, &table); + ZEPHIR_CALL_FUNCTION(&_6$$4, "array_shift", &_7, 21, &table); ZEPHIR_UNREF(&table); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_8$$4, this_ptr, "indent", &_9, 0, &table); @@ -44946,7 +44980,7 @@ static PHP_METHOD(Phalcon_DataMapper_Query_Select, buildFrom) ZEPHIR_CALL_METHOD(&table, &_3, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&table); - ZEPHIR_CALL_FUNCTION(&_11$$5, "array_shift", &_7, 23, &table); + ZEPHIR_CALL_FUNCTION(&_11$$5, "array_shift", &_7, 21, &table); ZEPHIR_UNREF(&table); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_12$$5, this_ptr, "indent", &_9, 0, &table); @@ -45204,7 +45238,7 @@ static PHP_METHOD(Phalcon_DataMapper_Query_Update, getStatement) zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("store"), PH_NOISY_CC | PH_READONLY); zephir_array_fetch_string(&_2, &_1, SL("FROM"), PH_NOISY | PH_READONLY, "phalcon/DataMapper/Query/Update.zep", 101); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 232); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 205); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5); ZVAL_STRING(&_5, "WHERE"); @@ -46277,7 +46311,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, getColumnList) { ZEPHIR_INIT_NVAR(&column); ZVAL_COPY(&column, _0); - ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getsqlcolumn", &_3, 53, &column, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getsqlcolumn", &_3, 40, &column, &escapeChar, &bindCounts); zephir_check_call_status(); zephir_array_append(&columns, &_2$$3, PH_SEPARATE, "phalcon/Db/Dialect.zep", 125); } ZEND_HASH_FOREACH_END(); @@ -46292,7 +46326,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, getColumnList) } ZEPHIR_CALL_METHOD(&column, &columnList, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getsqlcolumn", &_3, 53, &column, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getsqlcolumn", &_3, 40, &column, &escapeChar, &bindCounts); zephir_check_call_status(); zephir_array_append(&columns, &_4$$4, PH_SEPARATE, "phalcon/Db/Dialect.zep", 125); ZEPHIR_CALL_METHOD(NULL, &columnList, "next", NULL, 0); @@ -46489,17 +46523,17 @@ static PHP_METHOD(Phalcon_Db_Dialect, getSqlExpression) } do { if (ZEPHIR_IS_STRING(&type, "scalar")) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getsqlexpressionscalar", NULL, 54, &expression, &escapeChar, &bindCounts); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getsqlexpressionscalar", NULL, 41, &expression, &escapeChar, &bindCounts); zephir_check_call_status(); RETURN_MM(); } if (ZEPHIR_IS_STRING(&type, "object")) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getsqlexpressionobject", NULL, 55, &expression, &escapeChar, &bindCounts); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getsqlexpressionobject", NULL, 42, &expression, &escapeChar, &bindCounts); zephir_check_call_status(); RETURN_MM(); } if (ZEPHIR_IS_STRING(&type, "qualified")) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getsqlexpressionqualified", NULL, 56, &expression, &escapeChar); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getsqlexpressionqualified", NULL, 43, &expression, &escapeChar); zephir_check_call_status(); RETURN_MM(); } @@ -46548,34 +46582,34 @@ static PHP_METHOD(Phalcon_Db_Dialect, getSqlExpression) RETURN_CTOR(&_6$$8); } if (ZEPHIR_IS_STRING(&type, "binary-op")) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getsqlexpressionbinaryoperations", NULL, 57, &expression, &escapeChar, &bindCounts); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getsqlexpressionbinaryoperations", NULL, 44, &expression, &escapeChar, &bindCounts); zephir_check_call_status(); RETURN_MM(); } if (ZEPHIR_IS_STRING(&type, "unary-op")) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getsqlexpressionunaryoperations", NULL, 58, &expression, &escapeChar, &bindCounts); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getsqlexpressionunaryoperations", NULL, 45, &expression, &escapeChar, &bindCounts); zephir_check_call_status(); RETURN_MM(); } if (ZEPHIR_IS_STRING(&type, "parentheses")) { zephir_array_fetch_string(&_8$$14, &expression, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Db/Dialect.zep", 304); - ZEPHIR_CALL_METHOD(&_7$$14, this_ptr, "getsqlexpression", NULL, 59, &_8$$14, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&_7$$14, this_ptr, "getsqlexpression", NULL, 46, &_8$$14, &escapeChar, &bindCounts); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, "(", &_7$$14, ")"); RETURN_MM(); } if (ZEPHIR_IS_STRING(&type, "functionCall")) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getsqlexpressionfunctioncall", NULL, 60, &expression, &escapeChar, &bindCounts); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getsqlexpressionfunctioncall", NULL, 47, &expression, &escapeChar, &bindCounts); zephir_check_call_status(); RETURN_MM(); } if (ZEPHIR_IS_STRING(&type, "list")) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getsqlexpressionlist", NULL, 61, &expression, &escapeChar, &bindCounts); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getsqlexpressionlist", NULL, 48, &expression, &escapeChar, &bindCounts); zephir_check_call_status(); RETURN_MM(); } if (ZEPHIR_IS_STRING(&type, "all")) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getsqlexpressionall", NULL, 62, &expression, &escapeChar); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getsqlexpressionall", NULL, 49, &expression, &escapeChar); zephir_check_call_status(); RETURN_MM(); } @@ -46587,17 +46621,17 @@ static PHP_METHOD(Phalcon_Db_Dialect, getSqlExpression) RETURN_MM(); } if (ZEPHIR_IS_STRING(&type, "cast")) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getsqlexpressioncastvalue", NULL, 63, &expression, &escapeChar, &bindCounts); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getsqlexpressioncastvalue", NULL, 50, &expression, &escapeChar, &bindCounts); zephir_check_call_status(); RETURN_MM(); } if (ZEPHIR_IS_STRING(&type, "convert")) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getsqlexpressionconvertvalue", NULL, 64, &expression, &escapeChar, &bindCounts); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getsqlexpressionconvertvalue", NULL, 51, &expression, &escapeChar, &bindCounts); zephir_check_call_status(); RETURN_MM(); } if (ZEPHIR_IS_STRING(&type, "case")) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getsqlexpressioncase", NULL, 65, &expression, &escapeChar, &bindCounts); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getsqlexpressioncase", NULL, 52, &expression, &escapeChar, &bindCounts); zephir_check_call_status(); RETURN_MM(); } @@ -46607,7 +46641,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, getSqlExpression) object_init_ex(&_11, phalcon_db_exception_ce); ZEPHIR_INIT_VAR(&_12); ZEPHIR_CONCAT_SVS(&_12, "Invalid SQL expression type '", &type, "'"); - ZEPHIR_CALL_METHOD(NULL, &_11, "__construct", NULL, 31, &_12); + ZEPHIR_CALL_METHOD(NULL, &_11, "__construct", NULL, 29, &_12); zephir_check_call_status(); zephir_throw_exception_debug(&_11, "phalcon/Db/Dialect.zep", 369); ZEPHIR_MM_RESTORE(); @@ -46657,7 +46691,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, getSqlTable) zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "escape", NULL, 66, table, &escapeChar); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "escape", NULL, 53, table, &escapeChar); zephir_check_call_status(); RETURN_MM(); } @@ -46897,12 +46931,12 @@ static PHP_METHOD(Phalcon_Db_Dialect, select) } zephir_read_property(&_0, this_ptr, ZEND_STRL("escapeChar"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&escapeChar, &_0); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "getcolumnlist", NULL, 67, &columns, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getcolumnlist", NULL, 54, &columns, &escapeChar, &bindCounts); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZEPHIR_CONCAT_SV(&_2, " ", &_1); zephir_concat_self(&sql, &_2); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "getsqlexpressionfrom", NULL, 68, &tables, &escapeChar); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "getsqlexpressionfrom", NULL, 55, &tables, &escapeChar); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); ZEPHIR_CONCAT_SV(&_4, " ", &_3); @@ -46914,7 +46948,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, select) } if (_5) { zephir_array_fetch_string(&_7$$10, &definition, SL("joins"), PH_NOISY | PH_READONLY, "phalcon/Db/Dialect.zep", 517); - ZEPHIR_CALL_METHOD(&_6$$10, this_ptr, "getsqlexpressionjoins", NULL, 69, &_7$$10, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&_6$$10, this_ptr, "getsqlexpressionjoins", NULL, 56, &_7$$10, &escapeChar, &bindCounts); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_8$$10); ZEPHIR_CONCAT_SV(&_8$$10, " ", &_6$$10); @@ -46926,7 +46960,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, select) _9 = zephir_is_true(&where); } if (_9) { - ZEPHIR_CALL_METHOD(&_10$$11, this_ptr, "getsqlexpressionwhere", NULL, 70, &where, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&_10$$11, this_ptr, "getsqlexpressionwhere", NULL, 57, &where, &escapeChar, &bindCounts); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_11$$11); ZEPHIR_CONCAT_SV(&_11$$11, " ", &_10$$11); @@ -46938,7 +46972,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, select) _12 = zephir_is_true(&groupBy); } if (_12) { - ZEPHIR_CALL_METHOD(&_13$$12, this_ptr, "getsqlexpressiongroupby", NULL, 71, &groupBy, &escapeChar); + ZEPHIR_CALL_METHOD(&_13$$12, this_ptr, "getsqlexpressiongroupby", NULL, 58, &groupBy, &escapeChar); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_14$$12); ZEPHIR_CONCAT_SV(&_14$$12, " ", &_13$$12); @@ -46950,7 +46984,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, select) _15 = zephir_is_true(&having); } if (_15) { - ZEPHIR_CALL_METHOD(&_16$$13, this_ptr, "getsqlexpressionhaving", NULL, 72, &having, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&_16$$13, this_ptr, "getsqlexpressionhaving", NULL, 59, &having, &escapeChar, &bindCounts); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_17$$13); ZEPHIR_CONCAT_SV(&_17$$13, " ", &_16$$13); @@ -46962,7 +46996,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, select) _18 = zephir_is_true(&orderBy); } if (_18) { - ZEPHIR_CALL_METHOD(&_19$$14, this_ptr, "getsqlexpressionorderby", NULL, 73, &orderBy, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&_19$$14, this_ptr, "getsqlexpressionorderby", NULL, 60, &orderBy, &escapeChar, &bindCounts); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_20$$14); ZEPHIR_CONCAT_SV(&_20$$14, " ", &_19$$14); @@ -46978,7 +47012,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, select) zephir_create_array(&_22$$15, 2, 0); zephir_array_update_string(&_22$$15, SL("sql"), &sql, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_22$$15, SL("value"), &limit, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&sql, this_ptr, "getsqlexpressionlimit", NULL, 74, &_22$$15, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&sql, this_ptr, "getsqlexpressionlimit", NULL, 61, &_22$$15, &escapeChar, &bindCounts); zephir_check_call_status(); } _23 = zephir_array_isset_string_fetch(&forUpdate, &definition, SL("forUpdate"), 1); @@ -47226,7 +47260,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, getSqlExpressionBinaryOperations) ZEPHIR_CALL_METHOD(&left, this_ptr, "getsqlexpression", NULL, 0, &_0, &escapeChar, &bindCounts); zephir_check_call_status(); zephir_array_fetch_string(&_1, &expression, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Db/Dialect.zep", 660); - ZEPHIR_CALL_METHOD(&right, this_ptr, "getsqlexpression", NULL, 59, &_1, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&right, this_ptr, "getsqlexpression", NULL, 46, &_1, &escapeChar, &bindCounts); zephir_check_call_status(); zephir_array_fetch_string(&_2, &expression, SL("op"), PH_NOISY | PH_READONLY, "phalcon/Db/Dialect.zep", 665); ZEPHIR_CONCAT_VSVSV(return_value, &left, " ", &_2, " ", &right); @@ -47313,17 +47347,17 @@ static PHP_METHOD(Phalcon_Db_Dialect, getSqlExpressionCase) zephir_array_fetch_string(&_6$$3, &whenClause, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Db/Dialect.zep", 685); if (ZEPHIR_IS_STRING(&_6$$3, "when")) { zephir_array_fetch_string(&_8$$4, &whenClause, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Db/Dialect.zep", 687); - ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "getsqlexpression", NULL, 59, &_8$$4, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "getsqlexpression", NULL, 46, &_8$$4, &escapeChar, &bindCounts); zephir_check_call_status(); zephir_array_fetch_string(&_10$$4, &whenClause, SL("then"), PH_NOISY | PH_READONLY, "phalcon/Db/Dialect.zep", 689); - ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "getsqlexpression", NULL, 59, &_10$$4, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "getsqlexpression", NULL, 46, &_10$$4, &escapeChar, &bindCounts); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_11$$4); ZEPHIR_CONCAT_SVSV(&_11$$4, " WHEN ", &_7$$4, " THEN ", &_9$$4); zephir_concat_self(&sql, &_11$$4); } else { zephir_array_fetch_string(&_13$$5, &whenClause, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Db/Dialect.zep", 691); - ZEPHIR_CALL_METHOD(&_12$$5, this_ptr, "getsqlexpression", NULL, 59, &_13$$5, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&_12$$5, this_ptr, "getsqlexpression", NULL, 46, &_13$$5, &escapeChar, &bindCounts); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_14$$5); ZEPHIR_CONCAT_SV(&_14$$5, " ELSE ", &_12$$5); @@ -47344,17 +47378,17 @@ static PHP_METHOD(Phalcon_Db_Dialect, getSqlExpressionCase) zephir_array_fetch_string(&_15$$6, &whenClause, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Db/Dialect.zep", 685); if (ZEPHIR_IS_STRING(&_15$$6, "when")) { zephir_array_fetch_string(&_17$$7, &whenClause, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Db/Dialect.zep", 687); - ZEPHIR_CALL_METHOD(&_16$$7, this_ptr, "getsqlexpression", NULL, 59, &_17$$7, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&_16$$7, this_ptr, "getsqlexpression", NULL, 46, &_17$$7, &escapeChar, &bindCounts); zephir_check_call_status(); zephir_array_fetch_string(&_19$$7, &whenClause, SL("then"), PH_NOISY | PH_READONLY, "phalcon/Db/Dialect.zep", 689); - ZEPHIR_CALL_METHOD(&_18$$7, this_ptr, "getsqlexpression", NULL, 59, &_19$$7, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&_18$$7, this_ptr, "getsqlexpression", NULL, 46, &_19$$7, &escapeChar, &bindCounts); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_20$$7); ZEPHIR_CONCAT_SVSV(&_20$$7, " WHEN ", &_16$$7, " THEN ", &_18$$7); zephir_concat_self(&sql, &_20$$7); } else { zephir_array_fetch_string(&_22$$8, &whenClause, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Db/Dialect.zep", 691); - ZEPHIR_CALL_METHOD(&_21$$8, this_ptr, "getsqlexpression", NULL, 59, &_22$$8, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&_21$$8, this_ptr, "getsqlexpression", NULL, 46, &_22$$8, &escapeChar, &bindCounts); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_23$$8); ZEPHIR_CONCAT_SV(&_23$$8, " ELSE ", &_21$$8); @@ -47416,7 +47450,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, getSqlExpressionCastValue) ZEPHIR_CALL_METHOD(&left, this_ptr, "getsqlexpression", NULL, 0, &_0, &escapeChar, &bindCounts); zephir_check_call_status(); zephir_array_fetch_string(&_1, &expression, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Db/Dialect.zep", 718); - ZEPHIR_CALL_METHOD(&right, this_ptr, "getsqlexpression", NULL, 59, &_1, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&right, this_ptr, "getsqlexpression", NULL, 46, &_1, &escapeChar, &bindCounts); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "CAST(", &left, " AS ", &right, ")"); RETURN_MM(); @@ -47469,7 +47503,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, getSqlExpressionConvertValue) ZEPHIR_CALL_METHOD(&left, this_ptr, "getsqlexpression", NULL, 0, &_0, &escapeChar, &bindCounts); zephir_check_call_status(); zephir_array_fetch_string(&_1, &expression, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Db/Dialect.zep", 746); - ZEPHIR_CALL_METHOD(&right, this_ptr, "getsqlexpression", NULL, 59, &_1, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&right, this_ptr, "getsqlexpression", NULL, 46, &_1, &escapeChar, &bindCounts); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "CONVERT(", &left, " USING ", &right, ")"); RETURN_MM(); @@ -47520,7 +47554,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, getSqlExpressionFrom) { ZEPHIR_INIT_NVAR(&table); ZVAL_COPY(&table, _0$$3); - ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "getsqltable", &_3, 75, &table, &escapeChar); + ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "getsqltable", &_3, 62, &table, &escapeChar); zephir_check_call_status(); zephir_array_append(&tables, &_2$$4, PH_SEPARATE, "phalcon/Db/Dialect.zep", 765); } ZEND_HASH_FOREACH_END(); @@ -47535,7 +47569,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, getSqlExpressionFrom) } ZEPHIR_CALL_METHOD(&table, expression, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_4$$5, this_ptr, "getsqltable", &_3, 75, &table, &escapeChar); + ZEPHIR_CALL_METHOD(&_4$$5, this_ptr, "getsqltable", &_3, 62, &table, &escapeChar); zephir_check_call_status(); zephir_array_append(&tables, &_4$$5, PH_SEPARATE, "phalcon/Db/Dialect.zep", 765); ZEPHIR_CALL_METHOD(NULL, expression, "next", NULL, 0); @@ -47715,7 +47749,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, getSqlExpressionGroupBy) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Invalid SQL-GROUP-BY expression", "phalcon/Db/Dialect.zep", 834); return; } - ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "getsqlexpression", &_3, 59, &field, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "getsqlexpression", &_3, 46, &field, &escapeChar, &bindCounts); zephir_check_call_status(); zephir_array_append(&fields, &_4$$6, PH_SEPARATE, "phalcon/Db/Dialect.zep", 841); ZEPHIR_CALL_METHOD(NULL, expression, "next", NULL, 0); @@ -47866,7 +47900,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, getSqlExpressionJoins) { ZEPHIR_INIT_NVAR(&condition); ZVAL_COPY(&condition, _4$$6); - ZEPHIR_CALL_METHOD(&_6$$7, this_ptr, "getsqlexpression", &_3, 59, &condition, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&_6$$7, this_ptr, "getsqlexpression", &_3, 46, &condition, &escapeChar, &bindCounts); zephir_check_call_status(); zephir_array_append(&joinCondition, &_6$$7, PH_SEPARATE, "phalcon/Db/Dialect.zep", 900); } ZEND_HASH_FOREACH_END(); @@ -47881,7 +47915,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, getSqlExpressionJoins) } ZEPHIR_CALL_METHOD(&condition, &joinConditionsArray, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_7$$8, this_ptr, "getsqlexpression", &_3, 59, &condition, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&_7$$8, this_ptr, "getsqlexpression", &_3, 46, &condition, &escapeChar, &bindCounts); zephir_check_call_status(); zephir_array_append(&joinCondition, &_7$$8, PH_SEPARATE, "phalcon/Db/Dialect.zep", 900); ZEPHIR_CALL_METHOD(NULL, &joinConditionsArray, "next", NULL, 0); @@ -47906,7 +47940,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, getSqlExpressionJoins) zephir_concat_self_str(&joinType, SL(" ")); } zephir_array_fetch_string(&_10$$3, &join, SL("source"), PH_NOISY | PH_READONLY, "phalcon/Db/Dialect.zep", 913); - ZEPHIR_CALL_METHOD(&joinTable, this_ptr, "getsqltable", &_11, 75, &_10$$3, &escapeChar); + ZEPHIR_CALL_METHOD(&joinTable, this_ptr, "getsqltable", &_11, 62, &_10$$3, &escapeChar); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_12$$3); ZEPHIR_CONCAT_SVSVSV(&_12$$3, " ", &joinType, "JOIN ", &joinTable, " ON ", &joinCondition); @@ -47930,7 +47964,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, getSqlExpressionJoins) } if (_13$$11) { if (!(zephir_array_isset_long(&joinConditionsArray, 0))) { - ZEPHIR_CALL_METHOD(&joinCondition, this_ptr, "getsqlexpression", &_3, 59, &joinConditionsArray, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&joinCondition, this_ptr, "getsqlexpression", &_3, 46, &joinConditionsArray, &escapeChar, &bindCounts); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&joinCondition); @@ -47941,7 +47975,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, getSqlExpressionJoins) { ZEPHIR_INIT_NVAR(&condition); ZVAL_COPY(&condition, _14$$14); - ZEPHIR_CALL_METHOD(&_16$$15, this_ptr, "getsqlexpression", &_3, 59, &condition, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&_16$$15, this_ptr, "getsqlexpression", &_3, 46, &condition, &escapeChar, &bindCounts); zephir_check_call_status(); zephir_array_append(&joinCondition, &_16$$15, PH_SEPARATE, "phalcon/Db/Dialect.zep", 900); } ZEND_HASH_FOREACH_END(); @@ -47956,7 +47990,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, getSqlExpressionJoins) } ZEPHIR_CALL_METHOD(&condition, &joinConditionsArray, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_17$$16, this_ptr, "getsqlexpression", &_3, 59, &condition, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&_17$$16, this_ptr, "getsqlexpression", &_3, 46, &condition, &escapeChar, &bindCounts); zephir_check_call_status(); zephir_array_append(&joinCondition, &_17$$16, PH_SEPARATE, "phalcon/Db/Dialect.zep", 900); ZEPHIR_CALL_METHOD(NULL, &joinConditionsArray, "next", NULL, 0); @@ -47981,7 +48015,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, getSqlExpressionJoins) zephir_concat_self_str(&joinType, SL(" ")); } zephir_array_fetch_string(&_20$$11, &join, SL("source"), PH_NOISY | PH_READONLY, "phalcon/Db/Dialect.zep", 913); - ZEPHIR_CALL_METHOD(&joinTable, this_ptr, "getsqltable", &_11, 75, &_20$$11, &escapeChar); + ZEPHIR_CALL_METHOD(&joinTable, this_ptr, "getsqltable", &_11, 62, &_20$$11, &escapeChar); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_21$$11); ZEPHIR_CONCAT_SVSVSV(&_21$$11, " ", &joinType, "JOIN ", &joinTable, " ON ", &joinCondition); @@ -48068,7 +48102,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, getSqlExpressionLimit) _2$$4 = Z_TYPE_P(&offset) == IS_ARRAY; } if (_2$$4) { - ZEPHIR_CALL_METHOD(&_3$$7, this_ptr, "getsqlexpression", NULL, 59, &offset, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&_3$$7, this_ptr, "getsqlexpression", NULL, 46, &offset, &escapeChar, &bindCounts); zephir_check_call_status(); ZEPHIR_CPY_WRT(&offset, &_3$$7); } @@ -48174,7 +48208,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, getSqlExpressionList) } ZEPHIR_CALL_METHOD(&item, &values, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "getsqlexpression", &_5, 59, &item, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "getsqlexpression", &_5, 46, &item, &escapeChar, &bindCounts); zephir_check_call_status(); zephir_array_append(&items, &_6$$6, PH_SEPARATE, "phalcon/Db/Dialect.zep", 993); ZEPHIR_CALL_METHOD(NULL, &values, "next", NULL, 0); @@ -48361,7 +48395,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, getSqlExpressionOrderBy) return; } zephir_array_fetch_long(&_6$$7, &field, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Dialect.zep", 1053); - ZEPHIR_CALL_METHOD(&fieldSql, this_ptr, "getsqlexpression", &_3, 59, &_6$$7, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&fieldSql, this_ptr, "getsqlexpression", &_3, 46, &_6$$7, &escapeChar, &bindCounts); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&type); _7$$7 = zephir_array_isset_long_fetch(&type, &field, 1, 0); @@ -48477,7 +48511,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, getSqlExpressionScalar) if (zephir_array_isset_string(&expression, SL("column"))) { zephir_array_fetch_string(&_0$$3, &expression, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Db/Dialect.zep", 1107); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getsqlcolumn", NULL, 53, &_0$$3); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getsqlcolumn", NULL, 40, &_0$$3); zephir_check_call_status(); RETURN_MM(); } @@ -48550,7 +48584,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, getSqlExpressionUnaryOperations) ZEPHIR_OBS_VAR(&right); if (zephir_array_isset_string_fetch(&right, &expression, SL("right"), 0)) { zephir_array_fetch_string(&_2$$4, &expression, SL("op"), PH_NOISY | PH_READONLY, "phalcon/Db/Dialect.zep", 1145); - ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "getsqlexpression", NULL, 59, &right, &escapeChar, &bindCounts); + ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "getsqlexpression", NULL, 46, &right, &escapeChar, &bindCounts); zephir_check_call_status(); ZEPHIR_CONCAT_VSV(return_value, &_2$$4, " ", &_3$$4); RETURN_MM(); @@ -48655,7 +48689,7 @@ static PHP_METHOD(Phalcon_Db_Dialect, prepareColumnAlias) if (!ZEPHIR_IS_STRING(&alias, "")) { - ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "escape", NULL, 66, &alias, &escapeChar); + ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "escape", NULL, 53, &alias, &escapeChar); zephir_check_call_status(); ZEPHIR_CONCAT_VSV(return_value, &qualified, " AS ", &_0$$3); RETURN_MM(); @@ -48720,18 +48754,18 @@ static PHP_METHOD(Phalcon_Db_Dialect, prepareTable) } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "escape", NULL, 66, &table, &escapeChar); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "escape", NULL, 53, &table, &escapeChar); zephir_check_call_status(); zephir_get_strval(&table, &_0); if (!ZEPHIR_IS_STRING(&schema, "")) { - ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "escapeschema", NULL, 76, &schema, &escapeChar); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "escapeschema", NULL, 63, &schema, &escapeChar); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2$$3); ZEPHIR_CONCAT_VSV(&_2$$3, &_1$$3, ".", &table); zephir_get_strval(&table, &_2$$3); } if (!ZEPHIR_IS_STRING(&alias, "")) { - ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "escape", NULL, 66, &alias, &escapeChar); + ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "escape", NULL, 53, &alias, &escapeChar); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4$$4); ZEPHIR_CONCAT_VSV(&_4$$4, &table, " AS ", &_3$$4); @@ -48789,11 +48823,11 @@ static PHP_METHOD(Phalcon_Db_Dialect, prepareQualified) if (!ZEPHIR_IS_STRING(&domain, "")) { ZEPHIR_INIT_VAR(&_0$$3); ZEPHIR_CONCAT_VSV(&_0$$3, &domain, ".", &column); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "escape", NULL, 66, &_0$$3, &escapeChar); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "escape", NULL, 53, &_0$$3, &escapeChar); zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "escape", NULL, 66, &column, &escapeChar); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "escape", NULL, 53, &column, &escapeChar); zephir_check_call_status(); RETURN_MM(); } @@ -48921,6 +48955,8 @@ ZEPHIR_INIT_CLASS(Phalcon_Db_Enum) zephir_declare_class_constant_long(phalcon_db_enum_ce, SL("FETCH_UNIQUE"), 196608); + zephir_declare_class_constant_long(phalcon_db_enum_ce, SL("FETCH_DEFAULT"), 0); + return SUCCESS; } @@ -49180,19 +49216,19 @@ static PHP_METHOD(Phalcon_Db_Profiler, startProfile) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlstatement", NULL, 238, &sqlStatement); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlstatement", NULL, 211, &sqlStatement); zephir_check_call_status(); if (Z_TYPE_P(sqlVariables) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlvariables", NULL, 239, sqlVariables); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlvariables", NULL, 212, sqlVariables); zephir_check_call_status(); } if (Z_TYPE_P(sqlBindTypes) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlbindtypes", NULL, 240, sqlBindTypes); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlbindtypes", NULL, 213, sqlBindTypes); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_0, "hrtime", NULL, 222, &__$true); + ZEPHIR_CALL_FUNCTION(&_0, "hrtime", NULL, 195, &__$true); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setinitialtime", NULL, 241, &_0); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setinitialtime", NULL, 214, &_0); zephir_check_call_status(); if ((zephir_method_exists_ex(this_ptr, ZEND_STRL("beforestartprofile")) == SUCCESS)) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "beforestartprofile", NULL, 0, &activeProfile); @@ -49220,7 +49256,7 @@ static PHP_METHOD(Phalcon_Db_Profiler, stopProfile) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_FUNCTION(&finalTime, "hrtime", NULL, 222, &__$true); + ZEPHIR_CALL_FUNCTION(&finalTime, "hrtime", NULL, 195, &__$true); zephir_check_call_status(); zephir_read_property(&_0, this_ptr, ZEND_STRL("activeProfile"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&activeProfile, &_0); @@ -50236,7 +50272,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, describeIndexes) ZVAL_COPY(&indexColumns, _8); ZEPHIR_INIT_NVAR(&_12$$9); object_init_ex(&_12$$9, phalcon_db_index_ce); - ZEPHIR_CALL_METHOD(NULL, &_12$$9, "__construct", &_13, 32, &name, &indexColumns); + ZEPHIR_CALL_METHOD(NULL, &_12$$9, "__construct", &_13, 30, &name, &indexColumns); zephir_check_call_status(); zephir_array_update_zval(&indexObjects, &name, &_12$$9, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -50255,7 +50291,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, describeIndexes) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_14$$10); object_init_ex(&_14$$10, phalcon_db_index_ce); - ZEPHIR_CALL_METHOD(NULL, &_14$$10, "__construct", &_13, 32, &name, &indexColumns); + ZEPHIR_CALL_METHOD(NULL, &_14$$10, "__construct", &_13, 30, &name, &indexColumns); zephir_check_call_status(); zephir_array_update_zval(&indexObjects, &name, &_14$$10, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &indexes, "next", NULL, 0); @@ -50485,7 +50521,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, describeReferences) ZEPHIR_OBS_NVAR(&_26$$9); zephir_array_fetch_string(&_26$$9, &arrayReference, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/AbstractAdapter.zep", 413); zephir_array_update_string(&_25$$9, SL("referencedColumns"), &_26$$9, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &_24$$9, "__construct", &_27, 33, &name, &_25$$9); + ZEPHIR_CALL_METHOD(NULL, &_24$$9, "__construct", &_27, 31, &name, &_25$$9); zephir_check_call_status(); zephir_array_update_zval(&referenceObjects, &name, &_24$$9, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -50518,7 +50554,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, describeReferences) ZEPHIR_OBS_NVAR(&_30$$10); zephir_array_fetch_string(&_30$$10, &arrayReference, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/AbstractAdapter.zep", 413); zephir_array_update_string(&_29$$10, SL("referencedColumns"), &_30$$10, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &_28$$10, "__construct", &_27, 33, &name, &_29$$10); + ZEPHIR_CALL_METHOD(NULL, &_28$$10, "__construct", &_27, 31, &name, &_29$$10); zephir_check_call_status(); zephir_array_update_zval(&referenceObjects, &name, &_28$$10, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &references, "next", NULL, 0); @@ -51239,7 +51275,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getDefaultIdValue) object_init_ex(return_value, phalcon_db_rawvalue_ce); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "null"); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 34, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 32, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -51259,7 +51295,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getDefaultValue) object_init_ex(return_value, phalcon_db_rawvalue_ce); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "DEFAULT"); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 34, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 32, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -51418,7 +51454,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insert) object_init_ex(&_0$$3, phalcon_db_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZEPHIR_CONCAT_SVS(&_1$$3, "Unable to insert into ", &table, " without data"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 31, &_1$$3); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 29, &_1$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Db/Adapter/AbstractAdapter.zep", 810); ZEPHIR_MM_RESTORE(); @@ -52948,7 +52984,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_PdoFactory, load) array_init(&_2); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "options"); - ZEPHIR_CALL_METHOD(&options, &_1, "__invoke", NULL, 178, config, &_3, &_2); + ZEPHIR_CALL_METHOD(&options, &_1, "__invoke", NULL, 150, config, &_3, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "newinstance", NULL, 0, &name, &options); zephir_check_call_status(); @@ -53540,7 +53576,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, convertBoundParams) ZEPHIR_INIT_NVAR(&placeMatch); ZEPHIR_INIT_VAR(&_9$$3); ZVAL_STRING(&_9$$3, "?"); - ZEPHIR_CALL_FUNCTION(&boundSql, "preg_replace", NULL, 50, &bindPattern, &_9$$3, &sql); + ZEPHIR_CALL_FUNCTION(&boundSql, "preg_replace", NULL, 37, &bindPattern, &_9$$3, &sql); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&boundSql, &sql); @@ -53782,7 +53818,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, executePrepared) do { if (ZEPHIR_IS_LONG(&type, 1)) { ZVAL_LONG(&_6$$12, 10); - ZEPHIR_CALL_FUNCTION(&castValue, "intval", &_7, 51, &value, &_6$$12); + ZEPHIR_CALL_FUNCTION(&castValue, "intval", &_7, 38, &value, &_6$$12); zephir_check_call_status(); break; } @@ -53963,7 +53999,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, executePrepared) do { if (ZEPHIR_IS_LONG(&type, 1)) { ZVAL_LONG(&_26$$43, 10); - ZEPHIR_CALL_FUNCTION(&castValue, "intval", &_7, 51, &value, &_26$$43); + ZEPHIR_CALL_FUNCTION(&castValue, "intval", &_7, 38, &value, &_26$$43); zephir_check_call_status(); break; } @@ -54349,7 +54385,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, query) zephir_check_call_status(); } object_init_ex(return_value, phalcon_db_result_pdoresult_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 52, this_ptr, &statement, &sqlStatement, &bindParams, &bindTypes); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 39, this_ptr, &statement, &sqlStatement, &bindParams, &bindTypes); zephir_check_call_status(); RETURN_MM(); } @@ -54581,7 +54617,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, prepareRealSql) ZEPHIR_INIT_NVAR(&value); ZEPHIR_INIT_NVAR(&key); ZVAL_LONG(&_16$$3, 1); - ZEPHIR_CALL_FUNCTION(&result, "preg_replace", NULL, 50, &keys, &values, &statement, &_16$$3); + ZEPHIR_CALL_FUNCTION(&result, "preg_replace", NULL, 37, &keys, &values, &statement, &_16$$3); zephir_check_call_status(); } zephir_update_property_zval(this_ptr, ZEND_STRL("realSqlStatement"), &result); @@ -55183,7 +55219,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) zephir_array_fetch_long(&columnName, &field, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 495); ZEPHIR_INIT_NVAR(&_63$$3); object_init_ex(&_63$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_63$$3, "__construct", &_64, 233, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_63$$3, "__construct", &_64, 206, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_63$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Mysql.zep", 496); ZEPHIR_CPY_WRT(&oldColumn, &columnName); @@ -55485,7 +55521,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) zephir_array_fetch_long(&columnName, &field, 0, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 495); ZEPHIR_INIT_NVAR(&_124$$49); object_init_ex(&_124$$49, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_124$$49, "__construct", &_64, 233, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_124$$49, "__construct", &_64, 206, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_124$$49, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Mysql.zep", 496); ZEPHIR_CPY_WRT(&oldColumn, &columnName); @@ -55703,7 +55739,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes) object_init_ex(&_26$$19, phalcon_db_index_ce); zephir_array_fetch_string(&_27$$19, &index, SL("columns"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 551); zephir_array_fetch_string(&_28$$19, &index, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 553); - ZEPHIR_CALL_METHOD(NULL, &_26$$19, "__construct", &_29, 32, &name, &_27$$19, &_28$$19); + ZEPHIR_CALL_METHOD(NULL, &_26$$19, "__construct", &_29, 30, &name, &_27$$19, &_28$$19); zephir_check_call_status(); zephir_array_update_zval(&indexObjects, &name, &_26$$19, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -55724,7 +55760,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes) object_init_ex(&_30$$20, phalcon_db_index_ce); zephir_array_fetch_string(&_31$$20, &index, SL("columns"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 551); zephir_array_fetch_string(&_32$$20, &index, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 553); - ZEPHIR_CALL_METHOD(NULL, &_30$$20, "__construct", &_29, 32, &name, &_31$$20, &_32$$20); + ZEPHIR_CALL_METHOD(NULL, &_30$$20, "__construct", &_29, 30, &name, &_31$$20, &_32$$20); zephir_check_call_status(); zephir_array_update_zval(&indexObjects, &name, &_30$$20, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &indexes, "next", NULL, 0); @@ -55990,7 +56026,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeReferences) ZEPHIR_OBS_NVAR(&_30$$9); zephir_array_fetch_string(&_30$$9, &arrayReference, SL("onDelete"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 620); zephir_array_update_string(&_29$$9, SL("onDelete"), &_30$$9, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &_28$$9, "__construct", &_31, 33, &name, &_29$$9); + ZEPHIR_CALL_METHOD(NULL, &_28$$9, "__construct", &_31, 31, &name, &_29$$9); zephir_check_call_status(); zephir_array_update_zval(&referenceObjects, &name, &_28$$9, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -56029,7 +56065,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeReferences) ZEPHIR_OBS_NVAR(&_34$$10); zephir_array_fetch_string(&_34$$10, &arrayReference, SL("onDelete"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 620); zephir_array_update_string(&_33$$10, SL("onDelete"), &_34$$10, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &_32$$10, "__construct", &_31, 33, &name, &_33$$10); + ZEPHIR_CALL_METHOD(NULL, &_32$$10, "__construct", &_31, 31, &name, &_33$$10); zephir_check_call_status(); zephir_array_update_zval(&referenceObjects, &name, &_32$$10, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &references, "next", NULL, 0); @@ -56757,13 +56793,13 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Postgresql, describeColumns) ZVAL_STRING(&_52$$38, "/^'|'?::[[:alnum:][:space:]]+$/"); ZEPHIR_INIT_NVAR(&_53$$38); ZVAL_STRING(&_53$$38, ""); - ZEPHIR_CALL_FUNCTION(&_54$$38, "preg_replace", &_55, 50, &_52$$38, &_53$$38, &_51$$38); + ZEPHIR_CALL_FUNCTION(&_54$$38, "preg_replace", &_55, 37, &_52$$38, &_53$$38, &_51$$38); zephir_check_call_status(); zephir_array_update_string(&definition, SL("default"), &_54$$38, PH_COPY | PH_SEPARATE); zephir_array_fetch_string(&_56$$38, &definition, SL("default"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Postgresql.zep", 509); ZEPHIR_INIT_NVAR(&_52$$38); ZVAL_STRING(&_52$$38, "null"); - ZEPHIR_CALL_FUNCTION(&_57$$38, "strcasecmp", &_58, 47, &_56$$38, &_52$$38); + ZEPHIR_CALL_FUNCTION(&_57$$38, "strcasecmp", &_58, 34, &_56$$38, &_52$$38); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_57$$38, 0)) { zephir_array_update_string(&definition, SL("default"), &__$null, PH_COPY | PH_SEPARATE); @@ -56777,7 +56813,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Postgresql, describeColumns) zephir_array_fetch_long(&columnName, &field, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Postgresql.zep", 524); ZEPHIR_INIT_NVAR(&_61$$3); object_init_ex(&_61$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_61$$3, "__construct", &_62, 233, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_61$$3, "__construct", &_62, 206, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_61$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Postgresql.zep", 525); ZEPHIR_CPY_WRT(&oldColumn, &columnName); @@ -57055,13 +57091,13 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Postgresql, describeColumns) ZVAL_STRING(&_111$$76, "/^'|'?::[[:alnum:][:space:]]+$/"); ZEPHIR_INIT_NVAR(&_112$$76); ZVAL_STRING(&_112$$76, ""); - ZEPHIR_CALL_FUNCTION(&_113$$76, "preg_replace", &_55, 50, &_111$$76, &_112$$76, &_110$$76); + ZEPHIR_CALL_FUNCTION(&_113$$76, "preg_replace", &_55, 37, &_111$$76, &_112$$76, &_110$$76); zephir_check_call_status(); zephir_array_update_string(&definition, SL("default"), &_113$$76, PH_COPY | PH_SEPARATE); zephir_array_fetch_string(&_114$$76, &definition, SL("default"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Postgresql.zep", 509); ZEPHIR_INIT_NVAR(&_111$$76); ZVAL_STRING(&_111$$76, "null"); - ZEPHIR_CALL_FUNCTION(&_115$$76, "strcasecmp", &_58, 47, &_114$$76, &_111$$76); + ZEPHIR_CALL_FUNCTION(&_115$$76, "strcasecmp", &_58, 34, &_114$$76, &_111$$76); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_115$$76, 0)) { zephir_array_update_string(&definition, SL("default"), &__$null, PH_COPY | PH_SEPARATE); @@ -57076,7 +57112,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Postgresql, describeColumns) zephir_array_fetch_long(&columnName, &field, 0, PH_NOISY, "phalcon/Db/Adapter/Pdo/Postgresql.zep", 524); ZEPHIR_INIT_NVAR(&_118$$41); object_init_ex(&_118$$41, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_118$$41, "__construct", &_62, 233, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_118$$41, "__construct", &_62, 206, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_118$$41, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Postgresql.zep", 525); ZEPHIR_CPY_WRT(&oldColumn, &columnName); @@ -57342,7 +57378,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Postgresql, describeReferences) ZEPHIR_OBS_NVAR(&_30$$9); zephir_array_fetch_string(&_30$$9, &arrayReference, SL("onDelete"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Postgresql.zep", 593); zephir_array_update_string(&_29$$9, SL("onDelete"), &_30$$9, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &_28$$9, "__construct", &_31, 33, &name, &_29$$9); + ZEPHIR_CALL_METHOD(NULL, &_28$$9, "__construct", &_31, 31, &name, &_29$$9); zephir_check_call_status(); zephir_array_update_zval(&referenceObjects, &name, &_28$$9, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -57381,7 +57417,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Postgresql, describeReferences) ZEPHIR_OBS_NVAR(&_34$$10); zephir_array_fetch_string(&_34$$10, &arrayReference, SL("onDelete"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Postgresql.zep", 593); zephir_array_update_string(&_33$$10, SL("onDelete"), &_34$$10, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &_32$$10, "__construct", &_31, 33, &name, &_33$$10); + ZEPHIR_CALL_METHOD(NULL, &_32$$10, "__construct", &_31, 31, &name, &_33$$10); zephir_check_call_status(); zephir_array_update_zval(&referenceObjects, &name, &_32$$10, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &references, "next", NULL, 0); @@ -57408,7 +57444,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Postgresql, getDefaultIdValue) object_init_ex(return_value, phalcon_db_rawvalue_ce); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "DEFAULT"); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 34, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 32, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -57693,11 +57729,11 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, connect) static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) { - zend_bool _5$$3, _34$$3, _43$$28, _71$$28; + zend_bool _5$$3, _31$$3, _43$$28, _69$$28; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zephir_fcall_cache_entry *_33 = NULL, *_40 = NULL, *_41 = NULL; + zephir_fcall_cache_entry *_35 = NULL, *_40 = NULL, *_41 = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *table_param = NULL, *schema_param = NULL, __$true, __$false, columns, columnType, fields, field, definition, oldColumn, sizePattern, matches, matchOne, matchTwo, columnName, _0, _1, _2, *_3, _4, _28$$3, _29$$3, _30$$3, _31$$3, _32$$3, _35$$3, _6$$4, _7$$4, _8$$5, _9$$5, _10$$5, _11$$7, _12$$7, _13$$8, _14$$9, _15$$10, _16$$11, _17$$11, _18$$12, _19$$12, _20$$13, _21$$14, _22$$15, _23$$16, _24$$17, _25$$18, _26$$20, _27$$21, _36$$27, _37$$27, _38$$27, _39$$27, _42$$28, _66$$28, _67$$28, _68$$28, _69$$28, _70$$28, _72$$28, _44$$29, _45$$29, _46$$30, _47$$30, _48$$30, _49$$32, _50$$32, _51$$33, _52$$34, _53$$35, _54$$36, _55$$36, _56$$37, _57$$37, _58$$38, _59$$39, _60$$40, _61$$41, _62$$42, _63$$43, _64$$45, _65$$46, _73$$52, _74$$52, _75$$52, _76$$52; + zval *table_param = NULL, *schema_param = NULL, __$true, __$false, columns, columnType, fields, field, definition, oldColumn, sizePattern, matches, matchOne, matchTwo, columnName, _0, _1, _2, *_3, _4, _28$$3, _29$$3, _30$$3, _32$$3, _33$$3, _34$$3, _6$$4, _7$$4, _8$$5, _9$$5, _10$$5, _11$$7, _12$$7, _13$$8, _14$$9, _15$$10, _16$$11, _17$$11, _18$$12, _19$$12, _20$$13, _21$$14, _22$$15, _23$$16, _24$$17, _25$$18, _26$$20, _27$$21, _36$$27, _37$$27, _38$$27, _39$$27, _42$$28, _66$$28, _67$$28, _68$$28, _70$$28, _71$$28, _72$$28, _44$$29, _45$$29, _46$$30, _47$$30, _48$$30, _49$$32, _50$$32, _51$$33, _52$$34, _53$$35, _54$$36, _55$$36, _56$$37, _57$$37, _58$$38, _59$$39, _60$$40, _61$$41, _62$$42, _63$$43, _64$$45, _65$$46, _73$$52, _74$$52, _75$$52, _76$$52; zval table, schema; zval *this_ptr = getThis(); @@ -57723,9 +57759,9 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZVAL_UNDEF(&_28$$3); ZVAL_UNDEF(&_29$$3); ZVAL_UNDEF(&_30$$3); - ZVAL_UNDEF(&_31$$3); ZVAL_UNDEF(&_32$$3); - ZVAL_UNDEF(&_35$$3); + ZVAL_UNDEF(&_33$$3); + ZVAL_UNDEF(&_34$$3); ZVAL_UNDEF(&_6$$4); ZVAL_UNDEF(&_7$$4); ZVAL_UNDEF(&_8$$5); @@ -57756,8 +57792,8 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZVAL_UNDEF(&_66$$28); ZVAL_UNDEF(&_67$$28); ZVAL_UNDEF(&_68$$28); - ZVAL_UNDEF(&_69$$28); ZVAL_UNDEF(&_70$$28); + ZVAL_UNDEF(&_71$$28); ZVAL_UNDEF(&_72$$28); ZVAL_UNDEF(&_44$$29); ZVAL_UNDEF(&_45$$29); @@ -57833,7 +57869,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZVAL_LONG(&_2, 3); ZEPHIR_CALL_METHOD(&fields, this_ptr, "fetchall", NULL, 0, &_1, &_2); zephir_check_call_status(); - zephir_is_iterable(&fields, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 312); + zephir_is_iterable(&fields, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 311); if (Z_TYPE_P(&fields) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&fields), _3) { @@ -57843,12 +57879,12 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) zephir_create_array(&definition, 1, 0); add_assoc_long_ex(&definition, SL("bindType"), 2); ZEPHIR_OBS_NVAR(&columnType); - zephir_array_fetch_long(&columnType, &field, 2, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 128); - _5$$3 = zephir_memnstr_str(&columnType, SL("int"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 150); + zephir_array_fetch_long(&columnType, &field, 2, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 127); + _5$$3 = zephir_memnstr_str(&columnType, SL("int"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 149); if (!(_5$$3)) { - _5$$3 = zephir_memnstr_str(&columnType, SL("INT"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 150); + _5$$3 = zephir_memnstr_str(&columnType, SL("INT"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 149); } - if (zephir_memnstr_str(&columnType, SL("bigint"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 143)) { + if (zephir_memnstr_str(&columnType, SL("bigint"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 142)) { ZEPHIR_INIT_NVAR(&_6$$4); ZVAL_LONG(&_6$$4, 14); zephir_array_update_string(&definition, SL("type"), &_6$$4, PH_COPY | PH_SEPARATE); @@ -57864,11 +57900,11 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZEPHIR_INIT_NVAR(&_9$$5); ZVAL_LONG(&_9$$5, 1); zephir_array_update_string(&definition, SL("bindType"), &_9$$5, PH_COPY | PH_SEPARATE); - zephir_array_fetch_long(&_10$$5, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 158); + zephir_array_fetch_long(&_10$$5, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 157); if (zephir_is_true(&_10$$5)) { zephir_array_update_string(&definition, SL("autoIncrement"), &__$true, PH_COPY | PH_SEPARATE); } - } else if (zephir_memnstr_str(&columnType, SL("tinyint(1)"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 161)) { + } else if (zephir_memnstr_str(&columnType, SL("tinyint(1)"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 160)) { ZEPHIR_INIT_NVAR(&_11$$7); ZVAL_LONG(&_11$$7, 8); zephir_array_update_string(&definition, SL("type"), &_11$$7, PH_COPY | PH_SEPARATE); @@ -57877,19 +57913,19 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) zephir_array_update_string(&definition, SL("bindType"), &_12$$7, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&columnType); ZVAL_STRING(&columnType, "boolean"); - } else if (zephir_memnstr_str(&columnType, SL("enum"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 172)) { + } else if (zephir_memnstr_str(&columnType, SL("enum"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 171)) { ZEPHIR_INIT_NVAR(&_13$$8); ZVAL_LONG(&_13$$8, 5); zephir_array_update_string(&definition, SL("type"), &_13$$8, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("datetime"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 181)) { + } else if (zephir_memnstr_str(&columnType, SL("datetime"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 180)) { ZEPHIR_INIT_NVAR(&_14$$9); ZVAL_LONG(&_14$$9, 4); zephir_array_update_string(&definition, SL("type"), &_14$$9, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("date"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 186)) { + } else if (zephir_memnstr_str(&columnType, SL("date"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 185)) { ZEPHIR_INIT_NVAR(&_15$$10); ZVAL_LONG(&_15$$10, 1); zephir_array_update_string(&definition, SL("type"), &_15$$10, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("decimal"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 195)) { + } else if (zephir_memnstr_str(&columnType, SL("decimal"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 194)) { ZEPHIR_INIT_NVAR(&_16$$11); ZVAL_LONG(&_16$$11, 3); zephir_array_update_string(&definition, SL("type"), &_16$$11, PH_COPY | PH_SEPARATE); @@ -57897,7 +57933,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZEPHIR_INIT_NVAR(&_17$$11); ZVAL_LONG(&_17$$11, 32); zephir_array_update_string(&definition, SL("bindType"), &_17$$11, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("float"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 202)) { + } else if (zephir_memnstr_str(&columnType, SL("float"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 201)) { ZEPHIR_INIT_NVAR(&_18$$12); ZVAL_LONG(&_18$$12, 7); zephir_array_update_string(&definition, SL("type"), &_18$$12, PH_COPY | PH_SEPARATE); @@ -57905,19 +57941,19 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZEPHIR_INIT_NVAR(&_19$$12); ZVAL_LONG(&_19$$12, 3); zephir_array_update_string(&definition, SL("bindType"), &_19$$12, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("timestamp"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 213)) { + } else if (zephir_memnstr_str(&columnType, SL("timestamp"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 212)) { ZEPHIR_INIT_NVAR(&_20$$13); ZVAL_LONG(&_20$$13, 17); zephir_array_update_string(&definition, SL("type"), &_20$$13, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("varchar"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 222)) { + } else if (zephir_memnstr_str(&columnType, SL("varchar"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 221)) { ZEPHIR_INIT_NVAR(&_21$$14); ZVAL_LONG(&_21$$14, 2); zephir_array_update_string(&definition, SL("type"), &_21$$14, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("char"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 227)) { + } else if (zephir_memnstr_str(&columnType, SL("char"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 226)) { ZEPHIR_INIT_NVAR(&_22$$15); ZVAL_LONG(&_22$$15, 5); zephir_array_update_string(&definition, SL("type"), &_22$$15, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("text"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 232)) { + } else if (zephir_memnstr_str(&columnType, SL("text"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 231)) { ZEPHIR_INIT_NVAR(&_23$$16); ZVAL_LONG(&_23$$16, 6); zephir_array_update_string(&definition, SL("type"), &_23$$16, PH_COPY | PH_SEPARATE); @@ -57926,7 +57962,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZVAL_LONG(&_24$$17, 2); zephir_array_update_string(&definition, SL("type"), &_24$$17, PH_COPY | PH_SEPARATE); } - if (zephir_memnstr_str(&columnType, SL("("), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 249)) { + if (zephir_memnstr_str(&columnType, SL("("), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 248)) { ZEPHIR_INIT_NVAR(&matches); ZVAL_NULL(&matches); ZEPHIR_INIT_NVAR(&_25$$18); @@ -57946,7 +57982,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) } } } - if (zephir_memnstr_str(&columnType, SL("unsigned"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 265)) { + if (zephir_memnstr_str(&columnType, SL("unsigned"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 264)) { zephir_array_update_string(&definition, SL("unsigned"), &__$true, PH_COPY | PH_SEPARATE); } if (Z_TYPE_P(&oldColumn) == IS_NULL) { @@ -57954,40 +57990,41 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) } else { zephir_array_update_string(&definition, SL("after"), &oldColumn, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_28$$3, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 281); + zephir_array_fetch_long(&_28$$3, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 280); if (zephir_is_true(&_28$$3)) { zephir_array_update_string(&definition, SL("primary"), &__$true, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_29$$3, &field, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 288); + zephir_array_fetch_long(&_29$$3, &field, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 287); if (ZEPHIR_IS_LONG(&_29$$3, 0)) { zephir_array_update_string(&definition, SL("notNull"), &__$false, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_30$$3, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 296); - ZEPHIR_INIT_NVAR(&_31$$3); - ZVAL_STRING(&_31$$3, "null"); - ZEPHIR_CALL_FUNCTION(&_32$$3, "strcasecmp", &_33, 47, &_30$$3, &_31$$3); - zephir_check_call_status(); - _34$$3 = !ZEPHIR_IS_LONG(&_32$$3, 0); - if (_34$$3) { - zephir_array_fetch_long(&_35$$3, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 296); - _34$$3 = !ZEPHIR_IS_STRING(&_35$$3, ""); + ZEPHIR_OBS_NVAR(&_30$$3); + zephir_array_fetch_long(&_30$$3, &field, 4, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 295); + _31$$3 = !(ZEPHIR_IS_EMPTY(&_30$$3)); + if (_31$$3) { + zephir_array_fetch_long(&_32$$3, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 295); + ZEPHIR_INIT_NVAR(&_33$$3); + ZVAL_STRING(&_33$$3, "null"); + ZEPHIR_CALL_FUNCTION(&_34$$3, "strcasecmp", &_35, 34, &_32$$3, &_33$$3); + zephir_check_call_status(); + _31$$3 = !ZEPHIR_IS_LONG_IDENTICAL(&_34$$3, 0); } - if (_34$$3) { - zephir_array_fetch_long(&_36$$27, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 301); + if (_31$$3) { + zephir_array_fetch_long(&_36$$27, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 300); ZEPHIR_INIT_NVAR(&_37$$27); ZVAL_STRING(&_37$$27, "/^'|'$/"); ZEPHIR_INIT_NVAR(&_38$$27); ZVAL_STRING(&_38$$27, ""); - ZEPHIR_CALL_FUNCTION(&_39$$27, "preg_replace", &_40, 50, &_37$$27, &_38$$27, &_36$$27); + ZEPHIR_CALL_FUNCTION(&_39$$27, "preg_replace", &_40, 37, &_37$$27, &_38$$27, &_36$$27); zephir_check_call_status(); zephir_array_update_string(&definition, SL("default"), &_39$$27, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&columnName, &field, 1, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 307); - ZEPHIR_INIT_NVAR(&_31$$3); - object_init_ex(&_31$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_31$$3, "__construct", &_41, 233, &columnName, &definition); + zephir_array_fetch_long(&columnName, &field, 1, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 306); + ZEPHIR_INIT_NVAR(&_33$$3); + object_init_ex(&_33$$3, phalcon_db_column_ce); + ZEPHIR_CALL_METHOD(NULL, &_33$$3, "__construct", &_41, 206, &columnName, &definition); zephir_check_call_status(); - zephir_array_append(&columns, &_31$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 308); + zephir_array_append(&columns, &_33$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 307); ZEPHIR_CPY_WRT(&oldColumn, &columnName); } ZEND_HASH_FOREACH_END(); } else { @@ -58006,12 +58043,12 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) add_assoc_long_ex(&_42$$28, SL("bindType"), 2); ZEPHIR_CPY_WRT(&definition, &_42$$28); ZEPHIR_OBS_NVAR(&columnType); - zephir_array_fetch_long(&columnType, &field, 2, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 128); - _43$$28 = zephir_memnstr_str(&columnType, SL("int"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 150); + zephir_array_fetch_long(&columnType, &field, 2, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 127); + _43$$28 = zephir_memnstr_str(&columnType, SL("int"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 149); if (!(_43$$28)) { - _43$$28 = zephir_memnstr_str(&columnType, SL("INT"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 150); + _43$$28 = zephir_memnstr_str(&columnType, SL("INT"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 149); } - if (zephir_memnstr_str(&columnType, SL("bigint"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 143)) { + if (zephir_memnstr_str(&columnType, SL("bigint"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 142)) { ZEPHIR_INIT_NVAR(&_44$$29); ZVAL_LONG(&_44$$29, 14); zephir_array_update_string(&definition, SL("type"), &_44$$29, PH_COPY | PH_SEPARATE); @@ -58027,11 +58064,11 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZEPHIR_INIT_NVAR(&_47$$30); ZVAL_LONG(&_47$$30, 1); zephir_array_update_string(&definition, SL("bindType"), &_47$$30, PH_COPY | PH_SEPARATE); - zephir_array_fetch_long(&_48$$30, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 158); + zephir_array_fetch_long(&_48$$30, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 157); if (zephir_is_true(&_48$$30)) { zephir_array_update_string(&definition, SL("autoIncrement"), &__$true, PH_COPY | PH_SEPARATE); } - } else if (zephir_memnstr_str(&columnType, SL("tinyint(1)"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 161)) { + } else if (zephir_memnstr_str(&columnType, SL("tinyint(1)"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 160)) { ZEPHIR_INIT_NVAR(&_49$$32); ZVAL_LONG(&_49$$32, 8); zephir_array_update_string(&definition, SL("type"), &_49$$32, PH_COPY | PH_SEPARATE); @@ -58040,19 +58077,19 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) zephir_array_update_string(&definition, SL("bindType"), &_50$$32, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&columnType); ZVAL_STRING(&columnType, "boolean"); - } else if (zephir_memnstr_str(&columnType, SL("enum"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 172)) { + } else if (zephir_memnstr_str(&columnType, SL("enum"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 171)) { ZEPHIR_INIT_NVAR(&_51$$33); ZVAL_LONG(&_51$$33, 5); zephir_array_update_string(&definition, SL("type"), &_51$$33, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("datetime"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 181)) { + } else if (zephir_memnstr_str(&columnType, SL("datetime"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 180)) { ZEPHIR_INIT_NVAR(&_52$$34); ZVAL_LONG(&_52$$34, 4); zephir_array_update_string(&definition, SL("type"), &_52$$34, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("date"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 186)) { + } else if (zephir_memnstr_str(&columnType, SL("date"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 185)) { ZEPHIR_INIT_NVAR(&_53$$35); ZVAL_LONG(&_53$$35, 1); zephir_array_update_string(&definition, SL("type"), &_53$$35, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("decimal"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 195)) { + } else if (zephir_memnstr_str(&columnType, SL("decimal"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 194)) { ZEPHIR_INIT_NVAR(&_54$$36); ZVAL_LONG(&_54$$36, 3); zephir_array_update_string(&definition, SL("type"), &_54$$36, PH_COPY | PH_SEPARATE); @@ -58060,7 +58097,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZEPHIR_INIT_NVAR(&_55$$36); ZVAL_LONG(&_55$$36, 32); zephir_array_update_string(&definition, SL("bindType"), &_55$$36, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("float"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 202)) { + } else if (zephir_memnstr_str(&columnType, SL("float"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 201)) { ZEPHIR_INIT_NVAR(&_56$$37); ZVAL_LONG(&_56$$37, 7); zephir_array_update_string(&definition, SL("type"), &_56$$37, PH_COPY | PH_SEPARATE); @@ -58068,19 +58105,19 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZEPHIR_INIT_NVAR(&_57$$37); ZVAL_LONG(&_57$$37, 3); zephir_array_update_string(&definition, SL("bindType"), &_57$$37, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("timestamp"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 213)) { + } else if (zephir_memnstr_str(&columnType, SL("timestamp"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 212)) { ZEPHIR_INIT_NVAR(&_58$$38); ZVAL_LONG(&_58$$38, 17); zephir_array_update_string(&definition, SL("type"), &_58$$38, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("varchar"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 222)) { + } else if (zephir_memnstr_str(&columnType, SL("varchar"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 221)) { ZEPHIR_INIT_NVAR(&_59$$39); ZVAL_LONG(&_59$$39, 2); zephir_array_update_string(&definition, SL("type"), &_59$$39, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("char"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 227)) { + } else if (zephir_memnstr_str(&columnType, SL("char"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 226)) { ZEPHIR_INIT_NVAR(&_60$$40); ZVAL_LONG(&_60$$40, 5); zephir_array_update_string(&definition, SL("type"), &_60$$40, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("text"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 232)) { + } else if (zephir_memnstr_str(&columnType, SL("text"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 231)) { ZEPHIR_INIT_NVAR(&_61$$41); ZVAL_LONG(&_61$$41, 6); zephir_array_update_string(&definition, SL("type"), &_61$$41, PH_COPY | PH_SEPARATE); @@ -58089,7 +58126,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZVAL_LONG(&_62$$42, 2); zephir_array_update_string(&definition, SL("type"), &_62$$42, PH_COPY | PH_SEPARATE); } - if (zephir_memnstr_str(&columnType, SL("("), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 249)) { + if (zephir_memnstr_str(&columnType, SL("("), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 248)) { ZEPHIR_INIT_NVAR(&matches); ZVAL_NULL(&matches); ZEPHIR_INIT_NVAR(&_63$$43); @@ -58109,7 +58146,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) } } } - if (zephir_memnstr_str(&columnType, SL("unsigned"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 265)) { + if (zephir_memnstr_str(&columnType, SL("unsigned"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 264)) { zephir_array_update_string(&definition, SL("unsigned"), &__$true, PH_COPY | PH_SEPARATE); } if (Z_TYPE_P(&oldColumn) == IS_NULL) { @@ -58117,41 +58154,42 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) } else { zephir_array_update_string(&definition, SL("after"), &oldColumn, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_66$$28, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 281); + zephir_array_fetch_long(&_66$$28, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 280); if (zephir_is_true(&_66$$28)) { zephir_array_update_string(&definition, SL("primary"), &__$true, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_67$$28, &field, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 288); + zephir_array_fetch_long(&_67$$28, &field, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 287); if (ZEPHIR_IS_LONG(&_67$$28, 0)) { zephir_array_update_string(&definition, SL("notNull"), &__$false, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_68$$28, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 296); - ZEPHIR_INIT_NVAR(&_69$$28); - ZVAL_STRING(&_69$$28, "null"); - ZEPHIR_CALL_FUNCTION(&_70$$28, "strcasecmp", &_33, 47, &_68$$28, &_69$$28); - zephir_check_call_status(); - _71$$28 = !ZEPHIR_IS_LONG(&_70$$28, 0); - if (_71$$28) { - zephir_array_fetch_long(&_72$$28, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 296); - _71$$28 = !ZEPHIR_IS_STRING(&_72$$28, ""); + ZEPHIR_OBS_NVAR(&_68$$28); + zephir_array_fetch_long(&_68$$28, &field, 4, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 295); + _69$$28 = !(ZEPHIR_IS_EMPTY(&_68$$28)); + if (_69$$28) { + zephir_array_fetch_long(&_70$$28, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 295); + ZEPHIR_INIT_NVAR(&_71$$28); + ZVAL_STRING(&_71$$28, "null"); + ZEPHIR_CALL_FUNCTION(&_72$$28, "strcasecmp", &_35, 34, &_70$$28, &_71$$28); + zephir_check_call_status(); + _69$$28 = !ZEPHIR_IS_LONG_IDENTICAL(&_72$$28, 0); } - if (_71$$28) { - zephir_array_fetch_long(&_73$$52, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 301); + if (_69$$28) { + zephir_array_fetch_long(&_73$$52, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 300); ZEPHIR_INIT_NVAR(&_74$$52); ZVAL_STRING(&_74$$52, "/^'|'$/"); ZEPHIR_INIT_NVAR(&_75$$52); ZVAL_STRING(&_75$$52, ""); - ZEPHIR_CALL_FUNCTION(&_76$$52, "preg_replace", &_40, 50, &_74$$52, &_75$$52, &_73$$52); + ZEPHIR_CALL_FUNCTION(&_76$$52, "preg_replace", &_40, 37, &_74$$52, &_75$$52, &_73$$52); zephir_check_call_status(); zephir_array_update_string(&definition, SL("default"), &_76$$52, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_NVAR(&columnName); - zephir_array_fetch_long(&columnName, &field, 1, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 307); - ZEPHIR_INIT_NVAR(&_69$$28); - object_init_ex(&_69$$28, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_69$$28, "__construct", &_41, 233, &columnName, &definition); + zephir_array_fetch_long(&columnName, &field, 1, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 306); + ZEPHIR_INIT_NVAR(&_71$$28); + object_init_ex(&_71$$28, phalcon_db_column_ce); + ZEPHIR_CALL_METHOD(NULL, &_71$$28, "__construct", &_41, 206, &columnName, &definition); zephir_check_call_status(); - zephir_array_append(&columns, &_69$$28, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 308); + zephir_array_append(&columns, &_71$$28, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 307); ZEPHIR_CPY_WRT(&oldColumn, &columnName); ZEPHIR_CALL_METHOD(NULL, &fields, "next", NULL, 0); zephir_check_call_status(); @@ -58274,27 +58312,27 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) ZVAL_LONG(&_3, 2); ZEPHIR_CALL_METHOD(&_0, this_ptr, "fetchall", NULL, 0, &_2, &_3); zephir_check_call_status(); - zephir_is_iterable(&_0, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 370); + zephir_is_iterable(&_0, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 369); if (Z_TYPE_P(&_0) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _4) { ZEPHIR_INIT_NVAR(&index); ZVAL_COPY(&index, _4); ZEPHIR_OBS_NVAR(&keyName); - zephir_array_fetch_string(&keyName, &index, SL("name"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 332); + zephir_array_fetch_string(&keyName, &index, SL("name"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 331); if (!(zephir_array_isset(&indexes, &keyName))) { ZEPHIR_INIT_NVAR(&_6$$4); array_init(&_6$$4); zephir_array_update_zval(&indexes, &keyName, &_6$$4, PH_COPY | PH_SEPARATE); } - zephir_array_fetch(&_7$$3, &indexes, &keyName, PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 338); + zephir_array_fetch(&_7$$3, &indexes, &keyName, PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 337); if (!(zephir_array_isset_string(&_7$$3, SL("columns")))) { ZEPHIR_INIT_NVAR(&columns); array_init(&columns); } else { - zephir_array_fetch(&_8$$6, &indexes, &keyName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 341); + zephir_array_fetch(&_8$$6, &indexes, &keyName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 340); ZEPHIR_OBS_NVAR(&columns); - zephir_array_fetch_string(&columns, &_8$$6, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 341); + zephir_array_fetch_string(&columns, &_8$$6, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 340); } zephir_read_property(&_9$$3, this_ptr, ZEND_STRL("dialect"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&_10$$3, &_9$$3, "describeindex", NULL, 0, &keyName); @@ -58302,14 +58340,14 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) ZVAL_LONG(&_11$$3, 2); ZEPHIR_CALL_METHOD(&describeIndexes, this_ptr, "fetchall", NULL, 0, &_10$$3, &_11$$3); zephir_check_call_status(); - zephir_is_iterable(&describeIndexes, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 353); + zephir_is_iterable(&describeIndexes, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 352); if (Z_TYPE_P(&describeIndexes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&describeIndexes), _12$$3) { ZEPHIR_INIT_NVAR(&describeIndex); ZVAL_COPY(&describeIndex, _12$$3); - zephir_array_fetch_string(&_14$$7, &describeIndex, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 350); - zephir_array_append(&columns, &_14$$7, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 350); + zephir_array_fetch_string(&_14$$7, &describeIndex, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 349); + zephir_array_append(&columns, &_14$$7, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 349); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &describeIndexes, "rewind", NULL, 0); @@ -58322,8 +58360,8 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) } ZEPHIR_CALL_METHOD(&describeIndex, &describeIndexes, "current", NULL, 0); zephir_check_call_status(); - zephir_array_fetch_string(&_15$$8, &describeIndex, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 350); - zephir_array_append(&columns, &_15$$8, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 350); + zephir_array_fetch_string(&_15$$8, &describeIndex, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 349); + zephir_array_append(&columns, &_15$$8, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 349); ZEPHIR_CALL_METHOD(NULL, &describeIndexes, "next", NULL, 0); zephir_check_call_status(); } @@ -58335,7 +58373,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&indexSql, this_ptr, "fetchcolumn", &_17, 0, &_16$$3); zephir_check_call_status(); - zephir_array_fetch_string(&_18$$3, &index, SL("unique"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 359); + zephir_array_fetch_string(&_18$$3, &index, SL("unique"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 358); if (zephir_is_true(&_18$$3)) { ZEPHIR_INIT_NVAR(&_19$$9); ZEPHIR_INIT_NVAR(&_20$$9); @@ -58369,20 +58407,20 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) ZEPHIR_CALL_METHOD(&index, &_0, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&keyName); - zephir_array_fetch_string(&keyName, &index, SL("name"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 332); + zephir_array_fetch_string(&keyName, &index, SL("name"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 331); if (!(zephir_array_isset(&indexes, &keyName))) { ZEPHIR_INIT_NVAR(&_25$$14); array_init(&_25$$14); zephir_array_update_zval(&indexes, &keyName, &_25$$14, PH_COPY | PH_SEPARATE); } - zephir_array_fetch(&_26$$13, &indexes, &keyName, PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 338); + zephir_array_fetch(&_26$$13, &indexes, &keyName, PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 337); if (!(zephir_array_isset_string(&_26$$13, SL("columns")))) { ZEPHIR_INIT_NVAR(&columns); array_init(&columns); } else { - zephir_array_fetch(&_27$$16, &indexes, &keyName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 341); + zephir_array_fetch(&_27$$16, &indexes, &keyName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 340); ZEPHIR_OBS_NVAR(&columns); - zephir_array_fetch_string(&columns, &_27$$16, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 341); + zephir_array_fetch_string(&columns, &_27$$16, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 340); } zephir_read_property(&_28$$13, this_ptr, ZEND_STRL("dialect"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&_29$$13, &_28$$13, "describeindex", NULL, 0, &keyName); @@ -58390,14 +58428,14 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) ZVAL_LONG(&_30$$13, 2); ZEPHIR_CALL_METHOD(&describeIndexes, this_ptr, "fetchall", NULL, 0, &_29$$13, &_30$$13); zephir_check_call_status(); - zephir_is_iterable(&describeIndexes, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 353); + zephir_is_iterable(&describeIndexes, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 352); if (Z_TYPE_P(&describeIndexes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&describeIndexes), _31$$13) { ZEPHIR_INIT_NVAR(&describeIndex); ZVAL_COPY(&describeIndex, _31$$13); - zephir_array_fetch_string(&_33$$17, &describeIndex, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 350); - zephir_array_append(&columns, &_33$$17, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 350); + zephir_array_fetch_string(&_33$$17, &describeIndex, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 349); + zephir_array_append(&columns, &_33$$17, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 349); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &describeIndexes, "rewind", NULL, 0); @@ -58410,8 +58448,8 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) } ZEPHIR_CALL_METHOD(&describeIndex, &describeIndexes, "current", NULL, 0); zephir_check_call_status(); - zephir_array_fetch_string(&_34$$18, &describeIndex, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 350); - zephir_array_append(&columns, &_34$$18, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 350); + zephir_array_fetch_string(&_34$$18, &describeIndex, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 349); + zephir_array_append(&columns, &_34$$18, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 349); ZEPHIR_CALL_METHOD(NULL, &describeIndexes, "next", NULL, 0); zephir_check_call_status(); } @@ -58423,7 +58461,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&indexSql, this_ptr, "fetchcolumn", &_17, 0, &_35$$13); zephir_check_call_status(); - zephir_array_fetch_string(&_36$$13, &index, SL("unique"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 359); + zephir_array_fetch_string(&_36$$13, &index, SL("unique"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 358); if (zephir_is_true(&_36$$13)) { ZEPHIR_INIT_NVAR(&_37$$19); ZEPHIR_INIT_NVAR(&_38$$19); @@ -58451,7 +58489,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) ZEPHIR_INIT_NVAR(&index); ZEPHIR_INIT_VAR(&indexObjects); array_init(&indexObjects); - zephir_is_iterable(&indexes, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 380); + zephir_is_iterable(&indexes, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 379); if (Z_TYPE_P(&indexes) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&indexes), _45, _46, _43) { @@ -58465,9 +58503,9 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) ZVAL_COPY(&index, _43); ZEPHIR_INIT_NVAR(&_47$$23); object_init_ex(&_47$$23, phalcon_db_index_ce); - zephir_array_fetch_string(&_48$$23, &index, SL("columns"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 375); - zephir_array_fetch_string(&_49$$23, &index, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 377); - ZEPHIR_CALL_METHOD(NULL, &_47$$23, "__construct", &_50, 32, &name, &_48$$23, &_49$$23); + zephir_array_fetch_string(&_48$$23, &index, SL("columns"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 374); + zephir_array_fetch_string(&_49$$23, &index, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 376); + ZEPHIR_CALL_METHOD(NULL, &_47$$23, "__construct", &_50, 30, &name, &_48$$23, &_49$$23); zephir_check_call_status(); zephir_array_update_zval(&indexObjects, &name, &_47$$23, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -58486,9 +58524,9 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_51$$24); object_init_ex(&_51$$24, phalcon_db_index_ce); - zephir_array_fetch_string(&_52$$24, &index, SL("columns"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 375); - zephir_array_fetch_string(&_53$$24, &index, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 377); - ZEPHIR_CALL_METHOD(NULL, &_51$$24, "__construct", &_50, 32, &name, &_52$$24, &_53$$24); + zephir_array_fetch_string(&_52$$24, &index, SL("columns"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 374); + zephir_array_fetch_string(&_53$$24, &index, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 376); + ZEPHIR_CALL_METHOD(NULL, &_51$$24, "__construct", &_50, 30, &name, &_52$$24, &_53$$24); zephir_check_call_status(); zephir_array_update_zval(&indexObjects, &name, &_51$$24, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &indexes, "next", NULL, 0); @@ -58595,7 +58633,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeReferences) ZVAL_LONG(&_3, 3); ZEPHIR_CALL_METHOD(&_0, this_ptr, "fetchall", NULL, 0, &_2, &_3); zephir_check_call_status(); - zephir_is_iterable(&_0, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 420); + zephir_is_iterable(&_0, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 419); if (Z_TYPE_P(&_0) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_0), _6, _7, _4) { @@ -58613,29 +58651,29 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeReferences) ZEPHIR_INIT_NVAR(&referencedSchema); ZVAL_NULL(&referencedSchema); ZEPHIR_OBS_NVAR(&referencedTable); - zephir_array_fetch_long(&referencedTable, &reference, 2, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 399); + zephir_array_fetch_long(&referencedTable, &reference, 2, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 398); ZEPHIR_INIT_NVAR(&columns); array_init(&columns); ZEPHIR_INIT_NVAR(&referencedColumns); array_init(&referencedColumns); } else { - zephir_array_fetch(&_8$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 403); + zephir_array_fetch(&_8$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 402); ZEPHIR_OBS_NVAR(&referencedSchema); - zephir_array_fetch_string(&referencedSchema, &_8$$5, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 403); - zephir_array_fetch(&_9$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 404); + zephir_array_fetch_string(&referencedSchema, &_8$$5, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 402); + zephir_array_fetch(&_9$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 403); ZEPHIR_OBS_NVAR(&referencedTable); - zephir_array_fetch_string(&referencedTable, &_9$$5, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 404); - zephir_array_fetch(&_10$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 405); + zephir_array_fetch_string(&referencedTable, &_9$$5, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 403); + zephir_array_fetch(&_10$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 404); ZEPHIR_OBS_NVAR(&columns); - zephir_array_fetch_string(&columns, &_10$$5, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 405); - zephir_array_fetch(&_11$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 406); + zephir_array_fetch_string(&columns, &_10$$5, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 404); + zephir_array_fetch(&_11$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 405); ZEPHIR_OBS_NVAR(&referencedColumns); - zephir_array_fetch_string(&referencedColumns, &_11$$5, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 406); + zephir_array_fetch_string(&referencedColumns, &_11$$5, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 405); } - zephir_array_fetch_long(&_12$$3, &reference, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 409); - zephir_array_append(&columns, &_12$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 409); - zephir_array_fetch_long(&_13$$3, &reference, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 410); - zephir_array_append(&referencedColumns, &_13$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 410); + zephir_array_fetch_long(&_12$$3, &reference, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 408); + zephir_array_append(&columns, &_12$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 408); + zephir_array_fetch_long(&_13$$3, &reference, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 409); + zephir_array_append(&referencedColumns, &_13$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 409); ZEPHIR_INIT_NVAR(&_14$$3); zephir_create_array(&_14$$3, 4, 0); zephir_array_update_string(&_14$$3, SL("referencedSchema"), &referencedSchema, PH_COPY | PH_SEPARATE); @@ -58663,29 +58701,29 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeReferences) ZEPHIR_INIT_NVAR(&referencedSchema); ZVAL_NULL(&referencedSchema); ZEPHIR_OBS_NVAR(&referencedTable); - zephir_array_fetch_long(&referencedTable, &reference, 2, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 399); + zephir_array_fetch_long(&referencedTable, &reference, 2, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 398); ZEPHIR_INIT_NVAR(&columns); array_init(&columns); ZEPHIR_INIT_NVAR(&referencedColumns); array_init(&referencedColumns); } else { - zephir_array_fetch(&_15$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 403); + zephir_array_fetch(&_15$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 402); ZEPHIR_OBS_NVAR(&referencedSchema); - zephir_array_fetch_string(&referencedSchema, &_15$$8, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 403); - zephir_array_fetch(&_16$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 404); + zephir_array_fetch_string(&referencedSchema, &_15$$8, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 402); + zephir_array_fetch(&_16$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 403); ZEPHIR_OBS_NVAR(&referencedTable); - zephir_array_fetch_string(&referencedTable, &_16$$8, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 404); - zephir_array_fetch(&_17$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 405); + zephir_array_fetch_string(&referencedTable, &_16$$8, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 403); + zephir_array_fetch(&_17$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 404); ZEPHIR_OBS_NVAR(&columns); - zephir_array_fetch_string(&columns, &_17$$8, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 405); - zephir_array_fetch(&_18$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 406); + zephir_array_fetch_string(&columns, &_17$$8, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 404); + zephir_array_fetch(&_18$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 405); ZEPHIR_OBS_NVAR(&referencedColumns); - zephir_array_fetch_string(&referencedColumns, &_18$$8, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 406); + zephir_array_fetch_string(&referencedColumns, &_18$$8, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 405); } - zephir_array_fetch_long(&_19$$6, &reference, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 409); - zephir_array_append(&columns, &_19$$6, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 409); - zephir_array_fetch_long(&_20$$6, &reference, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 410); - zephir_array_append(&referencedColumns, &_20$$6, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 410); + zephir_array_fetch_long(&_19$$6, &reference, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 408); + zephir_array_append(&columns, &_19$$6, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 408); + zephir_array_fetch_long(&_20$$6, &reference, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 409); + zephir_array_append(&referencedColumns, &_20$$6, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 409); ZEPHIR_INIT_NVAR(&_21$$6); zephir_create_array(&_21$$6, 4, 0); zephir_array_update_string(&_21$$6, SL("referencedSchema"), &referencedSchema, PH_COPY | PH_SEPARATE); @@ -58701,7 +58739,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeReferences) ZEPHIR_INIT_NVAR(&number); ZEPHIR_INIT_VAR(&referenceObjects); array_init(&referenceObjects); - zephir_is_iterable(&references, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 434); + zephir_is_iterable(&references, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 433); if (Z_TYPE_P(&references) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&references), _24, _25, _22) { @@ -58718,18 +58756,18 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeReferences) ZEPHIR_INIT_NVAR(&_27$$9); zephir_create_array(&_27$$9, 4, 0); ZEPHIR_OBS_NVAR(&_28$$9); - zephir_array_fetch_string(&_28$$9, &arrayReference, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 426); + zephir_array_fetch_string(&_28$$9, &arrayReference, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 425); zephir_array_update_string(&_27$$9, SL("referencedSchema"), &_28$$9, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_28$$9); - zephir_array_fetch_string(&_28$$9, &arrayReference, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 427); + zephir_array_fetch_string(&_28$$9, &arrayReference, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 426); zephir_array_update_string(&_27$$9, SL("referencedTable"), &_28$$9, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_28$$9); - zephir_array_fetch_string(&_28$$9, &arrayReference, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 428); + zephir_array_fetch_string(&_28$$9, &arrayReference, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 427); zephir_array_update_string(&_27$$9, SL("columns"), &_28$$9, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_28$$9); - zephir_array_fetch_string(&_28$$9, &arrayReference, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 430); + zephir_array_fetch_string(&_28$$9, &arrayReference, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 429); zephir_array_update_string(&_27$$9, SL("referencedColumns"), &_28$$9, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &_26$$9, "__construct", &_29, 33, &name, &_27$$9); + ZEPHIR_CALL_METHOD(NULL, &_26$$9, "__construct", &_29, 31, &name, &_27$$9); zephir_check_call_status(); zephir_array_update_zval(&referenceObjects, &name, &_26$$9, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -58751,18 +58789,18 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeReferences) ZEPHIR_INIT_NVAR(&_31$$10); zephir_create_array(&_31$$10, 4, 0); ZEPHIR_OBS_NVAR(&_32$$10); - zephir_array_fetch_string(&_32$$10, &arrayReference, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 426); + zephir_array_fetch_string(&_32$$10, &arrayReference, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 425); zephir_array_update_string(&_31$$10, SL("referencedSchema"), &_32$$10, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_32$$10); - zephir_array_fetch_string(&_32$$10, &arrayReference, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 427); + zephir_array_fetch_string(&_32$$10, &arrayReference, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 426); zephir_array_update_string(&_31$$10, SL("referencedTable"), &_32$$10, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_32$$10); - zephir_array_fetch_string(&_32$$10, &arrayReference, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 428); + zephir_array_fetch_string(&_32$$10, &arrayReference, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 427); zephir_array_update_string(&_31$$10, SL("columns"), &_32$$10, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_32$$10); - zephir_array_fetch_string(&_32$$10, &arrayReference, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 430); + zephir_array_fetch_string(&_32$$10, &arrayReference, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 429); zephir_array_update_string(&_31$$10, SL("referencedColumns"), &_32$$10, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &_30$$10, "__construct", &_29, 33, &name, &_31$$10); + ZEPHIR_CALL_METHOD(NULL, &_30$$10, "__construct", &_29, 31, &name, &_31$$10); zephir_check_call_status(); zephir_array_update_zval(&referenceObjects, &name, &_30$$10, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &references, "next", NULL, 0); @@ -58789,7 +58827,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, getDefaultValue) object_init_ex(return_value, phalcon_db_rawvalue_ce); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "NULL"); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 34, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 32, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -58935,7 +58973,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, addColumn) } _8$$5 = _7$$5; if (!(_8$$5)) { - ZEPHIR_CALL_FUNCTION(&_9$$5, "is_float", NULL, 234, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_9$$5, "is_float", NULL, 207, &defaultValue); zephir_check_call_status(); _8$$5 = zephir_is_true(&_9$$5); } @@ -58946,7 +58984,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, addColumn) } else { ZEPHIR_INIT_VAR(&_11$$7); ZVAL_STRING(&_11$$7, "\""); - ZEPHIR_CALL_FUNCTION(&_12$$7, "addcslashes", NULL, 235, &defaultValue, &_11$$7); + ZEPHIR_CALL_FUNCTION(&_12$$7, "addcslashes", NULL, 208, &defaultValue, &_11$$7); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_13$$7); ZEPHIR_CONCAT_SVS(&_13$$7, " DEFAULT \"", &_12$$7, "\""); @@ -59051,7 +59089,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, addForeignKey) } ZEPHIR_CALL_METHOD(&_6, reference, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_5, this_ptr, "getcolumnlist", NULL, 67, &_6); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "getcolumnlist", NULL, 54, &_6); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_8, reference, "getreferencedtable", NULL, 0); zephir_check_call_status(); @@ -59061,7 +59099,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, addForeignKey) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_11, reference, "getreferencedcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_10, this_ptr, "getcolumnlist", NULL, 67, &_11); + ZEPHIR_CALL_METHOD(&_10, this_ptr, "getcolumnlist", NULL, 54, &_11); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_12); ZEPHIR_CONCAT_SVSVSVS(&_12, " FOREIGN KEY (", &_5, ") REFERENCES ", &_7, "(", &_10, ")"); @@ -59153,7 +59191,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, addIndex) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_5, index, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "getcolumnlist", NULL, 67, &_5); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "getcolumnlist", NULL, 54, &_5); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6); ZEPHIR_CONCAT_SVSVS(&_6, "`", &_3, "` (", &_4, ")"); @@ -59211,7 +59249,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, addPrimaryKey) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_2, index, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "getcolumnlist", NULL, 67, &_2); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getcolumnlist", NULL, 54, &_2); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "ALTER TABLE ", &_0, " ADD PRIMARY KEY (", &_1, ")"); RETURN_MM(); @@ -59422,7 +59460,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) } _11$$10 = _10$$10; if (!(_11$$10)) { - ZEPHIR_CALL_FUNCTION(&_12$$10, "is_float", &_13, 234, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_12$$10, "is_float", &_13, 207, &defaultValue); zephir_check_call_status(); _11$$10 = zephir_is_true(&_12$$10); } @@ -59433,7 +59471,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) } else { ZEPHIR_INIT_NVAR(&_15$$12); ZVAL_STRING(&_15$$12, "\""); - ZEPHIR_CALL_FUNCTION(&_16$$12, "addcslashes", &_17, 235, &defaultValue, &_15$$12); + ZEPHIR_CALL_FUNCTION(&_16$$12, "addcslashes", &_17, 208, &defaultValue, &_15$$12); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_18$$12); ZEPHIR_CONCAT_SVS(&_18$$12, " DEFAULT \"", &_16$$12, "\""); @@ -59502,7 +59540,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) } _30$$19 = _29$$19; if (!(_30$$19)) { - ZEPHIR_CALL_FUNCTION(&_31$$19, "is_float", &_13, 234, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_31$$19, "is_float", &_13, 207, &defaultValue); zephir_check_call_status(); _30$$19 = zephir_is_true(&_31$$19); } @@ -59513,7 +59551,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) } else { ZEPHIR_INIT_NVAR(&_33$$21); ZVAL_STRING(&_33$$21, "\""); - ZEPHIR_CALL_FUNCTION(&_34$$21, "addcslashes", &_17, 235, &defaultValue, &_33$$21); + ZEPHIR_CALL_FUNCTION(&_34$$21, "addcslashes", &_17, 208, &defaultValue, &_33$$21); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_35$$21); ZEPHIR_CONCAT_SVS(&_35$$21, " DEFAULT \"", &_34$$21, "\""); @@ -59560,7 +59598,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) if (ZEPHIR_IS_STRING(&indexName, "PRIMARY")) { ZEPHIR_CALL_METHOD(&_44$$27, &index, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_43$$27, this_ptr, "getcolumnlist", &_45, 67, &_44$$27); + ZEPHIR_CALL_METHOD(&_43$$27, this_ptr, "getcolumnlist", &_45, 54, &_44$$27); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_46$$27); ZEPHIR_CONCAT_SVS(&_46$$27, "PRIMARY KEY (", &_43$$27, ")"); @@ -59569,7 +59607,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) if (!(ZEPHIR_IS_EMPTY(&indexType))) { ZEPHIR_CALL_METHOD(&_48$$29, &index, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_47$$29, this_ptr, "getcolumnlist", &_45, 67, &_48$$29); + ZEPHIR_CALL_METHOD(&_47$$29, this_ptr, "getcolumnlist", &_45, 54, &_48$$29); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_49$$29); ZEPHIR_CONCAT_VSVSVS(&_49$$29, &indexType, " KEY `", &indexName, "` (", &_47$$29, ")"); @@ -59577,7 +59615,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) } else { ZEPHIR_CALL_METHOD(&_51$$30, &index, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_50$$30, this_ptr, "getcolumnlist", &_45, 67, &_51$$30); + ZEPHIR_CALL_METHOD(&_50$$30, this_ptr, "getcolumnlist", &_45, 54, &_51$$30); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_52$$30); ZEPHIR_CONCAT_SVSVS(&_52$$30, "KEY `", &indexName, "` (", &_50$$30, ")"); @@ -59604,7 +59642,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) if (ZEPHIR_IS_STRING(&indexName, "PRIMARY")) { ZEPHIR_CALL_METHOD(&_54$$32, &index, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_53$$32, this_ptr, "getcolumnlist", &_45, 67, &_54$$32); + ZEPHIR_CALL_METHOD(&_53$$32, this_ptr, "getcolumnlist", &_45, 54, &_54$$32); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_55$$32); ZEPHIR_CONCAT_SVS(&_55$$32, "PRIMARY KEY (", &_53$$32, ")"); @@ -59613,7 +59651,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) if (!(ZEPHIR_IS_EMPTY(&indexType))) { ZEPHIR_CALL_METHOD(&_57$$34, &index, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_56$$34, this_ptr, "getcolumnlist", &_45, 67, &_57$$34); + ZEPHIR_CALL_METHOD(&_56$$34, this_ptr, "getcolumnlist", &_45, 54, &_57$$34); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_58$$34); ZEPHIR_CONCAT_VSVSVS(&_58$$34, &indexType, " KEY `", &indexName, "` (", &_56$$34, ")"); @@ -59621,7 +59659,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) } else { ZEPHIR_CALL_METHOD(&_60$$35, &index, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_59$$35, this_ptr, "getcolumnlist", &_45, 67, &_60$$35); + ZEPHIR_CALL_METHOD(&_59$$35, this_ptr, "getcolumnlist", &_45, 54, &_60$$35); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_61$$35); ZEPHIR_CONCAT_SVSVS(&_61$$35, "KEY `", &indexName, "` (", &_59$$35, ")"); @@ -59647,7 +59685,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_66$$37, &reference, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_65$$37, this_ptr, "getcolumnlist", &_45, 67, &_66$$37); + ZEPHIR_CALL_METHOD(&_65$$37, this_ptr, "getcolumnlist", &_45, 54, &_66$$37); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_68$$37, &reference, "getreferencedtable", NULL, 0); zephir_check_call_status(); @@ -59657,7 +59695,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_71$$37, &reference, "getreferencedcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_70$$37, this_ptr, "getcolumnlist", &_45, 67, &_71$$37); + ZEPHIR_CALL_METHOD(&_70$$37, this_ptr, "getcolumnlist", &_45, 54, &_71$$37); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_72$$37); ZEPHIR_CONCAT_SVSVSSVSVS(&_72$$37, "CONSTRAINT `", &_64$$37, "` FOREIGN KEY (", &_65$$37, ")", " REFERENCES ", &_67$$37, " (", &_70$$37, ")"); @@ -59693,7 +59731,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_77$$40, &reference, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_76$$40, this_ptr, "getcolumnlist", &_45, 67, &_77$$40); + ZEPHIR_CALL_METHOD(&_76$$40, this_ptr, "getcolumnlist", &_45, 54, &_77$$40); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_79$$40, &reference, "getreferencedtable", NULL, 0); zephir_check_call_status(); @@ -59703,7 +59741,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_82$$40, &reference, "getreferencedcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_81$$40, this_ptr, "getcolumnlist", &_45, 67, &_82$$40); + ZEPHIR_CALL_METHOD(&_81$$40, this_ptr, "getcolumnlist", &_45, 54, &_82$$40); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_83$$40); ZEPHIR_CONCAT_SVSVSSVSVS(&_83$$40, "CONSTRAINT `", &_75$$40, "` FOREIGN KEY (", &_76$$40, ")", " REFERENCES ", &_78$$40, " (", &_81$$40, ")"); @@ -60376,7 +60414,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "getcolumnsize", NULL, 0, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "checkcolumnunsigned", NULL, 236, column); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "checkcolumnunsigned", NULL, 209, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2$$3); ZEPHIR_CONCAT_VV(&_2$$3, &_0$$3, &_1$$3); @@ -60438,7 +60476,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } ZEPHIR_CALL_METHOD(&_7$$18, this_ptr, "getcolumnsizeandscale", NULL, 0, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_8$$18, this_ptr, "checkcolumnunsigned", NULL, 236, column); + ZEPHIR_CALL_METHOD(&_8$$18, this_ptr, "checkcolumnunsigned", NULL, 209, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_9$$18); ZEPHIR_CONCAT_VV(&_9$$18, &_7$$18, &_8$$18); @@ -60449,9 +60487,9 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) if (ZEPHIR_IS_EMPTY(&columnSql)) { zephir_concat_self_str(&columnSql, SL("DOUBLE")); } - ZEPHIR_CALL_METHOD(&_10$$20, this_ptr, "checkcolumnsizeandscale", NULL, 237, column); + ZEPHIR_CALL_METHOD(&_10$$20, this_ptr, "checkcolumnsizeandscale", NULL, 210, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_11$$20, this_ptr, "checkcolumnunsigned", NULL, 236, column); + ZEPHIR_CALL_METHOD(&_11$$20, this_ptr, "checkcolumnunsigned", NULL, 209, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_12$$20); ZEPHIR_CONCAT_VV(&_12$$20, &_10$$20, &_11$$20); @@ -60471,9 +60509,9 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) if (ZEPHIR_IS_EMPTY(&columnSql)) { zephir_concat_self_str(&columnSql, SL("FLOAT")); } - ZEPHIR_CALL_METHOD(&_14$$24, this_ptr, "checkcolumnsizeandscale", NULL, 237, column); + ZEPHIR_CALL_METHOD(&_14$$24, this_ptr, "checkcolumnsizeandscale", NULL, 210, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_15$$24, this_ptr, "checkcolumnunsigned", NULL, 236, column); + ZEPHIR_CALL_METHOD(&_15$$24, this_ptr, "checkcolumnunsigned", NULL, 209, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_16$$24); ZEPHIR_CONCAT_VV(&_16$$24, &_14$$24, &_15$$24); @@ -60486,7 +60524,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } ZEPHIR_CALL_METHOD(&_17$$26, this_ptr, "getcolumnsize", NULL, 0, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_18$$26, this_ptr, "checkcolumnunsigned", NULL, 236, column); + ZEPHIR_CALL_METHOD(&_18$$26, this_ptr, "checkcolumnunsigned", NULL, 209, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_19$$26); ZEPHIR_CONCAT_VV(&_19$$26, &_17$$26, &_18$$26); @@ -60523,7 +60561,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } ZEPHIR_CALL_METHOD(&_20$$36, this_ptr, "getcolumnsize", NULL, 0, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_21$$36, this_ptr, "checkcolumnunsigned", NULL, 236, column); + ZEPHIR_CALL_METHOD(&_21$$36, this_ptr, "checkcolumnunsigned", NULL, 209, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_22$$36); ZEPHIR_CONCAT_VV(&_22$$36, &_20$$36, &_21$$36); @@ -60542,7 +60580,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } ZEPHIR_CALL_METHOD(&_23$$40, this_ptr, "getcolumnsize", NULL, 0, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_24$$40, this_ptr, "checkcolumnunsigned", NULL, 236, column); + ZEPHIR_CALL_METHOD(&_24$$40, this_ptr, "checkcolumnunsigned", NULL, 209, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_25$$40); ZEPHIR_CONCAT_VV(&_25$$40, &_23$$40, &_24$$40); @@ -60593,7 +60631,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } ZEPHIR_CALL_METHOD(&_30$$52, this_ptr, "getcolumnsize", NULL, 0, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_31$$52, this_ptr, "checkcolumnunsigned", NULL, 236, column); + ZEPHIR_CALL_METHOD(&_31$$52, this_ptr, "checkcolumnunsigned", NULL, 209, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_32$$52); ZEPHIR_CONCAT_VV(&_32$$52, &_30$$52, &_31$$52); @@ -60622,7 +60660,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_36$$59); ZEPHIR_CONCAT_SV(&_36$$59, "Unrecognized MySQL data type at column ", &_35$$59); - ZEPHIR_CALL_METHOD(NULL, &_34$$59, "__construct", NULL, 31, &_36$$59); + ZEPHIR_CALL_METHOD(NULL, &_34$$59, "__construct", NULL, 29, &_36$$59); zephir_check_call_status(); zephir_throw_exception_debug(&_34$$59, "phalcon/Db/Dialect/Mysql.zep", 635); ZEPHIR_MM_RESTORE(); @@ -60642,7 +60680,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) ZVAL_COPY(&value$$61, _37$$61); ZEPHIR_INIT_NVAR(&_39$$62); ZVAL_STRING(&_39$$62, "\""); - ZEPHIR_CALL_FUNCTION(&_40$$62, "addcslashes", &_41, 235, &value$$61, &_39$$62); + ZEPHIR_CALL_FUNCTION(&_40$$62, "addcslashes", &_41, 208, &value$$61, &_39$$62); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_42$$62); ZEPHIR_CONCAT_SVS(&_42$$62, "\"", &_40$$62, "\", "); @@ -60661,7 +60699,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_43$$63); ZVAL_STRING(&_43$$63, "\""); - ZEPHIR_CALL_FUNCTION(&_44$$63, "addcslashes", &_41, 235, &value$$61, &_43$$63); + ZEPHIR_CALL_FUNCTION(&_44$$63, "addcslashes", &_41, 208, &value$$61, &_43$$63); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_45$$63); ZEPHIR_CONCAT_SVS(&_45$$63, "\"", &_44$$63, "\", "); @@ -60681,7 +60719,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } else { ZEPHIR_INIT_VAR(&_50$$64); ZVAL_STRING(&_50$$64, "\""); - ZEPHIR_CALL_FUNCTION(&_51$$64, "addcslashes", &_41, 235, &typeValues, &_50$$64); + ZEPHIR_CALL_FUNCTION(&_51$$64, "addcslashes", &_41, 208, &typeValues, &_50$$64); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_52$$64); ZEPHIR_CONCAT_SVS(&_52$$64, "(\"", &_51$$64, "\")"); @@ -60910,7 +60948,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, modifyColumn) } _13$$8 = _12$$8; if (!(_13$$8)) { - ZEPHIR_CALL_FUNCTION(&_14$$8, "is_float", NULL, 234, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_14$$8, "is_float", NULL, 207, &defaultValue); zephir_check_call_status(); _13$$8 = zephir_is_true(&_14$$8); } @@ -60921,7 +60959,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, modifyColumn) } else { ZEPHIR_INIT_VAR(&_16$$10); ZVAL_STRING(&_16$$10, "\""); - ZEPHIR_CALL_FUNCTION(&_17$$10, "addcslashes", NULL, 235, &defaultValue, &_16$$10); + ZEPHIR_CALL_FUNCTION(&_17$$10, "addcslashes", NULL, 208, &defaultValue, &_16$$10); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_18$$10); ZEPHIR_CONCAT_SVS(&_18$$10, " DEFAULT \"", &_17$$10, "\""); @@ -61510,13 +61548,13 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, addForeignKey) } ZEPHIR_CALL_METHOD(&_6, reference, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_5, this_ptr, "getcolumnlist", NULL, 67, &_6); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "getcolumnlist", NULL, 54, &_6); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_7, reference, "getreferencedtable", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_9, reference, "getreferencedcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_8, this_ptr, "getcolumnlist", NULL, 67, &_9); + ZEPHIR_CALL_METHOD(&_8, this_ptr, "getcolumnlist", NULL, 54, &_9); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_10); ZEPHIR_CONCAT_SVSSVSVS(&_10, " FOREIGN KEY (", &_5, ")", " REFERENCES \"", &_7, "\" (", &_8, ")"); @@ -61616,7 +61654,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, addIndex) zephir_concat_self(&sql, &_4); ZEPHIR_CALL_METHOD(&_6, index, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_5, this_ptr, "getcolumnlist", NULL, 67, &_6); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "getcolumnlist", NULL, 54, &_6); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_7); ZEPHIR_CONCAT_SVS(&_7, " (", &_5, ")"); @@ -61674,7 +61712,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, addPrimaryKey) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_2, index, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "getcolumnlist", NULL, 67, &_2); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getcolumnlist", NULL, 54, &_2); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVSVS(return_value, "ALTER TABLE ", &_0, " ADD CONSTRAINT \"", &tableName, "_PRIMARY\" PRIMARY KEY (", &_1, ")"); RETURN_MM(); @@ -61965,7 +62003,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) } ZEPHIR_INIT_NVAR(&column); if (!(ZEPHIR_IS_EMPTY(&primaryColumns))) { - ZEPHIR_CALL_METHOD(&_30$$19, this_ptr, "getcolumnlist", NULL, 67, &primaryColumns); + ZEPHIR_CALL_METHOD(&_30$$19, this_ptr, "getcolumnlist", NULL, 54, &primaryColumns); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_31$$19); ZEPHIR_CONCAT_SVS(&_31$$19, "PRIMARY KEY (", &_30$$19, ")"); @@ -61987,7 +62025,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) if (ZEPHIR_IS_STRING(&indexName, "PRIMARY")) { ZEPHIR_CALL_METHOD(&_35$$22, &index, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_34$$22, this_ptr, "getcolumnlist", NULL, 67, &_35$$22); + ZEPHIR_CALL_METHOD(&_34$$22, this_ptr, "getcolumnlist", NULL, 54, &_35$$22); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_36$$22); ZEPHIR_CONCAT_SVS(&_36$$22, "CONSTRAINT \"PRIMARY\" PRIMARY KEY (", &_34$$22, ")"); @@ -61996,7 +62034,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) if (!(ZEPHIR_IS_EMPTY(&indexType))) { ZEPHIR_CALL_METHOD(&_38$$24, &index, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_37$$24, this_ptr, "getcolumnlist", NULL, 67, &_38$$24); + ZEPHIR_CALL_METHOD(&_37$$24, this_ptr, "getcolumnlist", NULL, 54, &_38$$24); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_39$$24); ZEPHIR_CONCAT_SVSVSVS(&_39$$24, "CONSTRAINT \"", &indexName, "\" ", &indexType, " (", &_37$$24, ")"); @@ -62011,7 +62049,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) zephir_concat_self(&indexSqlAfterCreate, &_42$$25); ZEPHIR_CALL_METHOD(&_44$$25, &index, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_43$$25, this_ptr, "getcolumnlist", NULL, 67, &_44$$25); + ZEPHIR_CALL_METHOD(&_43$$25, this_ptr, "getcolumnlist", NULL, 54, &_44$$25); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_45$$25); ZEPHIR_CONCAT_SVS(&_45$$25, " (", &_43$$25, ");"); @@ -62041,7 +62079,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) if (ZEPHIR_IS_STRING(&indexName, "PRIMARY")) { ZEPHIR_CALL_METHOD(&_47$$28, &index, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_46$$28, this_ptr, "getcolumnlist", NULL, 67, &_47$$28); + ZEPHIR_CALL_METHOD(&_46$$28, this_ptr, "getcolumnlist", NULL, 54, &_47$$28); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_48$$28); ZEPHIR_CONCAT_SVS(&_48$$28, "CONSTRAINT \"PRIMARY\" PRIMARY KEY (", &_46$$28, ")"); @@ -62050,7 +62088,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) if (!(ZEPHIR_IS_EMPTY(&indexType))) { ZEPHIR_CALL_METHOD(&_50$$30, &index, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_49$$30, this_ptr, "getcolumnlist", NULL, 67, &_50$$30); + ZEPHIR_CALL_METHOD(&_49$$30, this_ptr, "getcolumnlist", NULL, 54, &_50$$30); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_51$$30); ZEPHIR_CONCAT_SVSVSVS(&_51$$30, "CONSTRAINT \"", &indexName, "\" ", &indexType, " (", &_49$$30, ")"); @@ -62065,7 +62103,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) zephir_concat_self(&indexSqlAfterCreate, &_54$$31); ZEPHIR_CALL_METHOD(&_56$$31, &index, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_55$$31, this_ptr, "getcolumnlist", NULL, 67, &_56$$31); + ZEPHIR_CALL_METHOD(&_55$$31, this_ptr, "getcolumnlist", NULL, 54, &_56$$31); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_57$$31); ZEPHIR_CONCAT_SVS(&_57$$31, " (", &_55$$31, ");"); @@ -62093,7 +62131,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_62$$34, &reference, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_61$$34, this_ptr, "getcolumnlist", NULL, 67, &_62$$34); + ZEPHIR_CALL_METHOD(&_61$$34, this_ptr, "getcolumnlist", NULL, 54, &_62$$34); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_63$$34); ZEPHIR_CONCAT_SVSVS(&_63$$34, "CONSTRAINT \"", &_60$$34, "\" FOREIGN KEY (", &_61$$34, ") REFERENCES "); @@ -62105,7 +62143,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) zephir_concat_self(&referenceSql, &_64$$34); ZEPHIR_CALL_METHOD(&_67$$34, &reference, "getreferencedcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_66$$34, this_ptr, "getcolumnlist", NULL, 67, &_67$$34); + ZEPHIR_CALL_METHOD(&_66$$34, this_ptr, "getcolumnlist", NULL, 54, &_67$$34); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_68$$34); ZEPHIR_CONCAT_SVS(&_68$$34, " (", &_66$$34, ")"); @@ -62141,7 +62179,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_73$$37, &reference, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_72$$37, this_ptr, "getcolumnlist", NULL, 67, &_73$$37); + ZEPHIR_CALL_METHOD(&_72$$37, this_ptr, "getcolumnlist", NULL, 54, &_73$$37); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_74$$37); ZEPHIR_CONCAT_SVSVS(&_74$$37, "CONSTRAINT \"", &_71$$37, "\" FOREIGN KEY (", &_72$$37, ") REFERENCES "); @@ -62153,7 +62191,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) zephir_concat_self(&referenceSql, &_75$$37); ZEPHIR_CALL_METHOD(&_78$$37, &reference, "getreferencedcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_77$$37, this_ptr, "getcolumnlist", NULL, 67, &_78$$37); + ZEPHIR_CALL_METHOD(&_77$$37, this_ptr, "getcolumnlist", NULL, 54, &_78$$37); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_79$$37); ZEPHIR_CONCAT_SVS(&_79$$37, " (", &_77$$37, ")"); @@ -62890,7 +62928,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, getColumnDefinition) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_7$$36); ZEPHIR_CONCAT_SV(&_7$$36, "Unrecognized PostgreSQL data type at column ", &_6$$36); - ZEPHIR_CALL_METHOD(NULL, &_5$$36, "__construct", NULL, 31, &_7$$36); + ZEPHIR_CALL_METHOD(NULL, &_5$$36, "__construct", NULL, 29, &_7$$36); zephir_check_call_status(); zephir_throw_exception_debug(&_5$$36, "phalcon/Db/Dialect/Postgresql.zep", 511); ZEPHIR_MM_RESTORE(); @@ -62909,7 +62947,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, getColumnDefinition) ZVAL_COPY(&value$$38, _8$$38); ZEPHIR_INIT_NVAR(&_10$$39); ZVAL_STRING(&_10$$39, "\'"); - ZEPHIR_CALL_FUNCTION(&_11$$39, "addcslashes", &_12, 235, &value$$38, &_10$$39); + ZEPHIR_CALL_FUNCTION(&_11$$39, "addcslashes", &_12, 208, &value$$38, &_10$$39); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_13$$39); ZEPHIR_CONCAT_SVS(&_13$$39, "'", &_11$$39, "', "); @@ -62928,7 +62966,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, getColumnDefinition) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_14$$40); ZVAL_STRING(&_14$$40, "\'"); - ZEPHIR_CALL_FUNCTION(&_15$$40, "addcslashes", &_12, 235, &value$$38, &_14$$40); + ZEPHIR_CALL_FUNCTION(&_15$$40, "addcslashes", &_12, 208, &value$$38, &_14$$40); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$40); ZEPHIR_CONCAT_SVS(&_16$$40, "'", &_15$$40, "', "); @@ -62948,7 +62986,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, getColumnDefinition) } else { ZEPHIR_INIT_VAR(&_21$$41); ZVAL_STRING(&_21$$41, "\'"); - ZEPHIR_CALL_FUNCTION(&_22$$41, "addcslashes", &_12, 235, &typeValues, &_21$$41); + ZEPHIR_CALL_FUNCTION(&_22$$41, "addcslashes", &_12, 208, &typeValues, &_21$$41); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_23$$41); ZEPHIR_CONCAT_SVS(&_23$$41, "('", &_22$$41, "')"); @@ -63520,7 +63558,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, castDefault) } else { ZEPHIR_INIT_VAR(&_7$$6); ZVAL_STRING(&_7$$6, "\'"); - ZEPHIR_CALL_FUNCTION(&_8$$6, "addcslashes", NULL, 235, &defaultValue, &_7$$6); + ZEPHIR_CALL_FUNCTION(&_8$$6, "addcslashes", NULL, 208, &defaultValue, &_7$$6); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_9$$6); ZEPHIR_CONCAT_SVS(&_9$$6, "'", &_8$$6, "'"); @@ -63652,7 +63690,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, addColumn) } else { ZEPHIR_INIT_VAR(&_7$$5); ZVAL_STRING(&_7$$5, "\""); - ZEPHIR_CALL_FUNCTION(&_8$$5, "addcslashes", NULL, 235, &defaultValue, &_7$$5); + ZEPHIR_CALL_FUNCTION(&_8$$5, "addcslashes", NULL, 208, &defaultValue, &_7$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_9$$5); ZEPHIR_CONCAT_SVS(&_9$$5, " DEFAULT \"", &_8$$5, "\""); @@ -63798,7 +63836,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, addIndex) } ZEPHIR_CALL_METHOD(&_6, index, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_5, this_ptr, "getcolumnlist", NULL, 67, &_6); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "getcolumnlist", NULL, 54, &_6); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_7); ZEPHIR_CONCAT_SVSVS(&_7, " ON \"", &tableName, "\" (", &_5, ")"); @@ -64044,7 +64082,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, createTable) } else { ZEPHIR_INIT_NVAR(&_13$$12); ZVAL_STRING(&_13$$12, "\""); - ZEPHIR_CALL_FUNCTION(&_14$$12, "addcslashes", &_15, 235, &defaultValue, &_13$$12); + ZEPHIR_CALL_FUNCTION(&_14$$12, "addcslashes", &_15, 208, &defaultValue, &_13$$12); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$12); ZEPHIR_CONCAT_SVS(&_16$$12, " DEFAULT \"", &_14$$12, "\""); @@ -64108,7 +64146,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, createTable) } else { ZEPHIR_INIT_NVAR(&_26$$20); ZVAL_STRING(&_26$$20, "\""); - ZEPHIR_CALL_FUNCTION(&_27$$20, "addcslashes", &_15, 235, &defaultValue, &_26$$20); + ZEPHIR_CALL_FUNCTION(&_27$$20, "addcslashes", &_15, 208, &defaultValue, &_26$$20); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_28$$20); ZEPHIR_CONCAT_SVS(&_28$$20, " DEFAULT \"", &_27$$20, "\""); @@ -64153,7 +64191,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, createTable) if (_32$$24) { ZEPHIR_CALL_METHOD(&_36$$25, &index, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_35$$25, this_ptr, "getcolumnlist", &_37, 67, &_36$$25); + ZEPHIR_CALL_METHOD(&_35$$25, this_ptr, "getcolumnlist", &_37, 54, &_36$$25); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_38$$25); ZEPHIR_CONCAT_SVS(&_38$$25, "PRIMARY KEY (", &_35$$25, ")"); @@ -64161,7 +64199,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, createTable) } else if (_33$$24) { ZEPHIR_CALL_METHOD(&_40$$26, &index, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_39$$26, this_ptr, "getcolumnlist", &_37, 67, &_40$$26); + ZEPHIR_CALL_METHOD(&_39$$26, this_ptr, "getcolumnlist", &_37, 54, &_40$$26); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_41$$26); ZEPHIR_CONCAT_SVS(&_41$$26, "UNIQUE (", &_39$$26, ")"); @@ -64196,7 +64234,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, createTable) if (_42$$27) { ZEPHIR_CALL_METHOD(&_46$$28, &index, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_45$$28, this_ptr, "getcolumnlist", &_37, 67, &_46$$28); + ZEPHIR_CALL_METHOD(&_45$$28, this_ptr, "getcolumnlist", &_37, 54, &_46$$28); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_47$$28); ZEPHIR_CONCAT_SVS(&_47$$28, "PRIMARY KEY (", &_45$$28, ")"); @@ -64204,7 +64242,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, createTable) } else if (_43$$27) { ZEPHIR_CALL_METHOD(&_49$$29, &index, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_48$$29, this_ptr, "getcolumnlist", &_37, 67, &_49$$29); + ZEPHIR_CALL_METHOD(&_48$$29, this_ptr, "getcolumnlist", &_37, 54, &_49$$29); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_50$$29); ZEPHIR_CONCAT_SVS(&_50$$29, "UNIQUE (", &_48$$29, ")"); @@ -64228,13 +64266,13 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, createTable) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_55$$31, &reference, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_54$$31, this_ptr, "getcolumnlist", &_37, 67, &_55$$31); + ZEPHIR_CALL_METHOD(&_54$$31, this_ptr, "getcolumnlist", &_37, 54, &_55$$31); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_56$$31, &reference, "getreferencedtable", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_58$$31, &reference, "getreferencedcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_57$$31, this_ptr, "getcolumnlist", &_37, 67, &_58$$31); + ZEPHIR_CALL_METHOD(&_57$$31, this_ptr, "getcolumnlist", &_37, 54, &_58$$31); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&referenceSql); ZEPHIR_CONCAT_SVSVSSVSVS(&referenceSql, "CONSTRAINT `", &_53$$31, "` FOREIGN KEY (", &_54$$31, ")", " REFERENCES `", &_56$$31, "`(", &_57$$31, ")"); @@ -64269,13 +64307,13 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, createTable) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_63$$34, &reference, "getcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_62$$34, this_ptr, "getcolumnlist", &_37, 67, &_63$$34); + ZEPHIR_CALL_METHOD(&_62$$34, this_ptr, "getcolumnlist", &_37, 54, &_63$$34); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_64$$34, &reference, "getreferencedtable", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_66$$34, &reference, "getreferencedcolumns", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_65$$34, this_ptr, "getcolumnlist", &_37, 67, &_66$$34); + ZEPHIR_CALL_METHOD(&_65$$34, this_ptr, "getcolumnlist", &_37, 54, &_66$$34); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&referenceSql); ZEPHIR_CONCAT_SVSVSSVSVS(&referenceSql, "CONSTRAINT `", &_61$$34, "` FOREIGN KEY (", &_62$$34, ")", " REFERENCES `", &_64$$34, "`(", &_65$$34, ")"); @@ -65059,7 +65097,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, getColumnDefinition) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_7$$38); ZEPHIR_CONCAT_SV(&_7$$38, "Unrecognized SQLite data type at column ", &_6$$38); - ZEPHIR_CALL_METHOD(NULL, &_5$$38, "__construct", NULL, 31, &_7$$38); + ZEPHIR_CALL_METHOD(NULL, &_5$$38, "__construct", NULL, 29, &_7$$38); zephir_check_call_status(); zephir_throw_exception_debug(&_5$$38, "phalcon/Db/Dialect/Sqlite.zep", 520); ZEPHIR_MM_RESTORE(); @@ -65079,7 +65117,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, getColumnDefinition) ZVAL_COPY(&value$$40, _8$$40); ZEPHIR_INIT_NVAR(&_10$$41); ZVAL_STRING(&_10$$41, "\""); - ZEPHIR_CALL_FUNCTION(&_11$$41, "addcslashes", &_12, 235, &value$$40, &_10$$41); + ZEPHIR_CALL_FUNCTION(&_11$$41, "addcslashes", &_12, 208, &value$$40, &_10$$41); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_13$$41); ZEPHIR_CONCAT_SVS(&_13$$41, "\"", &_11$$41, "\", "); @@ -65098,7 +65136,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, getColumnDefinition) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_14$$42); ZVAL_STRING(&_14$$42, "\""); - ZEPHIR_CALL_FUNCTION(&_15$$42, "addcslashes", &_12, 235, &value$$40, &_14$$42); + ZEPHIR_CALL_FUNCTION(&_15$$42, "addcslashes", &_12, 208, &value$$40, &_14$$42); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$42); ZEPHIR_CONCAT_SVS(&_16$$42, "\"", &_15$$42, "\", "); @@ -65118,7 +65156,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, getColumnDefinition) } else { ZEPHIR_INIT_VAR(&_21$$43); ZVAL_STRING(&_21$$43, "\""); - ZEPHIR_CALL_FUNCTION(&_22$$43, "addcslashes", &_12, 235, &typeValues, &_21$$43); + ZEPHIR_CALL_FUNCTION(&_22$$43, "addcslashes", &_12, 208, &typeValues, &_21$$43); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_23$$43); ZEPHIR_CONCAT_SVS(&_23$$43, "(\"", &_22$$43, "\")"); @@ -65180,13 +65218,13 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, listIndexesSql) } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "escape", NULL, 66, &table); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "escape", NULL, 53, &table); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZEPHIR_CONCAT_SVS(&_1, "SELECT sql FROM sqlite_master WHERE type = 'index' AND tbl_name = ", &_0, " COLLATE NOCASE"); zephir_get_strval(&sql, &_1); if (!(ZEPHIR_IS_EMPTY(&keyName))) { - ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "escape", NULL, 66, &keyName); + ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "escape", NULL, 53, &keyName); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3$$3); ZEPHIR_CONCAT_SVS(&_3$$3, " AND name = ", &_2$$3, " COLLATE NOCASE"); @@ -65748,7 +65786,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Db_Result_PdoResult) zend_declare_property_null(phalcon_db_result_pdoresult_ce, SL("bindParams"), ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_db_result_pdoresult_ce, SL("bindTypes"), ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_db_result_pdoresult_ce, SL("connection"), ZEND_ACC_PROTECTED); - zend_declare_property_long(phalcon_db_result_pdoresult_ce, SL("fetchMode"), 5, ZEND_ACC_PROTECTED); + zend_declare_property_long(phalcon_db_result_pdoresult_ce, SL("fetchMode"), 0, ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_db_result_pdoresult_ce, SL("pdoStatement"), ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_db_result_pdoresult_ce, SL("result"), ZEND_ACC_PROTECTED); zend_declare_property_bool(phalcon_db_result_pdoresult_ce, SL("rowCount"), 0, ZEND_ACC_PROTECTED); @@ -65809,8 +65847,8 @@ static PHP_METHOD(Phalcon_Db_Result_PdoResult, dataSeek) { long n = 0; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zephir_fcall_cache_entry *_3 = NULL; - zval *number_param = NULL, connection, pdo, sqlStatement, bindParams, statement, _0, _1$$4, _2$$4; + zephir_fcall_cache_entry *_4 = NULL; + zval *number_param = NULL, connection, pdo, sqlStatement, bindParams, statement, _0, _1$$4, _2$$4, _3$$6; zend_long number, ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); @@ -65822,6 +65860,7 @@ static PHP_METHOD(Phalcon_Db_Result_PdoResult, dataSeek) ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1$$4); ZVAL_UNDEF(&_2$$4); + ZVAL_UNDEF(&_3$$6); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -65863,7 +65902,8 @@ static PHP_METHOD(Phalcon_Db_Result_PdoResult, dataSeek) if (!(n != number)) { break; } - ZEPHIR_CALL_METHOD(NULL, &statement, "fetch", &_3, 0); + zephir_read_property(&_3$$6, this_ptr, ZEND_STRL("fetchMode"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(NULL, &statement, "fetch", &_4, 0, &_3$$6); zephir_check_call_status(); n++; } @@ -65891,129 +65931,153 @@ static PHP_METHOD(Phalcon_Db_Result_PdoResult, execute) static PHP_METHOD(Phalcon_Db_Result_PdoResult, fetch) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *fetchStyle = NULL, fetchStyle_sub, *cursorOrientation = NULL, cursorOrientation_sub, *cursorOffset = NULL, cursorOffset_sub, __$null, _0; + zval *fetchStyle_param = NULL, *cursorOrientation_param = NULL, *cursorOffset_param = NULL, mode, _0, _1, _2; + zend_long fetchStyle, cursorOrientation, cursorOffset, ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); - ZVAL_UNDEF(&fetchStyle_sub); - ZVAL_UNDEF(&cursorOrientation_sub); - ZVAL_UNDEF(&cursorOffset_sub); - ZVAL_NULL(&__$null); + ZVAL_UNDEF(&mode); ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 3) Z_PARAM_OPTIONAL - Z_PARAM_ZVAL_OR_NULL(fetchStyle) - Z_PARAM_ZVAL_OR_NULL(cursorOrientation) - Z_PARAM_ZVAL_OR_NULL(cursorOffset) + Z_PARAM_LONG_OR_NULL(fetchStyle, is_null_true) + Z_PARAM_LONG(cursorOrientation) + Z_PARAM_LONG(cursorOffset) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 0, 3, &fetchStyle, &cursorOrientation, &cursorOffset); - if (!fetchStyle) { - fetchStyle = &fetchStyle_sub; - fetchStyle = &__$null; + zephir_fetch_params(1, 0, 3, &fetchStyle_param, &cursorOrientation_param, &cursorOffset_param); + if (!fetchStyle_param) { + fetchStyle = 0; + } else { + fetchStyle = zephir_get_intval(fetchStyle_param); } - if (!cursorOrientation) { - cursorOrientation = &cursorOrientation_sub; - cursorOrientation = &__$null; + if (!cursorOrientation_param) { + cursorOrientation = 0; + } else { + cursorOrientation = zephir_get_intval(cursorOrientation_param); } - if (!cursorOffset) { - cursorOffset = &cursorOffset_sub; - cursorOffset = &__$null; + if (!cursorOffset_param) { + cursorOffset = 0; + } else { + cursorOffset = zephir_get_intval(cursorOffset_param); } + if (1 == 1) { + ZEPHIR_INIT_VAR(&mode); + ZVAL_LONG(&mode, fetchStyle); + } else { + ZEPHIR_OBS_NVAR(&mode); + zephir_read_property(&mode, this_ptr, ZEND_STRL("fetchMode"), PH_NOISY_CC); + } zephir_read_property(&_0, this_ptr, ZEND_STRL("pdoStatement"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_METHOD(&_0, "fetch", NULL, 0, fetchStyle, cursorOrientation, cursorOffset); + ZVAL_LONG(&_1, cursorOrientation); + ZVAL_LONG(&_2, cursorOffset); + ZEPHIR_RETURN_CALL_METHOD(&_0, "fetch", NULL, 0, &mode, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } static PHP_METHOD(Phalcon_Db_Result_PdoResult, fetchAll) { - zend_bool _1; + zend_bool _3; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *fetchStyle = NULL, fetchStyle_sub, *fetchArgument = NULL, fetchArgument_sub, *ctorArgs = NULL, ctorArgs_sub, __$null, pdoStatement, _0; + zval *fetchStyle_param = NULL, *fetchArgument_param = NULL, *ctorArgs_param = NULL, pdoStatement, mode, _0, _1$$3, _2$$3, _4$$4, _5$$4; + zend_long fetchStyle, fetchArgument, ctorArgs, ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); - ZVAL_UNDEF(&fetchStyle_sub); - ZVAL_UNDEF(&fetchArgument_sub); - ZVAL_UNDEF(&ctorArgs_sub); - ZVAL_NULL(&__$null); ZVAL_UNDEF(&pdoStatement); + ZVAL_UNDEF(&mode); ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1$$3); + ZVAL_UNDEF(&_2$$3); + ZVAL_UNDEF(&_4$$4); + ZVAL_UNDEF(&_5$$4); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 3) Z_PARAM_OPTIONAL - Z_PARAM_ZVAL_OR_NULL(fetchStyle) - Z_PARAM_ZVAL_OR_NULL(fetchArgument) - Z_PARAM_ZVAL_OR_NULL(ctorArgs) + Z_PARAM_LONG_OR_NULL(fetchStyle, is_null_true) + Z_PARAM_LONG(fetchArgument) + Z_PARAM_LONG(ctorArgs) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 0, 3, &fetchStyle, &fetchArgument, &ctorArgs); - if (!fetchStyle) { - fetchStyle = &fetchStyle_sub; - fetchStyle = &__$null; + zephir_fetch_params(1, 0, 3, &fetchStyle_param, &fetchArgument_param, &ctorArgs_param); + if (!fetchStyle_param) { + fetchStyle = 0; + } else { + fetchStyle = zephir_get_intval(fetchStyle_param); } - if (!fetchArgument) { - fetchArgument = &fetchArgument_sub; - fetchArgument = &__$null; + if (!fetchArgument_param) { + fetchArgument = 0; + } else { + fetchArgument = zephir_get_intval(fetchArgument_param); } - if (!ctorArgs) { - ctorArgs = &ctorArgs_sub; - ctorArgs = &__$null; + if (!ctorArgs_param) { + ctorArgs = 0; + } else { + ctorArgs = zephir_get_intval(ctorArgs_param); } zephir_read_property(&_0, this_ptr, ZEND_STRL("pdoStatement"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&pdoStatement, &_0); - if (Z_TYPE_P(fetchStyle) != IS_LONG) { - ZEPHIR_RETURN_CALL_METHOD(&pdoStatement, "fetchall", NULL, 0); - zephir_check_call_status(); - RETURN_MM(); + if (1 == 1) { + ZEPHIR_INIT_VAR(&mode); + ZVAL_LONG(&mode, fetchStyle); + } else { + ZEPHIR_OBS_NVAR(&mode); + zephir_read_property(&mode, this_ptr, ZEND_STRL("fetchMode"), PH_NOISY_CC); } - if (ZEPHIR_IS_LONG(fetchStyle, 8)) { - ZEPHIR_RETURN_CALL_METHOD(&pdoStatement, "fetchall", NULL, 0, fetchStyle, fetchArgument, ctorArgs); + if (fetchStyle == 8) { + ZVAL_LONG(&_1$$3, fetchArgument); + ZVAL_LONG(&_2$$3, ctorArgs); + ZEPHIR_RETURN_CALL_METHOD(&pdoStatement, "fetchall", NULL, 0, &mode, &_1$$3, &_2$$3); zephir_check_call_status(); RETURN_MM(); } - _1 = ZEPHIR_IS_LONG(fetchStyle, 7); - if (!(_1)) { - _1 = ZEPHIR_IS_LONG(fetchStyle, 10); + _3 = fetchStyle == 7; + if (!(_3)) { + _3 = fetchStyle == 10; } - if (_1) { - ZEPHIR_RETURN_CALL_METHOD(&pdoStatement, "fetchall", NULL, 0, fetchStyle, fetchArgument); + if (_3) { + ZVAL_LONG(&_4$$4, fetchStyle); + ZVAL_LONG(&_5$$4, fetchArgument); + ZEPHIR_RETURN_CALL_METHOD(&pdoStatement, "fetchall", NULL, 0, &_4$$4, &_5$$4); zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_RETURN_CALL_METHOD(&pdoStatement, "fetchall", NULL, 0, fetchStyle); + ZVAL_LONG(&_0, fetchStyle); + ZEPHIR_RETURN_CALL_METHOD(&pdoStatement, "fetchall", NULL, 0, &_0); zephir_check_call_status(); RETURN_MM(); } static PHP_METHOD(Phalcon_Db_Result_PdoResult, fetchArray) { - zval _0; + zval _0, _1; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); ZEPHIR_MM_GROW(); zephir_read_property(&_0, this_ptr, ZEND_STRL("pdoStatement"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_METHOD(&_0, "fetch", NULL, 0); + zephir_read_property(&_1, this_ptr, ZEND_STRL("fetchMode"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_RETURN_CALL_METHOD(&_0, "fetch", NULL, 0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -66088,7 +66152,7 @@ static PHP_METHOD(Phalcon_Db_Result_PdoResult, numRows) ZVAL_STRING(&_7$$6, "/^SELECT\\s+(.*)/i"); zephir_preg_match(&_6$$6, &_7$$6, &sqlStatement, &matches, 0, 0 , 0 ); if (zephir_is_true(&_6$$6)) { - zephir_array_fetch_long(&_8$$7, &matches, 1, PH_NOISY | PH_READONLY, "phalcon/Db/Result/PdoResult.zep", 309); + zephir_array_fetch_long(&_8$$7, &matches, 1, PH_NOISY | PH_READONLY, "phalcon/Db/Result/PdoResult.zep", 311); ZEPHIR_INIT_VAR(&_9$$7); ZEPHIR_CONCAT_SVS(&_9$$7, "SELECT COUNT(*) \"numrows\" FROM (SELECT ", &_8$$7, ")"); zephir_read_property(&_10$$7, this_ptr, ZEND_STRL("bindParams"), PH_NOISY_CC | PH_READONLY); @@ -66098,7 +66162,7 @@ static PHP_METHOD(Phalcon_Db_Result_PdoResult, numRows) ZEPHIR_CALL_METHOD(&row, &result, "fetch", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&rowCount); - zephir_array_fetch_string(&rowCount, &row, SL("numrows"), PH_NOISY, "phalcon/Db/Result/PdoResult.zep", 315); + zephir_array_fetch_string(&rowCount, &row, SL("numrows"), PH_NOISY, "phalcon/Db/Result/PdoResult.zep", 317); } } else { ZEPHIR_INIT_NVAR(&rowCount); @@ -66361,7 +66425,7 @@ static PHP_METHOD(Phalcon_Di_Di, __call) ZVAL_LONG(&_0$$3, 3); ZEPHIR_INIT_VAR(&_1$$3); zephir_substr(&_1$$3, &method, 3 , 0, ZEPHIR_SUBSTR_NO_LENGTH); - ZEPHIR_CALL_FUNCTION(&possibleService, "lcfirst", NULL, 104, &_1$$3); + ZEPHIR_CALL_FUNCTION(&possibleService, "lcfirst", NULL, 73, &_1$$3); zephir_check_call_status(); zephir_read_property(&_2$$3, this_ptr, ZEND_STRL("services"), PH_NOISY_CC | PH_READONLY); if (zephir_array_isset(&_2$$3, &possibleService)) { @@ -66376,7 +66440,7 @@ static PHP_METHOD(Phalcon_Di_Di, __call) ZVAL_LONG(&_3$$6, 3); ZEPHIR_INIT_VAR(&_4$$6); zephir_substr(&_4$$6, &method, 3 , 0, ZEPHIR_SUBSTR_NO_LENGTH); - ZEPHIR_CALL_FUNCTION(&_5$$6, "lcfirst", NULL, 104, &_4$$6); + ZEPHIR_CALL_FUNCTION(&_5$$6, "lcfirst", NULL, 73, &_4$$6); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "set", NULL, 0, &_5$$6, &definition); zephir_check_call_status(); @@ -66387,7 +66451,7 @@ static PHP_METHOD(Phalcon_Di_Di, __call) object_init_ex(&_6, phalcon_di_exception_ce); ZEPHIR_INIT_VAR(&_7); ZEPHIR_CONCAT_SVS(&_7, "Call to undefined method or service '", &method, "'"); - ZEPHIR_CALL_METHOD(NULL, &_6, "__construct", NULL, 31, &_7); + ZEPHIR_CALL_METHOD(NULL, &_6, "__construct", NULL, 29, &_7); zephir_check_call_status(); zephir_throw_exception_debug(&_6, "phalcon/Di/Di.zep", 147); ZEPHIR_MM_RESTORE(); @@ -66450,7 +66514,7 @@ static PHP_METHOD(Phalcon_Di_Di, attempt) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 105, definition, &_2); + ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 74, definition, &_2); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("services"), &name, &_1); zephir_read_property(&_3, this_ptr, ZEND_STRL("services"), PH_NOISY_CC | PH_READONLY); @@ -66569,7 +66633,7 @@ static PHP_METHOD(Phalcon_Di_Di, get) object_init_ex(&_10$$9, phalcon_di_exception_ce); ZEPHIR_INIT_VAR(&_11$$9); ZEPHIR_CONCAT_SVS(&_11$$9, "Service '", &name, "' cannot be resolved"); - ZEPHIR_CALL_METHOD(NULL, &_10$$9, "__construct", NULL, 31, &_11$$9); + ZEPHIR_CALL_METHOD(NULL, &_10$$9, "__construct", NULL, 29, &_11$$9); zephir_check_call_status(); zephir_throw_exception_debug(&_10$$9, "phalcon/Di/Di.zep", 210); ZEPHIR_MM_RESTORE(); @@ -66585,7 +66649,7 @@ static PHP_METHOD(Phalcon_Di_Di, get) object_init_ex(&_12$$12, phalcon_di_exception_ce); ZEPHIR_INIT_VAR(&_13$$12); ZEPHIR_CONCAT_SVS(&_13$$12, "Service '", &name, "' was not found in the dependency injection container"); - ZEPHIR_CALL_METHOD(NULL, &_12$$12, "__construct", NULL, 31, &_13$$12); + ZEPHIR_CALL_METHOD(NULL, &_12$$12, "__construct", NULL, 29, &_13$$12); zephir_check_call_status(); zephir_throw_exception_debug(&_12$$12, "phalcon/Di/Di.zep", 225); ZEPHIR_MM_RESTORE(); @@ -66693,7 +66757,7 @@ static PHP_METHOD(Phalcon_Di_Di, getRaw) object_init_ex(&_1$$3, phalcon_di_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZEPHIR_CONCAT_SVS(&_2$$3, "Service '", &name, "' was not found in the dependency injection container"); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 31, &_2$$3); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_2$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Di/Di.zep", 295); ZEPHIR_MM_RESTORE(); @@ -66745,7 +66809,7 @@ static PHP_METHOD(Phalcon_Di_Di, getService) object_init_ex(&_1$$3, phalcon_di_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZEPHIR_CONCAT_SVS(&_2$$3, "Service '", &name, "' was not found in the dependency injection container"); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 31, &_2$$3); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_2$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Di/Di.zep", 311); ZEPHIR_MM_RESTORE(); @@ -66933,7 +66997,7 @@ static PHP_METHOD(Phalcon_Di_Di, loadFromPhp) ZEPHIR_INIT_VAR(&services); object_init_ex(&services, phalcon_config_adapter_php_ce); - ZEPHIR_CALL_METHOD(NULL, &services, "__construct", NULL, 106, &filePath); + ZEPHIR_CALL_METHOD(NULL, &services, "__construct", NULL, 75, &filePath); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "loadfromconfig", NULL, 0, &services); zephir_check_call_status(); @@ -66982,7 +67046,7 @@ static PHP_METHOD(Phalcon_Di_Di, loadFromYaml) ZEPHIR_INIT_VAR(&services); object_init_ex(&services, phalcon_config_adapter_yaml_ce); - ZEPHIR_CALL_METHOD(NULL, &services, "__construct", NULL, 107, &filePath, &callbacks); + ZEPHIR_CALL_METHOD(NULL, &services, "__construct", NULL, 76, &filePath, &callbacks); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "loadfromconfig", NULL, 0, &services); zephir_check_call_status(); @@ -67027,7 +67091,8 @@ static PHP_METHOD(Phalcon_Di_Di, offsetGet) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *name, name_sub; + zval name_sub; + zval *name; zval *this_ptr = getThis(); ZVAL_UNDEF(&name_sub); @@ -67052,7 +67117,8 @@ static PHP_METHOD(Phalcon_Di_Di, offsetExists) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *name, name_sub; + zval name_sub; + zval *name; zval *this_ptr = getThis(); ZVAL_UNDEF(&name_sub); @@ -67077,7 +67143,8 @@ static PHP_METHOD(Phalcon_Di_Di, offsetSet) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *name, name_sub, *definition, definition_sub; + zval name_sub, definition_sub; + zval *name, *definition; zval *this_ptr = getThis(); ZVAL_UNDEF(&name_sub); @@ -67104,7 +67171,8 @@ static PHP_METHOD(Phalcon_Di_Di, offsetUnset) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *name, name_sub; + zval name_sub; + zval *name; zval *this_ptr = getThis(); ZVAL_UNDEF(&name_sub); @@ -67256,7 +67324,7 @@ static PHP_METHOD(Phalcon_Di_Di, set) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 105, definition, &_1); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 74, definition, &_1); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("services"), &name, &_0); zephir_read_property(&_2, this_ptr, ZEND_STRL("services"), PH_NOISY_CC | PH_READONLY); @@ -67516,7 +67584,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Annotations\\Adapter\\Memory"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("annotations"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -67533,7 +67601,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) zephir_array_fast_append(&_6, &_7); zephir_array_update_string(&_5, SL("arguments"), &_6, PH_COPY | PH_SEPARATE); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_5, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_5, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("assets"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -67541,7 +67609,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Encryption\\Crypt"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("crypt"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -67549,7 +67617,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Http\\Response\\Cookies"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("cookies"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -67557,7 +67625,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Mvc\\Dispatcher"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("dispatcher"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -67565,7 +67633,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Html\\Escaper"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("escaper"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -67573,7 +67641,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Events\\Manager"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("eventsManager"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -67581,7 +67649,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Flash\\Direct"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("flash"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -67589,15 +67657,15 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Flash\\Session"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("flashSession"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); object_init_ex(&_2, phalcon_di_service_ce); - ZEPHIR_CALL_METHOD(&_8, &filter, "newinstance", NULL, 122); + ZEPHIR_CALL_METHOD(&_8, &filter, "newinstance", NULL, 89); zephir_check_call_status(); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_8, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_8, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("filter"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -67605,7 +67673,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Support\\HelperFactory"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("helper"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -67613,7 +67681,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Mvc\\Model\\Manager"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("modelsManager"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -67621,7 +67689,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Mvc\\Model\\MetaData\\Memory"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("modelsMetadata"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -67629,7 +67697,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Http\\Request"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("request"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -67637,7 +67705,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Http\\Response"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("response"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -67645,7 +67713,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Mvc\\Router"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("router"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -67653,7 +67721,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Encryption\\Security"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("security"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -67670,7 +67738,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) zephir_array_fast_append(&_7, &_9); zephir_array_update_string(&_6, SL("arguments"), &_7, PH_COPY | PH_SEPARATE); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_6, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_6, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("tag"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -67678,7 +67746,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Mvc\\Model\\Transaction\\Manager"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("transactionManager"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -67686,7 +67754,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Mvc\\Url"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("url"), &_2, PH_COPY | PH_SEPARATE); zephir_update_property_zval(this_ptr, ZEND_STRL("services"), &_1); @@ -68145,7 +68213,7 @@ static PHP_METHOD(Phalcon_Di_Service, resolve) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&instance, &builder, "build", NULL, 242, container, &definition, parameters); + ZEPHIR_CALL_METHOD(&instance, &builder, "build", NULL, 215, container, &definition, parameters); zephir_check_call_status(); } else { found = 0; @@ -68155,7 +68223,7 @@ static PHP_METHOD(Phalcon_Di_Service, resolve) if (UNEXPECTED(found == 0)) { ZEPHIR_INIT_VAR(&_5$$21); object_init_ex(&_5$$21, phalcon_di_exception_serviceresolutionexception_ce); - ZEPHIR_CALL_METHOD(NULL, &_5$$21, "__construct", NULL, 31); + ZEPHIR_CALL_METHOD(NULL, &_5$$21, "__construct", NULL, 29); zephir_check_call_status(); zephir_throw_exception_debug(&_5$$21, "phalcon/Di/Service.zep", 205); ZEPHIR_MM_RESTORE(); @@ -68399,7 +68467,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Annotations\\Adapter\\Memory"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("annotations"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -68407,7 +68475,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Cli\\Dispatcher"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("dispatcher"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -68415,7 +68483,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Html\\Escaper"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("escaper"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -68423,15 +68491,15 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Events\\Manager"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("eventsManager"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); object_init_ex(&_2, phalcon_di_service_ce); - ZEPHIR_CALL_METHOD(&_5, &filter, "newinstance", NULL, 122); + ZEPHIR_CALL_METHOD(&_5, &filter, "newinstance", NULL, 89); zephir_check_call_status(); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_5, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_5, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("filter"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -68439,7 +68507,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Support\\HelperFactory"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("helper"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -68447,7 +68515,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Mvc\\Model\\Manager"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("modelsManager"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -68455,7 +68523,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Mvc\\Model\\MetaData\\Memory"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("modelsMetadata"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -68463,7 +68531,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Cli\\Router"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("router"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -68471,7 +68539,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Encryption\\Security"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("security"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -68479,7 +68547,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Mvc\\Model\\Transaction\\Manager"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 74, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("transactionManager"), &_2, PH_COPY | PH_SEPARATE); zephir_update_property_zval(this_ptr, ZEND_STRL("services"), &_1); @@ -68607,7 +68675,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) } else { ZEPHIR_OBS_VAR(&arguments); if (zephir_array_isset_string_fetch(&arguments, &definition, SL("arguments"), 0)) { - ZEPHIR_CALL_METHOD(&_0$$8, this_ptr, "buildparameters", NULL, 243, container, &arguments); + ZEPHIR_CALL_METHOD(&_0$$8, this_ptr, "buildparameters", NULL, 216, container, &arguments); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&instance); ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params(&instance, &className, &_0$$8); @@ -68645,7 +68713,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) object_init_ex(&_5$$14, phalcon_di_exception_ce); ZEPHIR_INIT_NVAR(&_6$$14); ZEPHIR_CONCAT_SV(&_6$$14, "Method call must be an array on position ", &methodPosition); - ZEPHIR_CALL_METHOD(NULL, &_5$$14, "__construct", &_7, 31, &_6$$14); + ZEPHIR_CALL_METHOD(NULL, &_5$$14, "__construct", &_7, 29, &_6$$14); zephir_check_call_status(); zephir_throw_exception_debug(&_5$$14, "phalcon/Di/Service/Builder.zep", 103); ZEPHIR_MM_RESTORE(); @@ -68657,7 +68725,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) object_init_ex(&_8$$15, phalcon_di_exception_ce); ZEPHIR_INIT_NVAR(&_9$$15); ZEPHIR_CONCAT_SV(&_9$$15, "The method name is required on position ", &methodPosition); - ZEPHIR_CALL_METHOD(NULL, &_8$$15, "__construct", &_7, 31, &_9$$15); + ZEPHIR_CALL_METHOD(NULL, &_8$$15, "__construct", &_7, 29, &_9$$15); zephir_check_call_status(); zephir_throw_exception_debug(&_8$$15, "phalcon/Di/Service/Builder.zep", 112); ZEPHIR_MM_RESTORE(); @@ -68675,7 +68743,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) zephir_cast_to_string(&_11$$17, &methodPosition); ZEPHIR_INIT_NVAR(&_12$$17); ZEPHIR_CONCAT_SV(&_12$$17, "Call arguments must be an array on position ", &_11$$17); - ZEPHIR_CALL_METHOD(NULL, &_10$$17, "__construct", &_7, 31, &_12$$17); + ZEPHIR_CALL_METHOD(NULL, &_10$$17, "__construct", &_7, 29, &_12$$17); zephir_check_call_status(); zephir_throw_exception_debug(&_10$$17, "phalcon/Di/Service/Builder.zep", 125); ZEPHIR_MM_RESTORE(); @@ -68683,7 +68751,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) } if (zephir_fast_count_int(&arguments)) { ZEPHIR_INIT_NVAR(&_13$$18); - ZEPHIR_CALL_METHOD(&_14$$18, this_ptr, "buildparameters", NULL, 243, container, &arguments); + ZEPHIR_CALL_METHOD(&_14$$18, this_ptr, "buildparameters", NULL, 216, container, &arguments); zephir_check_call_status(); ZEPHIR_CALL_USER_FUNC_ARRAY(&_13$$18, &methodCall, &_14$$18); zephir_check_call_status(); @@ -68712,7 +68780,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) object_init_ex(&_16$$20, phalcon_di_exception_ce); ZEPHIR_INIT_NVAR(&_17$$20); ZEPHIR_CONCAT_SV(&_17$$20, "Method call must be an array on position ", &methodPosition); - ZEPHIR_CALL_METHOD(NULL, &_16$$20, "__construct", &_7, 31, &_17$$20); + ZEPHIR_CALL_METHOD(NULL, &_16$$20, "__construct", &_7, 29, &_17$$20); zephir_check_call_status(); zephir_throw_exception_debug(&_16$$20, "phalcon/Di/Service/Builder.zep", 103); ZEPHIR_MM_RESTORE(); @@ -68724,7 +68792,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) object_init_ex(&_18$$21, phalcon_di_exception_ce); ZEPHIR_INIT_NVAR(&_19$$21); ZEPHIR_CONCAT_SV(&_19$$21, "The method name is required on position ", &methodPosition); - ZEPHIR_CALL_METHOD(NULL, &_18$$21, "__construct", &_7, 31, &_19$$21); + ZEPHIR_CALL_METHOD(NULL, &_18$$21, "__construct", &_7, 29, &_19$$21); zephir_check_call_status(); zephir_throw_exception_debug(&_18$$21, "phalcon/Di/Service/Builder.zep", 112); ZEPHIR_MM_RESTORE(); @@ -68743,7 +68811,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) zephir_cast_to_string(&_22$$23, &methodPosition); ZEPHIR_INIT_NVAR(&_23$$23); ZEPHIR_CONCAT_SV(&_23$$23, "Call arguments must be an array on position ", &_22$$23); - ZEPHIR_CALL_METHOD(NULL, &_21$$23, "__construct", &_7, 31, &_23$$23); + ZEPHIR_CALL_METHOD(NULL, &_21$$23, "__construct", &_7, 29, &_23$$23); zephir_check_call_status(); zephir_throw_exception_debug(&_21$$23, "phalcon/Di/Service/Builder.zep", 125); ZEPHIR_MM_RESTORE(); @@ -68751,7 +68819,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) } if (zephir_fast_count_int(&arguments)) { ZEPHIR_INIT_NVAR(&_24$$24); - ZEPHIR_CALL_METHOD(&_25$$24, this_ptr, "buildparameters", NULL, 243, container, &arguments); + ZEPHIR_CALL_METHOD(&_25$$24, this_ptr, "buildparameters", NULL, 216, container, &arguments); zephir_check_call_status(); ZEPHIR_CALL_USER_FUNC_ARRAY(&_24$$24, &methodCall, &_25$$24); zephir_check_call_status(); @@ -68795,7 +68863,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) object_init_ex(&_31$$29, phalcon_di_exception_ce); ZEPHIR_INIT_NVAR(&_32$$29); ZEPHIR_CONCAT_SV(&_32$$29, "Property must be an array on position ", &propertyPosition); - ZEPHIR_CALL_METHOD(NULL, &_31$$29, "__construct", &_7, 31, &_32$$29); + ZEPHIR_CALL_METHOD(NULL, &_31$$29, "__construct", &_7, 29, &_32$$29); zephir_check_call_status(); zephir_throw_exception_debug(&_31$$29, "phalcon/Di/Service/Builder.zep", 179); ZEPHIR_MM_RESTORE(); @@ -68807,7 +68875,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) object_init_ex(&_33$$30, phalcon_di_exception_ce); ZEPHIR_INIT_NVAR(&_34$$30); ZEPHIR_CONCAT_SV(&_34$$30, "The property name is required on position ", &propertyPosition); - ZEPHIR_CALL_METHOD(NULL, &_33$$30, "__construct", &_7, 31, &_34$$30); + ZEPHIR_CALL_METHOD(NULL, &_33$$30, "__construct", &_7, 29, &_34$$30); zephir_check_call_status(); zephir_throw_exception_debug(&_33$$30, "phalcon/Di/Service/Builder.zep", 188); ZEPHIR_MM_RESTORE(); @@ -68819,13 +68887,13 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) object_init_ex(&_35$$31, phalcon_di_exception_ce); ZEPHIR_INIT_NVAR(&_36$$31); ZEPHIR_CONCAT_SV(&_36$$31, "The property value is required on position ", &propertyPosition); - ZEPHIR_CALL_METHOD(NULL, &_35$$31, "__construct", &_7, 31, &_36$$31); + ZEPHIR_CALL_METHOD(NULL, &_35$$31, "__construct", &_7, 29, &_36$$31); zephir_check_call_status(); zephir_throw_exception_debug(&_35$$31, "phalcon/Di/Service/Builder.zep", 197); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_37$$28, this_ptr, "buildparameter", &_38, 244, container, &propertyPosition, &propertyValue); + ZEPHIR_CALL_METHOD(&_37$$28, this_ptr, "buildparameter", &_38, 217, container, &propertyPosition, &propertyValue); zephir_check_call_status(); zephir_update_property_zval_zval(&instance, &propertyName, &_37$$28); } ZEND_HASH_FOREACH_END(); @@ -68847,7 +68915,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) object_init_ex(&_39$$33, phalcon_di_exception_ce); ZEPHIR_INIT_NVAR(&_40$$33); ZEPHIR_CONCAT_SV(&_40$$33, "Property must be an array on position ", &propertyPosition); - ZEPHIR_CALL_METHOD(NULL, &_39$$33, "__construct", &_7, 31, &_40$$33); + ZEPHIR_CALL_METHOD(NULL, &_39$$33, "__construct", &_7, 29, &_40$$33); zephir_check_call_status(); zephir_throw_exception_debug(&_39$$33, "phalcon/Di/Service/Builder.zep", 179); ZEPHIR_MM_RESTORE(); @@ -68859,7 +68927,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) object_init_ex(&_41$$34, phalcon_di_exception_ce); ZEPHIR_INIT_NVAR(&_42$$34); ZEPHIR_CONCAT_SV(&_42$$34, "The property name is required on position ", &propertyPosition); - ZEPHIR_CALL_METHOD(NULL, &_41$$34, "__construct", &_7, 31, &_42$$34); + ZEPHIR_CALL_METHOD(NULL, &_41$$34, "__construct", &_7, 29, &_42$$34); zephir_check_call_status(); zephir_throw_exception_debug(&_41$$34, "phalcon/Di/Service/Builder.zep", 188); ZEPHIR_MM_RESTORE(); @@ -68871,13 +68939,13 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) object_init_ex(&_43$$35, phalcon_di_exception_ce); ZEPHIR_INIT_NVAR(&_44$$35); ZEPHIR_CONCAT_SV(&_44$$35, "The property value is required on position ", &propertyPosition); - ZEPHIR_CALL_METHOD(NULL, &_43$$35, "__construct", &_7, 31, &_44$$35); + ZEPHIR_CALL_METHOD(NULL, &_43$$35, "__construct", &_7, 29, &_44$$35); zephir_check_call_status(); zephir_throw_exception_debug(&_43$$35, "phalcon/Di/Service/Builder.zep", 197); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_45$$32, this_ptr, "buildparameter", &_38, 244, container, &propertyPosition, &propertyValue); + ZEPHIR_CALL_METHOD(&_45$$32, this_ptr, "buildparameter", &_38, 217, container, &propertyPosition, &propertyValue); zephir_check_call_status(); zephir_update_property_zval_zval(&instance, &propertyName, &_45$$32); ZEPHIR_CALL_METHOD(NULL, ¶mCalls, "next", NULL, 0); @@ -68944,7 +69012,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, buildParameter) ZVAL_LONG(&_1$$3, position); ZEPHIR_INIT_VAR(&_2$$3); ZEPHIR_CONCAT_SVS(&_2$$3, "Argument at position ", &_1$$3, " must have a type"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 31, &_2$$3); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 29, &_2$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Di/Service/Builder.zep", 229); ZEPHIR_MM_RESTORE(); @@ -68960,7 +69028,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, buildParameter) ZVAL_LONG(&_4$$5, position); ZEPHIR_INIT_VAR(&_5$$5); ZEPHIR_CONCAT_SV(&_5$$5, "Service 'name' is required in parameter on position ", &_4$$5); - ZEPHIR_CALL_METHOD(NULL, &_3$$5, "__construct", NULL, 31, &_5$$5); + ZEPHIR_CALL_METHOD(NULL, &_3$$5, "__construct", NULL, 29, &_5$$5); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$5, "phalcon/Di/Service/Builder.zep", 242); ZEPHIR_MM_RESTORE(); @@ -68983,7 +69051,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, buildParameter) ZVAL_LONG(&_7$$8, position); ZEPHIR_INIT_VAR(&_8$$8); ZEPHIR_CONCAT_SV(&_8$$8, "Service 'value' is required in parameter on position ", &_7$$8); - ZEPHIR_CALL_METHOD(NULL, &_6$$8, "__construct", NULL, 31, &_8$$8); + ZEPHIR_CALL_METHOD(NULL, &_6$$8, "__construct", NULL, 29, &_8$$8); zephir_check_call_status(); zephir_throw_exception_debug(&_6$$8, "phalcon/Di/Service/Builder.zep", 260); ZEPHIR_MM_RESTORE(); @@ -69000,7 +69068,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, buildParameter) ZVAL_LONG(&_10$$10, position); ZEPHIR_INIT_VAR(&_11$$10); ZEPHIR_CONCAT_SV(&_11$$10, "Service 'className' is required in parameter on position ", &_10$$10); - ZEPHIR_CALL_METHOD(NULL, &_9$$10, "__construct", NULL, 31, &_11$$10); + ZEPHIR_CALL_METHOD(NULL, &_9$$10, "__construct", NULL, 29, &_11$$10); zephir_check_call_status(); zephir_throw_exception_debug(&_9$$10, "phalcon/Di/Service/Builder.zep", 273); ZEPHIR_MM_RESTORE(); @@ -69026,7 +69094,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, buildParameter) ZVAL_LONG(&_13$$13, position); ZEPHIR_INIT_VAR(&_14$$13); ZEPHIR_CONCAT_SV(&_14$$13, "Unknown service type in parameter on position ", &_13$$13); - ZEPHIR_CALL_METHOD(NULL, &_12$$13, "__construct", NULL, 31, &_14$$13); + ZEPHIR_CALL_METHOD(NULL, &_12$$13, "__construct", NULL, 29, &_14$$13); zephir_check_call_status(); zephir_throw_exception_debug(&_12$$13, "phalcon/Di/Service/Builder.zep", 301); ZEPHIR_MM_RESTORE(); @@ -69083,7 +69151,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, buildParameters) } ZEPHIR_INIT_NVAR(&argument); ZVAL_COPY(&argument, _0); - ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "buildparameter", &_5, 244, container, &position, &argument); + ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "buildparameter", &_5, 217, container, &position, &argument); zephir_check_call_status(); zephir_array_append(&buildArguments, &_4$$3, PH_SEPARATE, "phalcon/Di/Service/Builder.zep", 320); } ZEND_HASH_FOREACH_END(); @@ -69100,7 +69168,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, buildParameters) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&argument, &arguments, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "buildparameter", &_5, 244, container, &position, &argument); + ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "buildparameter", &_5, 217, container, &position, &argument); zephir_check_call_status(); zephir_array_append(&buildArguments, &_6$$4, PH_SEPARATE, "phalcon/Di/Service/Builder.zep", 320); ZEPHIR_CALL_METHOD(NULL, &arguments, "next", NULL, 0); @@ -69488,7 +69556,7 @@ static PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, dispatch) } break; } - ZEPHIR_CALL_FUNCTION(&handlerHash, "spl_object_hash", &_35, 108, &handler); + ZEPHIR_CALL_FUNCTION(&handlerHash, "spl_object_hash", &_35, 77, &handler); zephir_check_call_status(); zephir_read_property(&_36$$10, this_ptr, ZEND_STRL("handlerHashes"), PH_NOISY_CC | PH_READONLY); isNewHandler = !((zephir_array_isset(&_36$$10, &handlerHash))); @@ -70071,7 +70139,7 @@ static PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, getActiveMethod) zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("actionName"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "tocamelcase", NULL, 0, &_3$$3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&activeMethodName, "lcfirst", NULL, 104, &_2$$3); + ZEPHIR_CALL_FUNCTION(&activeMethodName, "lcfirst", NULL, 73, &_2$$3); zephir_check_call_status(); ZEPHIR_OBS_VAR(&_4$$3); zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("actionName"), PH_NOISY_CC); @@ -70713,11 +70781,11 @@ static PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, toCamelCase) if (!(zephir_array_isset_fetch(&camelCaseInput, &_0, &input, 0))) { ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "/[_-]+/"); - ZEPHIR_CALL_FUNCTION(&_2$$3, "preg_split", NULL, 98, &_1$$3, &input); + ZEPHIR_CALL_FUNCTION(&_2$$3, "preg_split", NULL, 67, &_1$$3, &input); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_1$$3); ZVAL_STRING(&_1$$3, "ucfirst"); - ZEPHIR_CALL_FUNCTION(&_3$$3, "array_map", NULL, 97, &_1$$3, &_2$$3); + ZEPHIR_CALL_FUNCTION(&_3$$3, "array_map", NULL, 66, &_1$$3, &_2$$3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&camelCaseInput); zephir_fast_join_str(&camelCaseInput, SL(""), &_3$$3); @@ -71308,7 +71376,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, __construct) if (Z_TYPE_P(padFactory) == IS_NULL) { ZEPHIR_INIT_NVAR(padFactory); object_init_ex(padFactory, phalcon_encryption_crypt_padfactory_ce); - ZEPHIR_CALL_METHOD(NULL, padFactory, "__construct", NULL, 245); + ZEPHIR_CALL_METHOD(NULL, padFactory, "__construct", NULL, 218); zephir_check_call_status(); } zephir_update_property_zval(this_ptr, ZEND_STRL("padFactory"), padFactory); @@ -71400,14 +71468,14 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, decrypt) ZVAL_STRING(&_1, "cipher"); ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkcipherhashisavailable", NULL, 0, &cipher, &_1); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&mode, this_ptr, "getmode", NULL, 246); + ZEPHIR_CALL_METHOD(&mode, this_ptr, "getmode", NULL, 219); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 247, &mode); + ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 220, &mode); zephir_check_call_status(); ZVAL_LONG(&_0, 0); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "8bit"); - ZEPHIR_CALL_FUNCTION(&iv, "mb_substr", NULL, 248, &input, &_0, &ivLength, &_1); + ZEPHIR_CALL_FUNCTION(&iv, "mb_substr", NULL, 221, &input, &_0, &ivLength, &_1); zephir_check_call_status(); ZEPHIR_INIT_VAR(&digest); ZVAL_STRING(&digest, ""); @@ -71417,24 +71485,24 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, decrypt) if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { ZEPHIR_INIT_VAR(&_2$$5); ZVAL_STRING(&_2$$5, ""); - ZEPHIR_CALL_FUNCTION(&_3$$5, "hash", NULL, 99, &hashAlgorithm, &_2$$5, &__$true); + ZEPHIR_CALL_FUNCTION(&_3$$5, "hash", NULL, 68, &hashAlgorithm, &_2$$5, &__$true); zephir_check_call_status(); ZEPHIR_INIT_VAR(&hashLength); ZVAL_LONG(&hashLength, zephir_fast_strlen_ev(&_3$$5)); ZEPHIR_INIT_NVAR(&_2$$5); ZVAL_STRING(&_2$$5, "8bit"); - ZEPHIR_CALL_FUNCTION(&digest, "mb_substr", NULL, 248, &input, &ivLength, &hashLength, &_2$$5); + ZEPHIR_CALL_FUNCTION(&digest, "mb_substr", NULL, 221, &input, &ivLength, &hashLength, &_2$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4$$5); zephir_add_function(&_4$$5, &ivLength, &hashLength); ZEPHIR_INIT_NVAR(&_2$$5); ZVAL_STRING(&_2$$5, "8bit"); - ZEPHIR_CALL_FUNCTION(&cipherText, "mb_substr", NULL, 248, &input, &_4$$5, &__$null, &_2$$5); + ZEPHIR_CALL_FUNCTION(&cipherText, "mb_substr", NULL, 221, &input, &_4$$5, &__$null, &_2$$5); zephir_check_call_status(); } else { ZEPHIR_INIT_VAR(&_5$$6); ZVAL_STRING(&_5$$6, "8bit"); - ZEPHIR_CALL_FUNCTION(&cipherText, "mb_substr", NULL, 248, &input, &ivLength, &__$null, &_5$$6); + ZEPHIR_CALL_FUNCTION(&cipherText, "mb_substr", NULL, 221, &input, &ivLength, &__$null, &_5$$6); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&decrypted, this_ptr, "decryptgcmccmauth", NULL, 0, &mode, &cipherText, &decryptKey, &iv); @@ -71445,7 +71513,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, decrypt) ZEPHIR_CPY_WRT(&decrypted, &_6); zephir_read_property(&_7, this_ptr, ZEND_STRL("useSigning"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_7)) { - ZEPHIR_CALL_FUNCTION(&_8$$7, "hash_hmac", NULL, 249, &hashAlgorithm, &padded, &decryptKey, &__$true); + ZEPHIR_CALL_FUNCTION(&_8$$7, "hash_hmac", NULL, 222, &hashAlgorithm, &padded, &decryptKey, &__$true); zephir_check_call_status(); if (!ZEPHIR_IS_IDENTICAL(&digest, &_8$$7)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_crypt_exception_mismatch_ce, "Hash does not match.", "phalcon/Encryption/Crypt.zep", 224); @@ -71514,7 +71582,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, decryptBase64) ZEPHIR_CONCAT_VV(&_4$$3, &_2$$3, &_1$$3); zephir_get_strval(&input, &_4$$3); } - ZEPHIR_CALL_FUNCTION(&_5, "base64_decode", NULL, 250, &input); + ZEPHIR_CALL_FUNCTION(&_5, "base64_decode", NULL, 223, &input); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "decrypt", NULL, 0, &_5, &key); zephir_check_call_status(); @@ -71581,9 +71649,9 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, encrypt) ZVAL_STRING(&_1, "cipher"); ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkcipherhashisavailable", NULL, 0, &cipher, &_1); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&mode, this_ptr, "getmode", NULL, 246); + ZEPHIR_CALL_METHOD(&mode, this_ptr, "getmode", NULL, 219); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 247, &mode); + ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 220, &mode); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&iv, this_ptr, "phpopensslrandompseudobytes", NULL, 0, &ivLength); zephir_check_call_status(); @@ -71599,7 +71667,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, encrypt) if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { ZEPHIR_CALL_METHOD(&_2$$6, this_ptr, "gethashalgorithm", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&digest, "hash_hmac", NULL, 249, &_2$$6, &padded, &encryptKey, &__$true); + ZEPHIR_CALL_FUNCTION(&digest, "hash_hmac", NULL, 222, &_2$$6, &padded, &encryptKey, &__$true); zephir_check_call_status(); ZEPHIR_CONCAT_VVV(return_value, &iv, &digest, &encrypted); RETURN_MM(); @@ -71654,7 +71722,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, encryptBase64) if (safe) { ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "encrypt", NULL, 0, &input, &key); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1$$3, "base64_encode", NULL, 251, &_0$$3); + ZEPHIR_CALL_FUNCTION(&_1$$3, "base64_encode", NULL, 224, &_0$$3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "+/"); @@ -71669,7 +71737,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, encryptBase64) } ZEPHIR_CALL_METHOD(&_5, this_ptr, "encrypt", NULL, 0, &input, &key); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 251, &_5); + ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 224, &_5); zephir_check_call_status(); RETURN_MM(); } @@ -71728,11 +71796,11 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, getAvailableHashAlgorithms) ZEPHIR_CALL_METHOD(&_0, this_ptr, "phpfunctionexists", NULL, 0, &_1); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - ZEPHIR_RETURN_CALL_FUNCTION("hash_hmac_algos", NULL, 252); + ZEPHIR_RETURN_CALL_FUNCTION("hash_hmac_algos", NULL, 225); zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_RETURN_CALL_FUNCTION("hash_algos", NULL, 253); + ZEPHIR_RETURN_CALL_FUNCTION("hash_algos", NULL, 226); zephir_check_call_status(); RETURN_MM(); } @@ -71795,7 +71863,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, isValidDecryptLength) if (ZEPHIR_IS_FALSE_IDENTICAL(&length)) { RETURN_MM_BOOL(0); } - ZEPHIR_CALL_FUNCTION(&_1, "mb_strlen", NULL, 254, &input); + ZEPHIR_CALL_FUNCTION(&_1, "mb_strlen", NULL, 227, &input); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_LE(&length, &_1)); } @@ -71903,7 +71971,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, setCipher) ZVAL_STRING(&_0, "cipher"); ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkcipherhashisavailable", NULL, 0, &cipher, &_0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "getivlength", NULL, 255, &cipher); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getivlength", NULL, 228, &cipher); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("ivLength"), &_1); zephir_update_property_zval(this_ptr, ZEND_STRL("cipher"), &cipher); @@ -72068,9 +72136,9 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, checkCipherHashIsAvailable) object_init_ex(&_1$$5, phalcon_encryption_crypt_exception_exception_ce); ZEPHIR_INIT_VAR(&_2$$5); ZVAL_STRING(&_2$$5, "The %s algorithm '%s' is not supported on this system."); - ZEPHIR_CALL_FUNCTION(&_3$$5, "sprintf", NULL, 145, &_2$$5, &type, &cipher); + ZEPHIR_CALL_FUNCTION(&_3$$5, "sprintf", NULL, 112, &_2$$5, &type, &cipher); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_1$$5, "__construct", NULL, 31, &_3$$5); + ZEPHIR_CALL_METHOD(NULL, &_1$$5, "__construct", NULL, 29, &_3$$5); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$5, "phalcon/Encryption/Crypt.zep", 608); ZEPHIR_MM_RESTORE(); @@ -72133,10 +72201,10 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, cryptPadText) ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "ecb"); zephir_array_fast_append(&_1, &_2); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkismode", NULL, 256, &_1, &mode); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkismode", NULL, 229, &_1, &mode); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - ZEPHIR_CALL_FUNCTION(&_3$$3, "mb_strlen", NULL, 254, &input); + ZEPHIR_CALL_FUNCTION(&_3$$3, "mb_strlen", NULL, 227, &input); zephir_check_call_status(); paddingSize = (blockSize - zephir_safe_mod_zval_long(&_3$$3, blockSize)); _4$$3 = paddingSize >= 256; @@ -72230,7 +72298,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, cryptUnpadText) ZEPHIR_INIT_NVAR(&_4); ZVAL_STRING(&_4, "ecb"); zephir_array_fast_append(&_3, &_4); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkismode", NULL, 256, &_3, &mode); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkismode", NULL, 229, &_3, &mode); zephir_check_call_status(); _1 = ZEPHIR_IS_TRUE_IDENTICAL(&_2); } @@ -72308,7 +72376,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, decryptGetUnpadded) ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "ecb"); zephir_array_fast_append(&_1, &_2); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkismode", NULL, 256, &_1, &mode); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkismode", NULL, 229, &_1, &mode); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("padding"), PH_NOISY_CC | PH_READONLY); @@ -72376,7 +72444,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, decryptGcmCcmAuth) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "gcm"); zephir_array_fast_append(&_2, &_3); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "checkismode", NULL, 256, &_2, &mode); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "checkismode", NULL, 229, &_2, &mode); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_1)) { zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("authData"), PH_NOISY_CC | PH_READONLY); @@ -72391,11 +72459,11 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, decryptGcmCcmAuth) ZEPHIR_INIT_VAR(&encrypted); zephir_fast_str_replace(&encrypted, &authTag, &_5$$3, &cipherText); ZVAL_LONG(&_4$$3, 1); - ZEPHIR_CALL_FUNCTION(&decrypted, "openssl_decrypt", NULL, 257, &encrypted, &cipher, &decryptKey, &_4$$3, &iv, &authTag, &authData); + ZEPHIR_CALL_FUNCTION(&decrypted, "openssl_decrypt", NULL, 230, &encrypted, &cipher, &decryptKey, &_4$$3, &iv, &authTag, &authData); zephir_check_call_status(); } else { ZVAL_LONG(&_6$$4, 1); - ZEPHIR_CALL_FUNCTION(&decrypted, "openssl_decrypt", NULL, 257, &cipherText, &cipher, &decryptKey, &_6$$4, &iv); + ZEPHIR_CALL_FUNCTION(&decrypted, "openssl_decrypt", NULL, 230, &cipherText, &cipher, &decryptKey, &_6$$4, &iv); zephir_check_call_status(); } if (ZEPHIR_IS_FALSE_IDENTICAL(&decrypted)) { @@ -72451,7 +72519,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, encryptGetPadded) ZEPHIR_INIT_NVAR(&_4); ZVAL_STRING(&_4, "ecb"); zephir_array_fast_append(&_3, &_4); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkismode", NULL, 256, &_3, &mode); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkismode", NULL, 229, &_3, &mode); zephir_check_call_status(); _1 = ZEPHIR_IS_TRUE_IDENTICAL(&_2); } @@ -72520,7 +72588,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, encryptGcmCcm) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "gcm"); zephir_array_fast_append(&_2, &_3); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "checkismode", NULL, 256, &_2, &mode); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "checkismode", NULL, 229, &_2, &mode); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_1)) { zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("authData"), PH_NOISY_CC | PH_READONLY); @@ -72535,13 +72603,13 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, encryptGcmCcm) ZEPHIR_CPY_WRT(&authTagLength, &_4$$3); ZVAL_LONG(&_4$$3, 1); ZEPHIR_MAKE_REF(&authTag); - ZEPHIR_CALL_FUNCTION(&encrypted, "openssl_encrypt", NULL, 258, &padded, &cipher, &encryptKey, &_4$$3, &iv, &authTag, &authData, &authTagLength); + ZEPHIR_CALL_FUNCTION(&encrypted, "openssl_encrypt", NULL, 231, &padded, &cipher, &encryptKey, &_4$$3, &iv, &authTag, &authData, &authTagLength); ZEPHIR_UNREF(&authTag); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("authTag"), &authTag); } else { ZVAL_LONG(&_5$$5, 1); - ZEPHIR_CALL_FUNCTION(&encrypted, "openssl_encrypt", NULL, 258, &padded, &cipher, &encryptKey, &_5$$5, &iv); + ZEPHIR_CALL_FUNCTION(&encrypted, "openssl_encrypt", NULL, 231, &padded, &cipher, &encryptKey, &_5$$5, &iv); zephir_check_call_status(); } if (ZEPHIR_IS_FALSE_IDENTICAL(&encrypted)) { @@ -72580,7 +72648,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, initializeAvailableCiphers) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_crypt_exception_exception_ce, "This class requires the openssl extension for PHP", "phalcon/Encryption/Crypt.zep", 892); return; } - ZEPHIR_CALL_FUNCTION(&available, "openssl_get_cipher_methods", NULL, 259, &__$true); + ZEPHIR_CALL_FUNCTION(&available, "openssl_get_cipher_methods", NULL, 232, &__$true); zephir_check_call_status(); ZEPHIR_INIT_VAR(&allowed); array_init(&allowed); @@ -72705,9 +72773,9 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, getBlockSize) zephir_read_property(&_2, this_ptr, ZEND_STRL("cipher"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, ""); - ZEPHIR_CALL_FUNCTION(&_4, "str_ireplace", NULL, 260, &_1, &_3, &_2); + ZEPHIR_CALL_FUNCTION(&_4, "str_ireplace", NULL, 233, &_1, &_3, &_2); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getivlength", NULL, 255, &_4); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getivlength", NULL, 228, &_4); zephir_check_call_status(); RETURN_MM(); } @@ -72735,7 +72803,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, getIvLength) zephir_get_strval(&cipher, cipher_param); - ZEPHIR_CALL_FUNCTION(&length, "openssl_cipher_iv_length", NULL, 261, &cipher); + ZEPHIR_CALL_FUNCTION(&length, "openssl_cipher_iv_length", NULL, 234, &cipher); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&length)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_crypt_exception_exception_ce, "Cannot calculate the initialization vector (IV) length of the cipher", "phalcon/Encryption/Crypt.zep", 962); @@ -72765,7 +72833,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, getMode) zephir_read_property(&_0, this_ptr, ZEND_STRL("cipher"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "-"); - ZEPHIR_CALL_FUNCTION(&_2, "strrpos", NULL, 262, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "strrpos", NULL, 235, &_0, &_1); zephir_check_call_status(); ZEPHIR_INIT_VAR(&position); ZVAL_LONG(&position, zephir_get_intval(&_2)); @@ -72825,7 +72893,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, phpOpensslCipherIvLength) zephir_get_strval(&cipher, cipher_param); - ZEPHIR_RETURN_CALL_FUNCTION("openssl_cipher_iv_length", NULL, 261, &cipher); + ZEPHIR_RETURN_CALL_FUNCTION("openssl_cipher_iv_length", NULL, 234, &cipher); zephir_check_call_status(); RETURN_MM(); } @@ -72852,7 +72920,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, phpOpensslRandomPseudoBytes) ZVAL_LONG(&_0, length); - ZEPHIR_RETURN_CALL_FUNCTION("openssl_random_pseudo_bytes", NULL, 263, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("openssl_random_pseudo_bytes", NULL, 236, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -73030,7 +73098,7 @@ static PHP_METHOD(Phalcon_Encryption_Security, checkHash) if (_0) { RETURN_MM_BOOL(0); } - ZEPHIR_RETURN_CALL_FUNCTION("password_verify", NULL, 267, &password, &passwordHash); + ZEPHIR_RETURN_CALL_FUNCTION("password_verify", NULL, 240, &password, &passwordHash); zephir_check_call_status(); RETURN_MM(); } @@ -73080,13 +73148,13 @@ static PHP_METHOD(Phalcon_Encryption_Security, checkToken) } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "processtokenkey", NULL, 268, &tokenKey); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "processtokenkey", NULL, 241, &tokenKey); zephir_check_call_status(); zephir_get_strval(&tokenKey, &_0); if (!(!(ZEPHIR_IS_EMPTY(&tokenKey)))) { RETURN_MM_BOOL(0); } - ZEPHIR_CALL_METHOD(&userToken, this_ptr, "processusertoken", NULL, 269, &tokenKey, tokenValue); + ZEPHIR_CALL_METHOD(&userToken, this_ptr, "processusertoken", NULL, 242, &tokenKey, tokenValue); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&knownToken, this_ptr, "getrequesttoken", NULL, 0); zephir_check_call_status(); @@ -73153,16 +73221,16 @@ static PHP_METHOD(Phalcon_Encryption_Security, computeHmac) ZVAL_BOOL(&_0, (raw ? 1 : 0)); - ZEPHIR_CALL_FUNCTION(&hmac, "hash_hmac", NULL, 249, &algo, &data, &key, &_0); + ZEPHIR_CALL_FUNCTION(&hmac, "hash_hmac", NULL, 222, &algo, &data, &key, &_0); zephir_check_call_status(); if (UNEXPECTED(!zephir_is_true(&hmac))) { ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_encryption_security_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "Unknown hashing algorithm: %s"); - ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 145, &_2$$3, &algo); + ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 112, &_2$$3, &algo); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 31, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_3$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Encryption/Security.zep", 219); ZEPHIR_MM_RESTORE(); @@ -73239,7 +73307,7 @@ static PHP_METHOD(Phalcon_Encryption_Security, getHashInformation) zephir_get_strval(&hash, hash_param); - ZEPHIR_RETURN_CALL_FUNCTION("password_get_info", NULL, 270, &hash); + ZEPHIR_RETURN_CALL_FUNCTION("password_get_info", NULL, 243, &hash); zephir_check_call_status(); RETURN_MM(); } @@ -73499,11 +73567,11 @@ static PHP_METHOD(Phalcon_Encryption_Security, hash) } - ZEPHIR_CALL_METHOD(&cost, this_ptr, "processcost", NULL, 271, &options); + ZEPHIR_CALL_METHOD(&cost, this_ptr, "processcost", NULL, 244, &options); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "%02s"); - ZEPHIR_CALL_FUNCTION(&formatted, "sprintf", NULL, 145, &_0, &cost); + ZEPHIR_CALL_FUNCTION(&formatted, "sprintf", NULL, 112, &_0, &cost); zephir_check_call_status(); ZEPHIR_INIT_VAR(&prefix); ZVAL_STRING(&prefix, ""); @@ -73533,14 +73601,14 @@ static PHP_METHOD(Phalcon_Encryption_Security, hash) if (ZEPHIR_IS_LONG(&_1, 5)) { ZEPHIR_INIT_VAR(&_2$$6); ZVAL_STRING(&_2$$6, "$2a$%s$"); - ZEPHIR_CALL_FUNCTION(&prefix, "sprintf", NULL, 145, &_2$$6, &formatted); + ZEPHIR_CALL_FUNCTION(&prefix, "sprintf", NULL, 112, &_2$$6, &formatted); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(&_1, 6)) { ZEPHIR_INIT_VAR(&_3$$7); ZVAL_STRING(&_3$$7, "$2x$%s$"); - ZEPHIR_CALL_FUNCTION(&prefix, "sprintf", NULL, 145, &_3$$7, &formatted); + ZEPHIR_CALL_FUNCTION(&prefix, "sprintf", NULL, 112, &_3$$7, &formatted); zephir_check_call_status(); break; } @@ -73554,7 +73622,7 @@ static PHP_METHOD(Phalcon_Encryption_Security, hash) zephir_check_call_status(); ZEPHIR_INIT_VAR(&salt); ZEPHIR_CONCAT_VVS(&salt, &prefix, &_4$$9, "$"); - ZEPHIR_RETURN_CALL_FUNCTION("crypt", NULL, 272, &password, &salt); + ZEPHIR_RETURN_CALL_FUNCTION("crypt", NULL, 245, &password, &salt); zephir_check_call_status(); RETURN_MM(); } @@ -73562,11 +73630,11 @@ static PHP_METHOD(Phalcon_Encryption_Security, hash) zephir_create_array(&_6, 1, 0); zephir_array_update_string(&_6, SL("cost"), &cost, PH_COPY | PH_SEPARATE); ZEPHIR_CPY_WRT(&options, &_6); - ZEPHIR_CALL_METHOD(&algorithm, this_ptr, "processalgorithm", NULL, 273); + ZEPHIR_CALL_METHOD(&algorithm, this_ptr, "processalgorithm", NULL, 246); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&arguments, this_ptr, "processargonoptions", NULL, 274, &options); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "processargonoptions", NULL, 247, &options); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("password_hash", NULL, 275, &password, &algorithm, &arguments); + ZEPHIR_RETURN_CALL_FUNCTION("password_hash", NULL, 248, &password, &algorithm, &arguments); zephir_check_call_status(); RETURN_MM(); } @@ -74128,7 +74196,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_PadFactory, padNumberToService) ZVAL_LONG(&_1, number); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "noop"); - ZEPHIR_RETURN_CALL_METHOD(&_0, "__invoke", NULL, 178, &map, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(&_0, "__invoke", NULL, 150, &map, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -74227,13 +74295,13 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Ansi, pad) ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 264, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 237, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, (paddingSize - 1)); ZEPHIR_CALL_FUNCTION(&_2, "str_repeat", NULL, 1, &_1, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, paddingSize); - ZEPHIR_CALL_FUNCTION(&_3, "chr", NULL, 264, &_0); + ZEPHIR_CALL_FUNCTION(&_3, "chr", NULL, 237, &_0); zephir_check_call_status(); ZEPHIR_CONCAT_VV(return_value, &_2, &_3); RETURN_MM(); @@ -74283,7 +74351,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Ansi, unpad) ZVAL_LONG(&_1, 1); ZEPHIR_INIT_VAR(&last); zephir_substr(&last, &input, zephir_get_intval(&_0), 1 , 0); - ZEPHIR_CALL_FUNCTION(&ord, "ord", NULL, 265, &last); + ZEPHIR_CALL_FUNCTION(&ord, "ord", NULL, 238, &last); zephir_check_call_status(); if (ZEPHIR_LE_LONG(&ord, blockSize)) { ZEPHIR_CPY_WRT(&paddingSize, &ord); @@ -74291,7 +74359,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Ansi, unpad) ZVAL_STRING(&repeat, ""); if (ZEPHIR_GT_LONG(&paddingSize, 1)) { ZVAL_LONG(&_2$$4, 0); - ZEPHIR_CALL_FUNCTION(&_3$$4, "chr", NULL, 264, &_2$$4); + ZEPHIR_CALL_FUNCTION(&_3$$4, "chr", NULL, 237, &_2$$4); zephir_check_call_status(); ZVAL_LONG(&_2$$4, (zephir_get_numberval(&paddingSize) - 1)); ZEPHIR_CALL_FUNCTION(&repeat, "str_repeat", NULL, 1, &_3$$4, &_2$$4); @@ -74374,15 +74442,15 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Iso10126, pad) } ZEPHIR_INIT_NVAR(&counter); ZVAL_LONG(&counter, _1); - ZEPHIR_CALL_FUNCTION(&_3$$3, "rand", &_4, 266); + ZEPHIR_CALL_FUNCTION(&_3$$3, "rand", &_4, 239); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_5$$3, "chr", &_6, 264, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "chr", &_6, 237, &_3$$3); zephir_check_call_status(); zephir_concat_self(&padding, &_5$$3); } } ZVAL_LONG(&_7, paddingSize); - ZEPHIR_CALL_FUNCTION(&_8, "chr", &_6, 264, &_7); + ZEPHIR_CALL_FUNCTION(&_8, "chr", &_6, 237, &_7); zephir_check_call_status(); zephir_concat_self(&padding, &_8); RETURN_CCTOR(&padding); @@ -74422,7 +74490,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Iso10126, unpad) ZVAL_LONG(&_1, 1); ZEPHIR_INIT_VAR(&last); zephir_substr(&last, &input, zephir_get_intval(&_0), 1 , 0); - ZEPHIR_RETURN_CALL_FUNCTION("ord", NULL, 265, &last); + ZEPHIR_RETURN_CALL_FUNCTION("ord", NULL, 238, &last); zephir_check_call_status(); RETURN_MM(); } @@ -74470,10 +74538,10 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_IsoIek, pad) ZVAL_LONG(&_0, 0x80); - ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 264, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 237, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_FUNCTION(&_2, "chr", NULL, 264, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "chr", NULL, 237, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, (paddingSize - 1)); ZEPHIR_CALL_FUNCTION(&_3, "str_repeat", NULL, 1, &_2, &_0); @@ -74516,9 +74584,9 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_IsoIek, unpad) paddingSize = 0; - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 254, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 227, &input); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 117, &input); + ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 84, &input); zephir_check_call_status(); counter = (zephir_get_numberval(&length) - 1); while (1) { @@ -74526,7 +74594,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_IsoIek, unpad) if (_0) { zephir_array_fetch_long(&_1, &inputArray, counter, PH_NOISY | PH_READONLY, "phalcon/Encryption/Crypt/Padding/IsoIek.zep", 48); ZVAL_LONG(&_2, 0); - ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 264, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 237, &_2); zephir_check_call_status(); _0 = ZEPHIR_IS_IDENTICAL(&_1, &_3); } @@ -74542,7 +74610,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_IsoIek, unpad) } zephir_array_fetch_long(&_6, &inputArray, counter, PH_NOISY | PH_READONLY, "phalcon/Encryption/Crypt/Padding/IsoIek.zep", 55); ZVAL_LONG(&_2, 0x80); - ZEPHIR_CALL_FUNCTION(&_7, "chr", &_4, 264, &_2); + ZEPHIR_CALL_FUNCTION(&_7, "chr", &_4, 237, &_2); zephir_check_call_status(); if (ZEPHIR_IS_EQUAL(&_6, &_7)) { paddingSize++; @@ -74678,7 +74746,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Pkcs7, pad) ZVAL_LONG(&_0, paddingSize); - ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 264, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 237, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, paddingSize); ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", NULL, 1, &_1, &_0); @@ -74720,17 +74788,17 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Pkcs7, unpad) blockSize = zephir_get_intval(blockSize_param); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 254, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 227, &input); zephir_check_call_status(); ZVAL_LONG(&_0, (zephir_get_numberval(&length) - 1)); ZVAL_LONG(&_1, 1); ZEPHIR_INIT_VAR(&last); zephir_substr(&last, &input, zephir_get_intval(&_0), 1 , 0); - ZEPHIR_CALL_FUNCTION(&ord, "ord", NULL, 265, &last); + ZEPHIR_CALL_FUNCTION(&ord, "ord", NULL, 238, &last); zephir_check_call_status(); if (ZEPHIR_LE_LONG(&ord, blockSize)) { ZEPHIR_CPY_WRT(&paddingSize, &ord); - ZEPHIR_CALL_FUNCTION(&_2$$3, "chr", NULL, 264, &paddingSize); + ZEPHIR_CALL_FUNCTION(&_2$$3, "chr", NULL, 237, &paddingSize); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&padding, "str_repeat", NULL, 1, &_2$$3, &paddingSize); zephir_check_call_status(); @@ -74825,9 +74893,9 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Space, unpad) blockSize = zephir_get_intval(blockSize_param); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 254, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 227, &input); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 117, &input); + ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 84, &input); zephir_check_call_status(); counter = (zephir_get_numberval(&length) - 1); paddingSize = 0; @@ -74836,7 +74904,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Space, unpad) if (_0) { zephir_array_fetch_long(&_1, &inputArray, counter, PH_NOISY | PH_READONLY, "phalcon/Encryption/Crypt/Padding/Space.zep", 48); ZVAL_LONG(&_2, 32); - ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 264, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 237, &_2); zephir_check_call_status(); _0 = ZEPHIR_IS_EQUAL(&_1, &_3); } @@ -74894,7 +74962,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Zero, pad) ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 264, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 237, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, paddingSize); ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", NULL, 1, &_1, &_0); @@ -74933,9 +75001,9 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Zero, unpad) blockSize = zephir_get_intval(blockSize_param); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 254, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 227, &input); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 117, &input); + ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 84, &input); zephir_check_call_status(); counter = (zephir_get_numberval(&length) - 1); paddingSize = 0; @@ -74944,7 +75012,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Zero, unpad) if (_0) { zephir_array_fetch_long(&_1, &inputArray, counter, PH_NOISY | PH_READONLY, "phalcon/Encryption/Crypt/Padding/Zero.zep", 48); ZVAL_LONG(&_2, 0); - ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 264, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 237, &_2); zephir_check_call_status(); _0 = ZEPHIR_IS_EQUAL(&_1, &_3); } @@ -75099,7 +75167,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_Random, base64) ZVAL_LONG(&_1, len); ZEPHIR_CALL_METHOD(&_0, this_ptr, "bytes", NULL, 0, &_1); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 251, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 224, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -75147,7 +75215,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_Random, base64Safe) ZVAL_LONG(&_1, len); ZEPHIR_CALL_METHOD(&_0, this_ptr, "base64", NULL, 0, &_1); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_2, "base64_encode", NULL, 251, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "base64_encode", NULL, 224, &_0); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "+/"); @@ -75159,7 +75227,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_Random, base64Safe) ZVAL_STRING(&_3, "#[^a-z0-9_=-]+#i"); ZEPHIR_INIT_NVAR(&_4); ZVAL_STRING(&_4, ""); - ZEPHIR_CALL_FUNCTION(&_5, "preg_replace", NULL, 50, &_3, &_4, &s); + ZEPHIR_CALL_FUNCTION(&_5, "preg_replace", NULL, 37, &_3, &_4, &s); zephir_check_call_status(); ZEPHIR_CPY_WRT(&s, &_5); if (!(padding)) { @@ -75201,7 +75269,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_Random, bytes) len = 16; } ZVAL_LONG(&_0, len); - ZEPHIR_RETURN_CALL_FUNCTION("random_bytes", NULL, 289, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("random_bytes", NULL, 262, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -75240,10 +75308,10 @@ static PHP_METHOD(Phalcon_Encryption_Security_Random, hex) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "H*"); - ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 290, &_2, &_0); + ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 263, &_2, &_0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&_3); - ZEPHIR_RETURN_CALL_FUNCTION("array_shift", NULL, 23, &_3); + ZEPHIR_RETURN_CALL_FUNCTION("array_shift", NULL, 21, &_3); ZEPHIR_UNREF(&_3); zephir_check_call_status(); RETURN_MM(); @@ -75277,7 +75345,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_Random, number) } ZVAL_LONG(&_0, 0); ZVAL_LONG(&_1, len); - ZEPHIR_RETURN_CALL_FUNCTION("random_int", NULL, 291, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("random_int", NULL, 264, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -75307,7 +75375,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_Random, uuid) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "N1a/n1b/n1c/n1d/n1e/N1f"); - ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 290, &_2, &_0); + ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 263, &_2, &_0); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&ary, "array_values", NULL, 14, &_3); zephir_check_call_status(); @@ -75322,7 +75390,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_Random, uuid) ZEPHIR_INIT_VAR(&_7); ZVAL_STRING(&_7, "%08x-%04x-%04x-%04x-%04x%08x"); ZEPHIR_MAKE_REF(&ary); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 292, &ary, &_7); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 265, &ary, &_7); ZEPHIR_UNREF(&ary); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_7); @@ -75380,7 +75448,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_Random, base) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "C*"); - ZEPHIR_CALL_FUNCTION(&bytes, "unpack", NULL, 290, &_1, &_0); + ZEPHIR_CALL_FUNCTION(&bytes, "unpack", NULL, 263, &_1, &_0); zephir_check_call_status(); zephir_is_iterable(&bytes, 0, "phalcon/Encryption/Security/Random.zep", 351); if (Z_TYPE_P(&bytes) == IS_ARRAY) { @@ -75508,7 +75576,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, init) zephir_update_property_zval(this_ptr, ZEND_STRL("passphrase"), &_0); ZEPHIR_INIT_NVAR(&_0); object_init_ex(&_0, phalcon_support_collection_ce); - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 24); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 22); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("claims"), &_0); ZEPHIR_INIT_VAR(&_1); @@ -75517,7 +75585,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, init) zephir_create_array(&_2, 2, 0); add_assoc_stringl_ex(&_2, SL("typ"), SL("JWT")); add_assoc_stringl_ex(&_2, SL("alg"), SL("none")); - ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 24, &_2); + ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 22, &_2); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("jose"), &_1); RETURN_THIS(); @@ -75836,27 +75904,27 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, getToken) } ZEPHIR_CALL_METHOD(&_2, this_ptr, "getclaims", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "encode", NULL, 276, &_2); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "encode", NULL, 249, &_2); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&encodedClaims, this_ptr, "encodeurl", NULL, 277, &_1); + ZEPHIR_CALL_METHOD(&encodedClaims, this_ptr, "encodeurl", NULL, 250, &_1); zephir_check_call_status(); ZEPHIR_INIT_VAR(&claims); object_init_ex(&claims, phalcon_encryption_security_jwt_token_item_ce); ZEPHIR_CALL_METHOD(&_3, this_ptr, "getclaims", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &claims, "__construct", NULL, 278, &_3, &encodedClaims); + ZEPHIR_CALL_METHOD(NULL, &claims, "__construct", NULL, 251, &_3, &encodedClaims); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_5, this_ptr, "getheaders", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "encode", NULL, 276, &_5); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "encode", NULL, 249, &_5); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&encodedHeaders, this_ptr, "encodeurl", NULL, 277, &_4); + ZEPHIR_CALL_METHOD(&encodedHeaders, this_ptr, "encodeurl", NULL, 250, &_4); zephir_check_call_status(); ZEPHIR_INIT_VAR(&headers); object_init_ex(&headers, phalcon_encryption_security_jwt_token_item_ce); ZEPHIR_CALL_METHOD(&_6, this_ptr, "getheaders", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &headers, "__construct", NULL, 278, &_6, &encodedHeaders); + ZEPHIR_CALL_METHOD(NULL, &headers, "__construct", NULL, 251, &_6, &encodedHeaders); zephir_check_call_status(); zephir_read_property(&_7, this_ptr, ZEND_STRL("signer"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_8); @@ -75864,14 +75932,14 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, getToken) zephir_read_property(&_9, this_ptr, ZEND_STRL("passphrase"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&signatureHash, &_7, "sign", NULL, 0, &_8, &_9); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&encodedSignature, this_ptr, "encodeurl", NULL, 277, &signatureHash); + ZEPHIR_CALL_METHOD(&encodedSignature, this_ptr, "encodeurl", NULL, 250, &signatureHash); zephir_check_call_status(); ZEPHIR_INIT_VAR(&signature); object_init_ex(&signature, phalcon_encryption_security_jwt_token_signature_ce); - ZEPHIR_CALL_METHOD(NULL, &signature, "__construct", NULL, 279, &signatureHash, &encodedSignature); + ZEPHIR_CALL_METHOD(NULL, &signature, "__construct", NULL, 252, &signatureHash, &encodedSignature); zephir_check_call_status(); object_init_ex(return_value, phalcon_encryption_security_jwt_token_token_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 280, &headers, &claims, &signature); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 253, &headers, &claims, &signature); zephir_check_call_status(); RETURN_MM(); } @@ -76310,7 +76378,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, encodeUrl) } - ZEPHIR_CALL_FUNCTION(&_0, "base64_encode", NULL, 251, &input); + ZEPHIR_CALL_FUNCTION(&_0, "base64_encode", NULL, 224, &input); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "+/"); @@ -76371,16 +76439,16 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, encode) ZVAL_LONG(&_1, depth); ZEPHIR_INIT_VAR(&encoded); zephir_json_encode(&encoded, data, zephir_get_intval(&_0) ); - ZEPHIR_CALL_FUNCTION(&_2, "json_last_error", NULL, 215); + ZEPHIR_CALL_FUNCTION(&_2, "json_last_error", NULL, 187); zephir_check_call_status(); if (UNEXPECTED(!ZEPHIR_IS_LONG_IDENTICAL(&_2, 0))) { ZEPHIR_INIT_VAR(&_3$$3); object_init_ex(&_3$$3, spl_ce_InvalidArgumentException); - ZEPHIR_CALL_FUNCTION(&_4$$3, "json_last_error_msg", NULL, 216); + ZEPHIR_CALL_FUNCTION(&_4$$3, "json_last_error_msg", NULL, 188); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5$$3); ZEPHIR_CONCAT_SV(&_5$$3, "json_encode error: ", &_4$$3); - ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 40, &_5$$3); + ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 189, &_5$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$3, "phalcon/Encryption/Security/JWT/Builder.zep", 451); ZEPHIR_MM_RESTORE(); @@ -76551,7 +76619,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateExpiration) _4 = zephir_is_true(&_2); if (_4) { ZVAL_LONG(&_6, timestamp); - ZEPHIR_CALL_METHOD(&_5, this_ptr, "gettimestamp", NULL, 288, &_6); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "gettimestamp", NULL, 261, &_6); zephir_check_call_status(); zephir_read_property(&_6, this_ptr, ZEND_STRL("token"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&_7, &_6, "getclaims", NULL, 0); @@ -76645,7 +76713,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateIssuedAt) ZVAL_LONG(&_1, timestamp); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "gettimestamp", NULL, 288, &_1); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "gettimestamp", NULL, 261, &_1); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("token"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&_2, &_1, "getclaims", NULL, 0); @@ -76737,7 +76805,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateNotBefore) ZVAL_LONG(&_1, timestamp); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "gettimestamp", NULL, 288, &_1); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "gettimestamp", NULL, 261, &_1); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("token"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&_2, &_1, "getclaims", NULL, 0); @@ -77020,7 +77088,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Signer_Hmac, sign) } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethash", NULL, 281, &payload, &passphrase); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethash", NULL, 254, &payload, &passphrase); zephir_check_call_status(); RETURN_MM(); } @@ -77078,7 +77146,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Signer_Hmac, verify) } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "gethash", NULL, 281, &payload, &passphrase); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "gethash", NULL, 254, &payload, &passphrase); zephir_check_call_status(); RETURN_MM_BOOL(zephir_hash_equals(&source, &_0)); } @@ -77128,7 +77196,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Signer_Hmac, getHash) ZEPHIR_CALL_METHOD(&_0, this_ptr, "getalgorithm", NULL, 0); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("hash_hmac", NULL, 249, &_0, &payload, &passphrase, &__$true); + ZEPHIR_RETURN_CALL_FUNCTION("hash_hmac", NULL, 222, &_0, &payload, &passphrase, &__$true); zephir_check_call_status(); RETURN_MM(); } @@ -77598,7 +77666,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, parse) } - ZEPHIR_CALL_METHOD(&results, this_ptr, "parsetoken", NULL, 282, &token); + ZEPHIR_CALL_METHOD(&results, this_ptr, "parsetoken", NULL, 255, &token); zephir_check_call_status(); ZEPHIR_OBS_VAR(&encodedHeaders); zephir_array_fetch_long(&encodedHeaders, &results, 0, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 33); @@ -77606,14 +77674,14 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, parse) zephir_array_fetch_long(&encodedClaims, &results, 1, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 34); ZEPHIR_OBS_VAR(&encodedSignature); zephir_array_fetch_long(&encodedSignature, &results, 2, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 35); - ZEPHIR_CALL_METHOD(&headers, this_ptr, "decodeheaders", NULL, 283, &encodedHeaders); + ZEPHIR_CALL_METHOD(&headers, this_ptr, "decodeheaders", NULL, 256, &encodedHeaders); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&claims, this_ptr, "decodeclaims", NULL, 284, &encodedClaims); + ZEPHIR_CALL_METHOD(&claims, this_ptr, "decodeclaims", NULL, 257, &encodedClaims); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&signature, this_ptr, "decodesignature", NULL, 285, &headers, &encodedSignature); + ZEPHIR_CALL_METHOD(&signature, this_ptr, "decodesignature", NULL, 258, &headers, &encodedSignature); zephir_check_call_status(); object_init_ex(return_value, phalcon_encryption_security_jwt_token_token_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 280, &headers, &claims, &signature); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 253, &headers, &claims, &signature); zephir_check_call_status(); RETURN_MM(); } @@ -77648,10 +77716,10 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeClaims) zephir_get_strval(&claims, claims_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "decodeurl", NULL, 286, &claims); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "decodeurl", NULL, 259, &claims); zephir_check_call_status(); ZVAL_BOOL(&_1, 1); - ZEPHIR_CALL_METHOD(&decoded, this_ptr, "decode", NULL, 287, &_0, &_1); + ZEPHIR_CALL_METHOD(&decoded, this_ptr, "decode", NULL, 260, &_0, &_1); zephir_check_call_status(); if (Z_TYPE_P(&decoded) != IS_ARRAY) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Invalid Claims (not an array)", "phalcon/Encryption/Security/JWT/Token/Parser.zep", 59); @@ -77672,7 +77740,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeClaims) zephir_array_update_string(&decoded, SL("aud"), &_4$$4, PH_COPY | PH_SEPARATE); } object_init_ex(return_value, phalcon_encryption_security_jwt_token_item_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 278, &decoded, &claims); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 251, &decoded, &claims); zephir_check_call_status(); RETURN_MM(); } @@ -77702,10 +77770,10 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeHeaders) zephir_get_strval(&headers, headers_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "decodeurl", NULL, 286, &headers); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "decodeurl", NULL, 259, &headers); zephir_check_call_status(); ZVAL_BOOL(&_1, 1); - ZEPHIR_CALL_METHOD(&decoded, this_ptr, "decode", NULL, 287, &_0, &_1); + ZEPHIR_CALL_METHOD(&decoded, this_ptr, "decode", NULL, 260, &_0, &_1); zephir_check_call_status(); if (Z_TYPE_P(&decoded) != IS_ARRAY) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Invalid Header (not an array)", "phalcon/Encryption/Security/JWT/Token/Parser.zep", 88); @@ -77716,7 +77784,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeHeaders) return; } object_init_ex(return_value, phalcon_encryption_security_jwt_token_item_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 278, &decoded, &headers); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 251, &decoded, &headers); zephir_check_call_status(); RETURN_MM(); } @@ -77763,11 +77831,11 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeSignature) ZVAL_STRING(&decoded, ""); ZEPHIR_INIT_NVAR(&signature); } else { - ZEPHIR_CALL_METHOD(&decoded, this_ptr, "decodeurl", NULL, 286, &signature); + ZEPHIR_CALL_METHOD(&decoded, this_ptr, "decodeurl", NULL, 259, &signature); zephir_check_call_status(); } object_init_ex(return_value, phalcon_encryption_security_jwt_token_signature_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 279, &decoded, &signature); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 252, &decoded, &signature); zephir_check_call_status(); RETURN_MM(); } @@ -77874,16 +77942,16 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decode) ZVAL_LONG(&_2, options); ZEPHIR_INIT_VAR(&decoded); zephir_json_decode(&decoded, &data, zephir_get_intval(&_0) ); - ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 215); + ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 187); zephir_check_call_status(); if (UNEXPECTED(!ZEPHIR_IS_LONG_IDENTICAL(&_3, 0))) { ZEPHIR_INIT_VAR(&_4$$3); object_init_ex(&_4$$3, spl_ce_InvalidArgumentException); - ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 216); + ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 188); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6$$3); ZEPHIR_CONCAT_SV(&_6$$3, "json_decode error: ", &_5$$3); - ZEPHIR_CALL_METHOD(NULL, &_4$$3, "__construct", NULL, 40, &_6$$3); + ZEPHIR_CALL_METHOD(NULL, &_4$$3, "__construct", NULL, 189, &_6$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_4$$3, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 163); ZEPHIR_MM_RESTORE(); @@ -77944,7 +78012,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeUrl) ZVAL_STRING(&_4, "+/"); ZEPHIR_CALL_FUNCTION(&_5, "strtr", NULL, 5, &input, &_3, &_4); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&data, "base64_decode", NULL, 250, &_5); + ZEPHIR_CALL_FUNCTION(&data, "base64_decode", NULL, 223, &_5); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&data)) { ZEPHIR_INIT_NVAR(&data); @@ -78388,7 +78456,7 @@ static PHP_METHOD(Phalcon_Events_Event, __construct) zephir_gettype(&_2$$3, source); ZEPHIR_INIT_VAR(&_3$$3); ZEPHIR_CONCAT_SVSV(&_3$$3, "The source of ", &type, " event must be an object, got ", &_2$$3); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 31, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_3$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Events/Event.zep", 75); ZEPHIR_MM_RESTORE(); @@ -78658,7 +78726,7 @@ static PHP_METHOD(Phalcon_Events_Manager, attach) } ZVAL_LONG(&_2$$4, 1); - ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "setextractflags", NULL, 293, &_2$$4); + ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "setextractflags", NULL, 266, &_2$$4); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("events"), &eventType, &priorityQueue); } @@ -78667,7 +78735,7 @@ static PHP_METHOD(Phalcon_Events_Manager, attach) priority = 100; } ZVAL_LONG(&_4, priority); - ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "insert", NULL, 294, handler, &_4); + ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "insert", NULL, 267, handler, &_4); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -78768,7 +78836,7 @@ static PHP_METHOD(Phalcon_Events_Manager, detach) } ZVAL_LONG(&_2$$4, 1); - ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "setextractflags", NULL, 293, &_2$$4); + ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "setextractflags", NULL, 266, &_2$$4); zephir_check_call_status(); ZVAL_LONG(&_2$$4, 3); ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "setextractflags", NULL, 0, &_2$$4); @@ -78789,7 +78857,7 @@ static PHP_METHOD(Phalcon_Events_Manager, detach) if (!ZEPHIR_IS_IDENTICAL(&_6$$5, handler)) { zephir_array_fetch_string(&_7$$6, &data, SL("data"), PH_NOISY | PH_READONLY, "phalcon/Events/Manager.zep", 136); zephir_array_fetch_string(&_8$$6, &data, SL("priority"), PH_NOISY | PH_READONLY, "phalcon/Events/Manager.zep", 138); - ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "insert", &_9, 294, &_7$$6, &_8$$6); + ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "insert", &_9, 267, &_7$$6, &_8$$6); zephir_check_call_status(); } } @@ -78944,7 +79012,7 @@ static PHP_METHOD(Phalcon_Events_Manager, fire) object_init_ex(&_1$$4, phalcon_events_exception_ce); ZEPHIR_INIT_VAR(&_2$$4); ZEPHIR_CONCAT_SV(&_2$$4, "Invalid event type ", &eventType); - ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 31, &_2$$4); + ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 29, &_2$$4); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$4, "phalcon/Events/Manager.zep", 200); ZEPHIR_MM_RESTORE(); @@ -78971,19 +79039,19 @@ static PHP_METHOD(Phalcon_Events_Manager, fire) } else { ZVAL_BOOL(&_4, 0); } - ZEPHIR_CALL_METHOD(NULL, &event, "__construct", NULL, 295, &eventName, source, data, &_4); + ZEPHIR_CALL_METHOD(NULL, &event, "__construct", NULL, 268, &eventName, source, data, &_4); zephir_check_call_status(); ZEPHIR_OBS_VAR(&fireEvents); if (zephir_array_isset_fetch(&fireEvents, &events, &type, 0)) { if (Z_TYPE_P(&fireEvents) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", NULL, 296, &fireEvents, &event); + ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", NULL, 269, &fireEvents, &event); zephir_check_call_status(); } } ZEPHIR_OBS_NVAR(&fireEvents); if (zephir_array_isset_fetch(&fireEvents, &events, &eventType, 0)) { if (Z_TYPE_P(&fireEvents) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", NULL, 296, &fireEvents, &event); + ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", NULL, 269, &fireEvents, &event); zephir_check_call_status(); } } @@ -79853,7 +79921,7 @@ static PHP_METHOD(Phalcon_Filter_Filter, get) object_init_ex(&_1$$3, phalcon_filter_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZEPHIR_CONCAT_SVS(&_2$$3, "Filter ", &name, " is not registered"); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 31, &_2$$3); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_2$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Filter/Filter.zep", 119); ZEPHIR_MM_RESTORE(); @@ -79864,7 +79932,7 @@ static PHP_METHOD(Phalcon_Filter_Filter, get) zephir_read_property(&_4$$4, this_ptr, ZEND_STRL("mapper"), PH_NOISY_CC | PH_READONLY); ZEPHIR_OBS_VAR(&definition); zephir_array_fetch(&definition, &_4$$4, &name, PH_NOISY, "phalcon/Filter/Filter.zep", 123); - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "createinstance", NULL, 297, &definition); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "createinstance", NULL, 270, &definition); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("services"), &name, &_5$$4); } @@ -79936,7 +80004,7 @@ static PHP_METHOD(Phalcon_Filter_Filter, sanitize) } else { ZVAL_BOOL(&_0$$3, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarraysanitizers", NULL, 298, sanitizers, value, &_0$$3); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarraysanitizers", NULL, 271, sanitizers, value, &_0$$3); zephir_check_call_status(); RETURN_MM(); } @@ -79945,11 +80013,11 @@ static PHP_METHOD(Phalcon_Filter_Filter, sanitize) _1 = !noRecursive; } if (_1) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarrayvalues", NULL, 299, value, sanitizers); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarrayvalues", NULL, 272, value, sanitizers); zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "sanitizer", NULL, 300, value, sanitizers); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "sanitizer", NULL, 273, value, sanitizers); zephir_check_call_status(); RETURN_MM(); } @@ -80139,7 +80207,7 @@ static PHP_METHOD(Phalcon_Filter_Filter, processArraySanitizers) } ZEPHIR_INIT_NVAR(&sanitizer); ZVAL_COPY(&sanitizer, _0); - ZEPHIR_CALL_METHOD(&split, this_ptr, "splitsanitizerparameters", &_4, 301, &sanitizerKey, &sanitizer); + ZEPHIR_CALL_METHOD(&split, this_ptr, "splitsanitizerparameters", &_4, 274, &sanitizerKey, &sanitizer); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&sanitizerName); zephir_array_fetch_long(&sanitizerName, &split, 0, PH_NOISY, "phalcon/Filter/Filter.zep", 279); @@ -80150,10 +80218,10 @@ static PHP_METHOD(Phalcon_Filter_Filter, processArraySanitizers) } else { ZVAL_BOOL(&_6$$4, 0); } - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "processvalueisarray", &_7, 302, value, &sanitizerName, &sanitizerParams, &_6$$4); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "processvalueisarray", &_7, 275, value, &sanitizerName, &sanitizerParams, &_6$$4); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_5$$4); - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "processvalueisnotarray", &_8, 303, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "processvalueisnotarray", &_8, 276, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_5$$4); } ZEND_HASH_FOREACH_END(); @@ -80170,7 +80238,7 @@ static PHP_METHOD(Phalcon_Filter_Filter, processArraySanitizers) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&sanitizer, &sanitizers, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&split, this_ptr, "splitsanitizerparameters", &_4, 301, &sanitizerKey, &sanitizer); + ZEPHIR_CALL_METHOD(&split, this_ptr, "splitsanitizerparameters", &_4, 274, &sanitizerKey, &sanitizer); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&sanitizerName); zephir_array_fetch_long(&sanitizerName, &split, 0, PH_NOISY, "phalcon/Filter/Filter.zep", 279); @@ -80181,10 +80249,10 @@ static PHP_METHOD(Phalcon_Filter_Filter, processArraySanitizers) } else { ZVAL_BOOL(&_10$$5, 0); } - ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "processvalueisarray", &_7, 302, value, &sanitizerName, &sanitizerParams, &_10$$5); + ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "processvalueisarray", &_7, 275, value, &sanitizerName, &sanitizerParams, &_10$$5); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_9$$5); - ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "processvalueisnotarray", &_8, 303, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "processvalueisnotarray", &_8, 276, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_9$$5); ZEPHIR_CALL_METHOD(NULL, &sanitizers, "next", NULL, 0); @@ -80255,7 +80323,7 @@ static PHP_METHOD(Phalcon_Filter_Filter, processArrayValues) } ZEPHIR_INIT_NVAR(&itemValue); ZVAL_COPY(&itemValue, _0); - ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "sanitizer", &_5, 300, &itemValue, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "sanitizer", &_5, 273, &itemValue, &sanitizerName, &sanitizerParams); zephir_check_call_status(); zephir_array_update_zval(&arrayValues, &itemKey, &_4$$3, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -80272,7 +80340,7 @@ static PHP_METHOD(Phalcon_Filter_Filter, processArrayValues) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&itemValue, &values, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "sanitizer", &_5, 300, &itemValue, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "sanitizer", &_5, 273, &itemValue, &sanitizerName, &sanitizerParams); zephir_check_call_status(); zephir_array_update_zval(&arrayValues, &itemKey, &_6$$4, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &values, "next", NULL, 0); @@ -80387,7 +80455,7 @@ static PHP_METHOD(Phalcon_Filter_Filter, processValueIsArray) _0 = !noRecursive; } if (_0) { - ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "processarrayvalues", NULL, 299, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "processarrayvalues", NULL, 272, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_1$$3); } @@ -80426,7 +80494,7 @@ static PHP_METHOD(Phalcon_Filter_Filter, processValueIsNotArray) if (Z_TYPE_P(value) != IS_ARRAY) { - ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "sanitizer", NULL, 300, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "sanitizer", NULL, 273, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_0$$3); } @@ -80534,7 +80602,7 @@ static PHP_METHOD(Phalcon_Filter_FilterFactory, newInstance) object_init_ex(return_value, phalcon_filter_filter_ce); ZEPHIR_CALL_METHOD(&_0, this_ptr, "getservices", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 304, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 277, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -80684,13 +80752,13 @@ static PHP_METHOD(Phalcon_Filter_Validation, __construct) ZEPHIR_INIT_VAR(&_0); ZEPHIR_INIT_NVAR(&_0); - zephir_create_closure_ex(&_0, NULL, phalcon_10__closure_ce, SL("__invoke")); + zephir_create_closure_ex(&_0, NULL, phalcon_8__closure_ce, SL("__invoke")); ZEPHIR_CALL_FUNCTION(&_1, "array_filter", NULL, 17, &validators, &_0); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("validators"), &_1); ZEPHIR_INIT_VAR(&_2); ZEPHIR_INIT_NVAR(&_2); - zephir_create_closure_ex(&_2, NULL, phalcon_11__closure_ce, SL("__invoke")); + zephir_create_closure_ex(&_2, NULL, phalcon_9__closure_ce, SL("__invoke")); ZEPHIR_CALL_FUNCTION(&_3, "array_filter", NULL, 17, &validators, &_2); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("combinedFieldsValidators"), &_3); @@ -80800,7 +80868,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, appendMessage) ZEPHIR_CALL_METHOD(NULL, &messages, "__construct", NULL, 8); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &messages, "appendmessage", NULL, 310, message); + ZEPHIR_CALL_METHOD(NULL, &messages, "appendmessage", NULL, 283, message); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("messages"), &messages); RETURN_THIS(); @@ -81146,7 +81214,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, getValue) zephir_camelize(&_6$$13, &field, NULL ); ZEPHIR_INIT_VAR(&method); ZEPHIR_CONCAT_SV(&method, "set", &_6$$13); - ZEPHIR_CALL_FUNCTION(&_7$$13, "property_exists", NULL, 311, &entity, &field); + ZEPHIR_CALL_FUNCTION(&_7$$13, "property_exists", NULL, 284, &entity, &field); zephir_check_call_status(); if ((zephir_method_exists(&entity, &method) == SUCCESS)) { ZEPHIR_CALL_METHOD_ZVAL(NULL, &entity, &method, NULL, 0, &value); @@ -81766,7 +81834,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, preChecking) { ZEPHIR_INIT_NVAR(&singleField); ZVAL_COPY(&singleField, _0$$3); - ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "prechecking", &_3, 312, &singleField, validator); + ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "prechecking", &_3, 285, &singleField, validator); zephir_check_call_status(); zephir_array_append(&results, &_2$$4, PH_SEPARATE, "phalcon/Filter/Validation.zep", 592); if (zephir_fast_in_array(&__$false, &results)) { @@ -81785,7 +81853,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, preChecking) } ZEPHIR_CALL_METHOD(&singleField, field, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "prechecking", &_3, 312, &singleField, validator); + ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "prechecking", &_3, 285, &singleField, validator); zephir_check_call_status(); zephir_array_append(&results, &_4$$6, PH_SEPARATE, "phalcon/Filter/Validation.zep", 592); if (zephir_fast_in_array(&__$false, &results)) { @@ -81945,10 +82013,10 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_AbsInt, __invoke) ZVAL_LONG(&_0, 519); - ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 305, input, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 278, input, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, zephir_get_intval(&_1)); - ZEPHIR_RETURN_CALL_FUNCTION("abs", NULL, 306, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("abs", NULL, 279, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -81996,7 +82064,7 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_Alnum, __invoke) ZVAL_STRING(&_0, "/[^A-Za-z0-9]/"); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, ""); - ZEPHIR_RETURN_CALL_FUNCTION("preg_replace", NULL, 50, &_0, &_1, input); + ZEPHIR_RETURN_CALL_FUNCTION("preg_replace", NULL, 37, &_0, &_1, input); zephir_check_call_status(); RETURN_MM(); } @@ -82044,7 +82112,7 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_Alpha, __invoke) ZVAL_STRING(&_0, "/[^A-Za-z]/"); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, ""); - ZEPHIR_RETURN_CALL_FUNCTION("preg_replace", NULL, 50, &_0, &_1, input); + ZEPHIR_RETURN_CALL_FUNCTION("preg_replace", NULL, 37, &_0, &_1, input); zephir_check_call_status(); RETURN_MM(); } @@ -82172,7 +82240,7 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_Email, __invoke) ZVAL_LONG(&_0, 517); ZVAL_LONG(&_1, 1048576); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 305, input, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 278, input, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -82222,7 +82290,7 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_FloatVal, __invoke) zephir_create_array(&_0, 1, 0); add_assoc_long_ex(&_0, SL("flags"), 4096); ZVAL_LONG(&_1, 520); - ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 305, input, &_1, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 278, input, &_1, &_0); zephir_check_call_status(); RETURN_MM_DOUBLE(zephir_get_doubleval(&_2)); } @@ -82267,7 +82335,7 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_IntVal, __invoke) ZVAL_LONG(&_0, 519); - ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 305, input, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 278, input, &_0); zephir_check_call_status(); RETURN_MM_LONG(zephir_get_intval(&_1)); } @@ -82330,7 +82398,7 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_Lower, __invoke) zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 307, &input); + ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 280, &input); zephir_check_call_status(); zephir_fast_strtolower(return_value, &_2); RETURN_MM(); @@ -82383,7 +82451,7 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_LowerFirst, __invoke) } - ZEPHIR_RETURN_CALL_FUNCTION("lcfirst", NULL, 104, &input); + ZEPHIR_RETURN_CALL_FUNCTION("lcfirst", NULL, 73, &input); zephir_check_call_status(); RETURN_MM(); } @@ -82429,7 +82497,7 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_Regex, __invoke) zephir_fetch_params(1, 3, 0, &input, &pattern, &replace); - ZEPHIR_RETURN_CALL_FUNCTION("preg_replace", NULL, 50, pattern, replace, input); + ZEPHIR_RETURN_CALL_FUNCTION("preg_replace", NULL, 37, pattern, replace, input); zephir_check_call_status(); RETURN_MM(); } @@ -82566,7 +82634,7 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_Special, __invoke) ZVAL_LONG(&_0, 515); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 305, input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 278, input, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -82610,7 +82678,7 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_SpecialFull, __invoke) ZVAL_LONG(&_0, 522); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 305, input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 278, input, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -82634,13 +82702,23 @@ ZEPHIR_INIT_CLASS(Phalcon_Filter_Sanitize_StringVal) static PHP_METHOD(Phalcon_Filter_Sanitize_StringVal, __invoke) { + zval _7, _8; + zval _2; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *input, input_sub, _0; + zval *input = NULL, input_sub, _0, _1, _3, _4, _5, _6; zval *this_ptr = getThis(); ZVAL_UNDEF(&input_sub); ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_4); + ZVAL_UNDEF(&_5); + ZVAL_UNDEF(&_6); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_7); + ZVAL_UNDEF(&_8); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -82651,12 +82729,46 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_StringVal, __invoke) ZEPHIR_MM_GROW(); zephir_fetch_params(1, 1, 0, &input); + ZEPHIR_SEPARATE_PARAM(input); - ZVAL_LONG(&_0, 513); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 305, input, &_0); + if (Z_TYPE_P(input) == IS_ARRAY) { + RETURN_MM_BOOL(0); + } + ZVAL_LONG(&_0, 0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 237, &_0); zephir_check_call_status(); - RETURN_MM(); + zephir_cast_to_string(&_2, input); + ZEPHIR_INIT_VAR(&_3); + ZVAL_STRING(&_3, ""); + ZEPHIR_INIT_NVAR(input); + zephir_fast_str_replace(input, &_1, &_3, &_2); + ZEPHIR_INIT_VAR(&_4); + ZVAL_STRING(&_4, "/<[^>]*>?/"); + ZEPHIR_INIT_VAR(&_5); + ZVAL_STRING(&_5, ""); + ZEPHIR_CALL_FUNCTION(&_6, "preg_replace", NULL, 37, &_4, &_5, input); + zephir_check_call_status(); + ZEPHIR_CPY_WRT(input, &_6); + ZEPHIR_INIT_VAR(&_7); + zephir_create_array(&_7, 2, 0); + ZEPHIR_INIT_NVAR(&_4); + ZVAL_STRING(&_4, "'"); + zephir_array_fast_append(&_7, &_4); + ZEPHIR_INIT_NVAR(&_4); + ZVAL_STRING(&_4, "\""); + zephir_array_fast_append(&_7, &_4); + ZEPHIR_INIT_VAR(&_8); + zephir_create_array(&_8, 2, 0); + ZEPHIR_INIT_NVAR(&_4); + ZVAL_STRING(&_4, "'"); + zephir_array_fast_append(&_8, &_4); + ZEPHIR_INIT_NVAR(&_4); + ZVAL_STRING(&_4, """); + zephir_array_fast_append(&_8, &_4); + ZEPHIR_INIT_NVAR(&_4); + zephir_fast_str_replace(&_4, &_7, &_8, input); + RETURN_CCTOR(&_4); } @@ -82706,7 +82818,7 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_Striptags, __invoke) } - ZEPHIR_RETURN_CALL_FUNCTION("strip_tags", NULL, 308, &input); + ZEPHIR_RETURN_CALL_FUNCTION("strip_tags", NULL, 281, &input); zephir_check_call_status(); RETURN_MM(); } @@ -82819,7 +82931,7 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_Upper, __invoke) zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 307, &input); + ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 280, &input); zephir_check_call_status(); zephir_fast_strtoupper(return_value, &_2); RETURN_MM(); @@ -82933,9 +83045,9 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_UpperWords, __invoke) zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 307, &input); + ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 280, &input); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ucwords", NULL, 309, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("ucwords", NULL, 282, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -82979,7 +83091,7 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_Url, __invoke) ZVAL_LONG(&_0, 518); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 305, input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 278, input, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -83413,14 +83525,15 @@ static PHP_METHOD(Phalcon_Filter_Validation_AbstractValidator, prepareCode) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *field_param = NULL, code, _0, _1$$3; + zval *field_param = NULL, code, _0, _1, _2$$3; zval field; zval *this_ptr = getThis(); ZVAL_UNDEF(&field); ZVAL_UNDEF(&code); ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1$$3); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2$$3); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -83444,11 +83557,12 @@ static PHP_METHOD(Phalcon_Filter_Validation_AbstractValidator, prepareCode) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "code"); - ZEPHIR_CALL_METHOD(&code, this_ptr, "getoption", NULL, 0, &_0); + ZVAL_LONG(&_1, 0); + ZEPHIR_CALL_METHOD(&code, this_ptr, "getoption", NULL, 0, &_0, &_1); zephir_check_call_status(); if (Z_TYPE_P(&code) == IS_ARRAY) { - zephir_array_fetch(&_1$$3, &code, &field, PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/AbstractValidator.zep", 188); - ZEPHIR_CPY_WRT(&code, &_1$$3); + zephir_array_fetch(&_2$$3, &code, &field, PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/AbstractValidator.zep", 188); + ZEPHIR_CPY_WRT(&code, &_2$$3); } RETURN_CCTOR(&code); } @@ -83725,7 +83839,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_AbstractValidatorComposite, validate zephir_get_class(&_2$$3, this_ptr, 0); ZEPHIR_INIT_VAR(&_3$$3); ZEPHIR_CONCAT_VS(&_3$$3, &_2$$3, " does not have any validator added"); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 31, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_3$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Filter/Validation/AbstractValidatorComposite.zep", 33); ZEPHIR_MM_RESTORE(); @@ -84113,7 +84227,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Alnum, validate) if (zephir_is_true(&_0)) { RETURN_MM_BOOL(1); } - ZEPHIR_CALL_FUNCTION(&_1, "ctype_alnum", NULL, 313, &value); + ZEPHIR_CALL_FUNCTION(&_1, "ctype_alnum", NULL, 286, &value); zephir_check_call_status(); if (!(zephir_is_true(&_1))) { ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "messagefactory", NULL, 0, validation, field); @@ -84446,7 +84560,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Callback, validate) ZEPHIR_CALL_METHOD(&data, validation, "getdata", NULL, 0); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&returnedValue, "call_user_func", NULL, 206, &callback, &data); + ZEPHIR_CALL_FUNCTION(&returnedValue, "call_user_func", NULL, 178, &callback, &data); zephir_check_call_status(); _1$$3 = Z_TYPE_P(&returnedValue) == IS_OBJECT; if (_1$$3) { @@ -84569,7 +84683,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Confirmation, validate) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&valueWith, validation, "getvalue", NULL, 0, &fieldWith); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "compare", NULL, 314, &value, &valueWith); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "compare", NULL, 287, &value, &valueWith); zephir_check_call_status(); if (!(zephir_is_true(&_2))) { ZEPHIR_INIT_VAR(&_3$$4); @@ -84649,7 +84763,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Confirmation, compare) zephir_check_call_status(); zephir_get_strval(&b, &_5$$3); } - ZEPHIR_CALL_FUNCTION(&_6, "strcmp", NULL, 315, &a, &b); + ZEPHIR_CALL_FUNCTION(&_6, "strcmp", NULL, 288, &a, &b); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_LONG_IDENTICAL(&_6, 0)); } @@ -84739,7 +84853,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_CreditCard, validate) if (zephir_is_true(&_0)) { RETURN_MM_BOOL(1); } - ZEPHIR_CALL_METHOD(&valid, this_ptr, "verifybyluhnalgorithm", NULL, 316, &value); + ZEPHIR_CALL_METHOD(&valid, this_ptr, "verifybyluhnalgorithm", NULL, 289, &value); zephir_check_call_status(); if (!(zephir_is_true(&valid))) { ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "messagefactory", NULL, 0, validation, field); @@ -84791,11 +84905,11 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_CreditCard, verifyByLuhnAl ZEPHIR_INIT_VAR(&hash); ZVAL_STRING(&hash, ""); - ZEPHIR_CALL_FUNCTION(&_0, "str_split", NULL, 117, &number); + ZEPHIR_CALL_FUNCTION(&_0, "str_split", NULL, 84, &number); zephir_check_call_status(); zephir_get_arrval(&_1, &_0); ZEPHIR_CPY_WRT(&digits, &_1); - ZEPHIR_CALL_FUNCTION(&_3, "array_reverse", NULL, 317, &digits); + ZEPHIR_CALL_FUNCTION(&_3, "array_reverse", NULL, 290, &digits); zephir_check_call_status(); zephir_is_iterable(&_3, 0, "phalcon/Filter/Validation/Validator/CreditCard.zep", 109); if (Z_TYPE_P(&_3) == IS_ARRAY) { @@ -84845,9 +84959,9 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_CreditCard, verifyByLuhnAl } ZEPHIR_INIT_NVAR(&digit); ZEPHIR_INIT_NVAR(&position); - ZEPHIR_CALL_FUNCTION(&_10, "str_split", NULL, 117, &hash); + ZEPHIR_CALL_FUNCTION(&_10, "str_split", NULL, 84, &hash); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&result, "array_sum", NULL, 318, &_10); + ZEPHIR_CALL_FUNCTION(&result, "array_sum", NULL, 291, &_10); zephir_check_call_status(); RETURN_MM_BOOL((zephir_safe_mod_zval_long(&result, 10) == 0)); } @@ -84952,7 +85066,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Date, validate) ZEPHIR_INIT_NVAR(&format); ZVAL_STRING(&format, "Y-m-d"); } - ZEPHIR_CALL_METHOD(&_3, this_ptr, "checkdate", NULL, 319, &value, &format); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "checkdate", NULL, 292, &value, &format); zephir_check_call_status(); if (!(zephir_is_true(&_3))) { ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "messagefactory", NULL, 0, validation, field); @@ -85098,7 +85212,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Digit, validate) } _1 = Z_TYPE_P(&value) == IS_LONG; if (!(_1)) { - ZEPHIR_CALL_FUNCTION(&_2, "ctype_digit", NULL, 320, &value); + ZEPHIR_CALL_FUNCTION(&_2, "ctype_digit", NULL, 293, &value); zephir_check_call_status(); _1 = zephir_is_true(&_2); } @@ -85199,7 +85313,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Email, validate) RETURN_MM_BOOL(1); } ZVAL_LONG(&_1, 274); - ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 305, &value, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 278, &value, &_1); zephir_check_call_status(); if (!(zephir_is_true(&_2))) { ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "messagefactory", NULL, 0, validation, field); @@ -85356,7 +85470,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_ExclusionIn, validate) return; } } - ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 321, &value, &domain, &strict); + ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 294, &value, &domain, &strict); zephir_check_call_status(); if (zephir_is_true(&_5)) { ZEPHIR_INIT_VAR(&replacePairs); @@ -85498,21 +85612,21 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) if (zephir_array_isset_string(&options, SL("messageFileEmpty"))) { ZEPHIR_INIT_VAR(&_0$$3); ZVAL_STRING(&_0$$3, "messageFileEmpty"); - ZEPHIR_CALL_METHOD(&messageFileEmpty, &helper, "__invoke", NULL, 178, &options, &_0$$3); + ZEPHIR_CALL_METHOD(&messageFileEmpty, &helper, "__invoke", NULL, 150, &options, &_0$$3); zephir_check_call_status(); zephir_array_unset_string(&options, SL("messageFileEmpty"), PH_SEPARATE); } if (zephir_array_isset_string(&options, SL("messageIniSize"))) { ZEPHIR_INIT_VAR(&_1$$4); ZVAL_STRING(&_1$$4, "messageIniSize"); - ZEPHIR_CALL_METHOD(&messageIniSize, &helper, "__invoke", NULL, 178, &options, &_1$$4); + ZEPHIR_CALL_METHOD(&messageIniSize, &helper, "__invoke", NULL, 150, &options, &_1$$4); zephir_check_call_status(); zephir_array_unset_string(&options, SL("messageIniSize"), PH_SEPARATE); } if (zephir_array_isset_string(&options, SL("messageValid"))) { ZEPHIR_INIT_VAR(&_2$$5); ZVAL_STRING(&_2$$5, "messageValid"); - ZEPHIR_CALL_METHOD(&messageValid, &helper, "__invoke", NULL, 178, &options, &_2$$5); + ZEPHIR_CALL_METHOD(&messageValid, &helper, "__invoke", NULL, 150, &options, &_2$$5); zephir_check_call_status(); zephir_array_unset_string(&options, SL("messageValid"), PH_SEPARATE); } @@ -85530,40 +85644,40 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) ZVAL_COPY(&value, _3); ZEPHIR_INIT_NVAR(&_7$$6); ZVAL_STRING(&_7$$6, "minSize"); - ZEPHIR_CALL_FUNCTION(&_8$$6, "strcasecmp", &_9, 47, &key, &_7$$6); + ZEPHIR_CALL_FUNCTION(&_8$$6, "strcasecmp", &_9, 34, &key, &_7$$6); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_7$$6); ZVAL_STRING(&_7$$6, "maxSize"); - ZEPHIR_CALL_FUNCTION(&_10$$6, "strcasecmp", &_9, 47, &key, &_7$$6); + ZEPHIR_CALL_FUNCTION(&_10$$6, "strcasecmp", &_9, 34, &key, &_7$$6); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_7$$6); ZVAL_STRING(&_7$$6, "equalSize"); - ZEPHIR_CALL_FUNCTION(&_11$$6, "strcasecmp", &_9, 47, &key, &_7$$6); + ZEPHIR_CALL_FUNCTION(&_11$$6, "strcasecmp", &_9, 34, &key, &_7$$6); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_7$$6); ZVAL_STRING(&_7$$6, "allowedTypes"); - ZEPHIR_CALL_FUNCTION(&_12$$6, "strcasecmp", &_9, 47, &key, &_7$$6); + ZEPHIR_CALL_FUNCTION(&_12$$6, "strcasecmp", &_9, 34, &key, &_7$$6); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_7$$6); ZVAL_STRING(&_7$$6, "maxResolution"); - ZEPHIR_CALL_FUNCTION(&_13$$6, "strcasecmp", &_9, 47, &key, &_7$$6); + ZEPHIR_CALL_FUNCTION(&_13$$6, "strcasecmp", &_9, 34, &key, &_7$$6); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_7$$6); ZVAL_STRING(&_7$$6, "minResolution"); - ZEPHIR_CALL_FUNCTION(&_14$$6, "strcasecmp", &_9, 47, &key, &_7$$6); + ZEPHIR_CALL_FUNCTION(&_14$$6, "strcasecmp", &_9, 34, &key, &_7$$6); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_7$$6); ZVAL_STRING(&_7$$6, "equalResolution"); - ZEPHIR_CALL_FUNCTION(&_15$$6, "strcasecmp", &_9, 47, &key, &_7$$6); + ZEPHIR_CALL_FUNCTION(&_15$$6, "strcasecmp", &_9, 34, &key, &_7$$6); zephir_check_call_status(); if (ZEPHIR_IS_LONG_IDENTICAL(&_8$$6, 0)) { ZEPHIR_INIT_NVAR(&_16$$7); ZVAL_STRING(&_16$$7, "messageMinSize"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_16$$7); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 150, &options, &_16$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$7); ZVAL_STRING(&_16$$7, "includedMinSize"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 178, &options, &_16$$7); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 150, &options, &_16$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_min_ce); @@ -85572,18 +85686,18 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_17$$7, SL("size"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_17$$7, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_17$$7, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_18, 322, &_17$$7); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_18, 295, &_17$$7); zephir_check_call_status(); zephir_array_unset_string(&options, SL("messageMinSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMinSize"), PH_SEPARATE); } else if (ZEPHIR_IS_LONG_IDENTICAL(&_10$$6, 0)) { ZEPHIR_INIT_NVAR(&_19$$8); ZVAL_STRING(&_19$$8, "messageSize"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_19$$8); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 150, &options, &_19$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_19$$8); ZVAL_STRING(&_19$$8, "includedSize"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 178, &options, &_19$$8); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 150, &options, &_19$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_max_ce); @@ -85592,7 +85706,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_20$$8, SL("size"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_20$$8, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_20$$8, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_21, 323, &_20$$8); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_21, 296, &_20$$8); zephir_check_call_status(); zephir_array_unset_string(&options, SL("maxSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageSize"), PH_SEPARATE); @@ -85600,7 +85714,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) } else if (ZEPHIR_IS_LONG_IDENTICAL(&_11$$6, 0)) { ZEPHIR_INIT_NVAR(&_22$$9); ZVAL_STRING(&_22$$9, "messageEqualSize"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_22$$9); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 150, &options, &_22$$9); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_equal_ce); @@ -85608,14 +85722,14 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_create_array(&_23$$9, 2, 0); zephir_array_update_string(&_23$$9, SL("size"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_23$$9, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_24, 324, &_23$$9); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_24, 297, &_23$$9); zephir_check_call_status(); zephir_array_unset_string(&options, SL("equalSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageEqualSize"), PH_SEPARATE); } else if (ZEPHIR_IS_LONG_IDENTICAL(&_12$$6, 0)) { ZEPHIR_INIT_NVAR(&_25$$10); ZVAL_STRING(&_25$$10, "messageType"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_25$$10); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 150, &options, &_25$$10); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_mimetype_ce); @@ -85623,18 +85737,18 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_create_array(&_26$$10, 2, 0); zephir_array_update_string(&_26$$10, SL("types"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_26$$10, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_27, 325, &_26$$10); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_27, 298, &_26$$10); zephir_check_call_status(); zephir_array_unset_string(&options, SL("allowedTypes"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageType"), PH_SEPARATE); } else if (ZEPHIR_IS_LONG_IDENTICAL(&_13$$6, 0)) { ZEPHIR_INIT_NVAR(&_28$$11); ZVAL_STRING(&_28$$11, "messageMaxResolution"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_28$$11); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 150, &options, &_28$$11); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_28$$11); ZVAL_STRING(&_28$$11, "includedMaxResolution"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 178, &options, &_28$$11); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 150, &options, &_28$$11); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_max_ce); @@ -85643,7 +85757,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_29$$11, SL("resolution"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_29$$11, SL("included"), &included, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_29$$11, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_30, 326, &_29$$11); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_30, 299, &_29$$11); zephir_check_call_status(); zephir_array_unset_string(&options, SL("maxResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMaxResolution"), PH_SEPARATE); @@ -85651,11 +85765,11 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) } else if (ZEPHIR_IS_LONG_IDENTICAL(&_14$$6, 0)) { ZEPHIR_INIT_NVAR(&_31$$12); ZVAL_STRING(&_31$$12, "messageMinResolution"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_31$$12); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 150, &options, &_31$$12); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_31$$12); ZVAL_STRING(&_31$$12, "includedMinResolution"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 178, &options, &_31$$12); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 150, &options, &_31$$12); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_min_ce); @@ -85664,7 +85778,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_32$$12, SL("resolution"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_32$$12, SL("included"), &included, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_32$$12, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 327, &_32$$12); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 300, &_32$$12); zephir_check_call_status(); zephir_array_unset_string(&options, SL("minResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMinResolution"), PH_SEPARATE); @@ -85672,7 +85786,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) } else if (ZEPHIR_IS_LONG_IDENTICAL(&_15$$6, 0)) { ZEPHIR_INIT_NVAR(&_34$$13); ZVAL_STRING(&_34$$13, "messageEqualResolution"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_34$$13); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 150, &options, &_34$$13); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_equal_ce); @@ -85680,7 +85794,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_create_array(&_35$$13, 2, 0); zephir_array_update_string(&_35$$13, SL("resolution"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_35$$13, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 328, &_35$$13); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 301, &_35$$13); zephir_check_call_status(); zephir_array_unset_string(&options, SL("equalResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageEqualResolution"), PH_SEPARATE); @@ -85688,15 +85802,15 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) continue; } if (Z_TYPE_P(&messageFileEmpty) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagefileempty", &_37, 329, &messageFileEmpty); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagefileempty", &_37, 302, &messageFileEmpty); zephir_check_call_status(); } if (Z_TYPE_P(&messageIniSize) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessageinisize", &_38, 330, &messageIniSize); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessageinisize", &_38, 303, &messageIniSize); zephir_check_call_status(); } if (Z_TYPE_P(&messageValid) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagevalid", &_39, 331, &messageValid); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagevalid", &_39, 304, &messageValid); zephir_check_call_status(); } zephir_update_property_array_append(this_ptr, SL("validators"), &validator); @@ -85716,40 +85830,40 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_40$$18); ZVAL_STRING(&_40$$18, "minSize"); - ZEPHIR_CALL_FUNCTION(&_41$$18, "strcasecmp", &_9, 47, &key, &_40$$18); + ZEPHIR_CALL_FUNCTION(&_41$$18, "strcasecmp", &_9, 34, &key, &_40$$18); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_40$$18); ZVAL_STRING(&_40$$18, "maxSize"); - ZEPHIR_CALL_FUNCTION(&_42$$18, "strcasecmp", &_9, 47, &key, &_40$$18); + ZEPHIR_CALL_FUNCTION(&_42$$18, "strcasecmp", &_9, 34, &key, &_40$$18); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_40$$18); ZVAL_STRING(&_40$$18, "equalSize"); - ZEPHIR_CALL_FUNCTION(&_43$$18, "strcasecmp", &_9, 47, &key, &_40$$18); + ZEPHIR_CALL_FUNCTION(&_43$$18, "strcasecmp", &_9, 34, &key, &_40$$18); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_40$$18); ZVAL_STRING(&_40$$18, "allowedTypes"); - ZEPHIR_CALL_FUNCTION(&_44$$18, "strcasecmp", &_9, 47, &key, &_40$$18); + ZEPHIR_CALL_FUNCTION(&_44$$18, "strcasecmp", &_9, 34, &key, &_40$$18); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_40$$18); ZVAL_STRING(&_40$$18, "maxResolution"); - ZEPHIR_CALL_FUNCTION(&_45$$18, "strcasecmp", &_9, 47, &key, &_40$$18); + ZEPHIR_CALL_FUNCTION(&_45$$18, "strcasecmp", &_9, 34, &key, &_40$$18); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_40$$18); ZVAL_STRING(&_40$$18, "minResolution"); - ZEPHIR_CALL_FUNCTION(&_46$$18, "strcasecmp", &_9, 47, &key, &_40$$18); + ZEPHIR_CALL_FUNCTION(&_46$$18, "strcasecmp", &_9, 34, &key, &_40$$18); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_40$$18); ZVAL_STRING(&_40$$18, "equalResolution"); - ZEPHIR_CALL_FUNCTION(&_47$$18, "strcasecmp", &_9, 47, &key, &_40$$18); + ZEPHIR_CALL_FUNCTION(&_47$$18, "strcasecmp", &_9, 34, &key, &_40$$18); zephir_check_call_status(); if (ZEPHIR_IS_LONG_IDENTICAL(&_41$$18, 0)) { ZEPHIR_INIT_NVAR(&_48$$19); ZVAL_STRING(&_48$$19, "messageMinSize"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_48$$19); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 150, &options, &_48$$19); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_48$$19); ZVAL_STRING(&_48$$19, "includedMinSize"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 178, &options, &_48$$19); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 150, &options, &_48$$19); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_min_ce); @@ -85758,18 +85872,18 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_49$$19, SL("size"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_49$$19, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_49$$19, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 328, &_49$$19); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 301, &_49$$19); zephir_check_call_status(); zephir_array_unset_string(&options, SL("messageMinSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMinSize"), PH_SEPARATE); } else if (ZEPHIR_IS_LONG_IDENTICAL(&_42$$18, 0)) { ZEPHIR_INIT_NVAR(&_50$$20); ZVAL_STRING(&_50$$20, "messageSize"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_50$$20); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 150, &options, &_50$$20); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_50$$20); ZVAL_STRING(&_50$$20, "includedSize"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 178, &options, &_50$$20); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 150, &options, &_50$$20); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_max_ce); @@ -85778,7 +85892,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_51$$20, SL("size"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_51$$20, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_51$$20, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 328, &_51$$20); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 301, &_51$$20); zephir_check_call_status(); zephir_array_unset_string(&options, SL("maxSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageSize"), PH_SEPARATE); @@ -85786,7 +85900,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) } else if (ZEPHIR_IS_LONG_IDENTICAL(&_43$$18, 0)) { ZEPHIR_INIT_NVAR(&_52$$21); ZVAL_STRING(&_52$$21, "messageEqualSize"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_52$$21); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 150, &options, &_52$$21); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_equal_ce); @@ -85794,14 +85908,14 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_create_array(&_53$$21, 2, 0); zephir_array_update_string(&_53$$21, SL("size"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_53$$21, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 328, &_53$$21); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 301, &_53$$21); zephir_check_call_status(); zephir_array_unset_string(&options, SL("equalSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageEqualSize"), PH_SEPARATE); } else if (ZEPHIR_IS_LONG_IDENTICAL(&_44$$18, 0)) { ZEPHIR_INIT_NVAR(&_54$$22); ZVAL_STRING(&_54$$22, "messageType"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_54$$22); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 150, &options, &_54$$22); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_mimetype_ce); @@ -85809,18 +85923,18 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_create_array(&_55$$22, 2, 0); zephir_array_update_string(&_55$$22, SL("types"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_55$$22, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 328, &_55$$22); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 301, &_55$$22); zephir_check_call_status(); zephir_array_unset_string(&options, SL("allowedTypes"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageType"), PH_SEPARATE); } else if (ZEPHIR_IS_LONG_IDENTICAL(&_45$$18, 0)) { ZEPHIR_INIT_NVAR(&_56$$23); ZVAL_STRING(&_56$$23, "messageMaxResolution"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_56$$23); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 150, &options, &_56$$23); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_56$$23); ZVAL_STRING(&_56$$23, "includedMaxResolution"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 178, &options, &_56$$23); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 150, &options, &_56$$23); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_max_ce); @@ -85829,7 +85943,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_57$$23, SL("resolution"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_57$$23, SL("included"), &included, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_57$$23, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 328, &_57$$23); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 301, &_57$$23); zephir_check_call_status(); zephir_array_unset_string(&options, SL("maxResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMaxResolution"), PH_SEPARATE); @@ -85837,11 +85951,11 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) } else if (ZEPHIR_IS_LONG_IDENTICAL(&_46$$18, 0)) { ZEPHIR_INIT_NVAR(&_58$$24); ZVAL_STRING(&_58$$24, "messageMinResolution"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_58$$24); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 150, &options, &_58$$24); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_58$$24); ZVAL_STRING(&_58$$24, "includedMinResolution"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 178, &options, &_58$$24); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 150, &options, &_58$$24); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_min_ce); @@ -85850,7 +85964,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_59$$24, SL("resolution"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_59$$24, SL("included"), &included, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_59$$24, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 328, &_59$$24); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 301, &_59$$24); zephir_check_call_status(); zephir_array_unset_string(&options, SL("minResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMinResolution"), PH_SEPARATE); @@ -85858,7 +85972,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) } else if (ZEPHIR_IS_LONG_IDENTICAL(&_47$$18, 0)) { ZEPHIR_INIT_NVAR(&_60$$25); ZVAL_STRING(&_60$$25, "messageEqualResolution"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_60$$25); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 150, &options, &_60$$25); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_equal_ce); @@ -85866,7 +85980,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_create_array(&_61$$25, 2, 0); zephir_array_update_string(&_61$$25, SL("resolution"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_61$$25, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 328, &_61$$25); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 301, &_61$$25); zephir_check_call_status(); zephir_array_unset_string(&options, SL("equalResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageEqualResolution"), PH_SEPARATE); @@ -85874,15 +85988,15 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) continue; } if (Z_TYPE_P(&messageFileEmpty) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagefileempty", &_37, 329, &messageFileEmpty); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagefileempty", &_37, 302, &messageFileEmpty); zephir_check_call_status(); } if (Z_TYPE_P(&messageIniSize) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessageinisize", &_38, 330, &messageIniSize); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessageinisize", &_38, 303, &messageIniSize); zephir_check_call_status(); } if (Z_TYPE_P(&messageValid) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagevalid", &_39, 331, &messageValid); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagevalid", &_39, 304, &messageValid); zephir_check_call_status(); } zephir_update_property_array_append(this_ptr, SL("validators"), &validator); @@ -86153,7 +86267,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_InclusionIn, validate) return; } } - ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 321, &value, &domain, &strict); + ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 294, &value, &domain, &strict); zephir_check_call_status(); if (!(zephir_is_true(&_5))) { ZEPHIR_INIT_VAR(&replacePairs); @@ -86326,7 +86440,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Ip, validate) zephir_bitwise_or_function(&_10, &_9, &allowReserved); zephir_array_update_string(&options, SL("flags"), &_10, PH_COPY | PH_SEPARATE); ZVAL_LONG(&_2, 275); - ZEPHIR_CALL_FUNCTION(&_11, "filter_var", NULL, 305, &value, &_2, &options); + ZEPHIR_CALL_FUNCTION(&_11, "filter_var", NULL, 278, &value, &_2, &options); zephir_check_call_status(); if (!(zephir_is_true(&_11))) { ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "messagefactory", NULL, 0, validation, field); @@ -86606,10 +86720,10 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Regex, __construct) static PHP_METHOD(Phalcon_Filter_Validation_Validator_Regex, validate) { - zend_bool failed = 0; + zend_bool failed = 0, _3; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *validation, validation_sub, *field, field_sub, matches, value, pattern, _0, _1, _2$$4, _3$$5, _4$$7; + zval *validation, validation_sub, *field, field_sub, matches, value, pattern, _0, _1, _2$$4, _4$$5, _5$$7; zval *this_ptr = getThis(); ZVAL_UNDEF(&validation_sub); @@ -86620,8 +86734,8 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Regex, validate) ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1); ZVAL_UNDEF(&_2$$4); - ZVAL_UNDEF(&_3$$5); - ZVAL_UNDEF(&_4$$7); + ZVAL_UNDEF(&_4$$5); + ZVAL_UNDEF(&_5$$7); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) @@ -86652,18 +86766,22 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Regex, validate) zephir_array_fetch(&_2$$4, &pattern, field, PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/Regex.zep", 94); ZEPHIR_CPY_WRT(&pattern, &_2$$4); } - ZEPHIR_INIT_NVAR(&_1); - zephir_preg_match(&_1, &pattern, &value, &matches, 0, 0 , 0 ); - if (zephir_is_true(&_1)) { - zephir_array_fetch_long(&_3$$5, &matches, 0, PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/Regex.zep", 98); - failed = !ZEPHIR_IS_EQUAL(&_3$$5, &value); + _3 = Z_TYPE_P(&value) != IS_NULL; + if (_3) { + ZEPHIR_INIT_NVAR(&_1); + zephir_preg_match(&_1, &pattern, &value, &matches, 0, 0 , 0 ); + _3 = zephir_is_true(&_1); + } + if (_3) { + zephir_array_fetch_long(&_4$$5, &matches, 0, PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/Regex.zep", 101); + failed = !ZEPHIR_IS_EQUAL(&_4$$5, &value); } else { failed = 1; } if (failed) { - ZEPHIR_CALL_METHOD(&_4$$7, this_ptr, "messagefactory", NULL, 0, validation, field); + ZEPHIR_CALL_METHOD(&_5$$7, this_ptr, "messagefactory", NULL, 0, validation, field); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, &_4$$7); + ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, &_5$$7); zephir_check_call_status(); RETURN_MM_BOOL(0); } @@ -86752,11 +86870,11 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength, __construct) ZVAL_COPY(&value, _0); ZEPHIR_INIT_NVAR(&_4$$3); ZVAL_STRING(&_4$$3, "min"); - ZEPHIR_CALL_FUNCTION(&_5$$3, "strcasecmp", &_6, 47, &key, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "strcasecmp", &_6, 34, &key, &_4$$3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_4$$3); ZVAL_STRING(&_4$$3, "max"); - ZEPHIR_CALL_FUNCTION(&_7$$3, "strcasecmp", &_6, 47, &key, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_7$$3, "strcasecmp", &_6, 34, &key, &_4$$3); zephir_check_call_status(); if (ZEPHIR_IS_LONG_IDENTICAL(&_5$$3, 0)) { if (zephir_array_isset_string(&options, SL("message"))) { @@ -86780,7 +86898,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength, __construct) zephir_array_update_string(&_8$$4, SL("min"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_8$$4, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_8$$4, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_9, 336, &_8$$4); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_9, 309, &_8$$4); zephir_check_call_status(); zephir_array_unset_string(&options, SL("min"), PH_SEPARATE); zephir_array_unset_string(&options, SL("message"), PH_SEPARATE); @@ -86809,7 +86927,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength, __construct) zephir_array_update_string(&_10$$9, SL("max"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_10$$9, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_10$$9, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 337, &_10$$9); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 310, &_10$$9); zephir_check_call_status(); zephir_array_unset_string(&options, SL("max"), PH_SEPARATE); zephir_array_unset_string(&options, SL("message"), PH_SEPARATE); @@ -86836,11 +86954,11 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength, __construct) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_12$$15); ZVAL_STRING(&_12$$15, "min"); - ZEPHIR_CALL_FUNCTION(&_13$$15, "strcasecmp", &_6, 47, &key, &_12$$15); + ZEPHIR_CALL_FUNCTION(&_13$$15, "strcasecmp", &_6, 34, &key, &_12$$15); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_12$$15); ZVAL_STRING(&_12$$15, "max"); - ZEPHIR_CALL_FUNCTION(&_14$$15, "strcasecmp", &_6, 47, &key, &_12$$15); + ZEPHIR_CALL_FUNCTION(&_14$$15, "strcasecmp", &_6, 34, &key, &_12$$15); zephir_check_call_status(); if (ZEPHIR_IS_LONG_IDENTICAL(&_13$$15, 0)) { if (zephir_array_isset_string(&options, SL("message"))) { @@ -86864,7 +86982,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength, __construct) zephir_array_update_string(&_15$$16, SL("min"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_15$$16, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_15$$16, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 337, &_15$$16); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 310, &_15$$16); zephir_check_call_status(); zephir_array_unset_string(&options, SL("min"), PH_SEPARATE); zephir_array_unset_string(&options, SL("message"), PH_SEPARATE); @@ -86893,7 +87011,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength, __construct) zephir_array_update_string(&_16$$21, SL("max"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_16$$21, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_16$$21, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 337, &_16$$21); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 310, &_16$$21); zephir_check_call_status(); zephir_array_unset_string(&options, SL("max"), PH_SEPARATE); zephir_array_unset_string(&options, SL("message"), PH_SEPARATE); @@ -87448,7 +87566,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Uniqueness, isUniquenessMo zephir_array_keys(&_10$$6, &except); ZVAL_LONG(&_11$$6, 0); ZVAL_LONG(&_12$$6, (zephir_fast_count_int(&except) - 1)); - ZEPHIR_CALL_FUNCTION(&_13$$6, "range", &_14, 338, &_11$$6, &_12$$6); + ZEPHIR_CALL_FUNCTION(&_13$$6, "range", &_14, 311, &_11$$6, &_12$$6); zephir_check_call_status(); _9$$6 = !ZEPHIR_IS_IDENTICAL(&_10$$6, &_13$$6); } @@ -87852,7 +87970,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Uniqueness, isUniquenessMo zephir_array_keys(&_88$$37, &except); ZVAL_LONG(&_89$$37, 0); ZVAL_LONG(&_90$$37, (zephir_fast_count_int(&except) - 1)); - ZEPHIR_CALL_FUNCTION(&_91$$37, "range", &_14, 338, &_89$$37, &_90$$37); + ZEPHIR_CALL_FUNCTION(&_91$$37, "range", &_14, 311, &_89$$37, &_90$$37); zephir_check_call_status(); _87$$37 = !ZEPHIR_IS_IDENTICAL(&_88$$37, &_91$$37); } @@ -88384,11 +88502,11 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Url, validate) zephir_read_property(&_1, this_ptr, ZEND_STRL("options"), PH_NOISY_CC | PH_READONLY); if (zephir_array_isset_string_fetch(&options, &_1, SL("options"), 0)) { ZVAL_LONG(&_2$$4, 273); - ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 305, &value, &_2$$4, &options); + ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 278, &value, &_2$$4, &options); zephir_check_call_status(); } else { ZVAL_LONG(&_3$$5, 273); - ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 305, &value, &_3$$5); + ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 278, &value, &_3$$5); zephir_check_call_status(); } if (!(zephir_is_true(&result))) { @@ -89028,12 +89146,12 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_MimeType, validate) } if ((zephir_function_exists_ex(ZEND_STRL("finfo_open")) == SUCCESS)) { ZVAL_LONG(&_2$$6, 16); - ZEPHIR_CALL_FUNCTION(&tmp, "finfo_open", NULL, 332, &_2$$6); + ZEPHIR_CALL_FUNCTION(&tmp, "finfo_open", NULL, 305, &_2$$6); zephir_check_call_status(); zephir_array_fetch_string(&_3$$6, &value, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/File/MimeType.zep", 101); - ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 333, &tmp, &_3$$6); + ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 306, &tmp, &_3$$6); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 334, &tmp); + ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 307, &tmp); zephir_check_call_status(); } else { ZEPHIR_OBS_NVAR(&mime); @@ -89152,7 +89270,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Resolution_Equal, val ZEPHIR_CALL_METHOD(&value, validation, "getvalue", NULL, 0, field); zephir_check_call_status(); zephir_array_fetch_string(&_1, &value, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/File/Resolution/Equal.zep", 88); - ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 335, &_1); + ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 308, &_1); zephir_check_call_status(); ZEPHIR_OBS_VAR(&width); zephir_array_fetch_long(&width, &tmp, 0, PH_NOISY, "phalcon/Filter/Validation/Validator/File/Resolution/Equal.zep", 89); @@ -89296,7 +89414,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Resolution_Max, valid ZEPHIR_CALL_METHOD(&value, validation, "getvalue", NULL, 0, field); zephir_check_call_status(); zephir_array_fetch_string(&_1, &value, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/File/Resolution/Max.zep", 94); - ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 335, &_1); + ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 308, &_1); zephir_check_call_status(); ZEPHIR_OBS_VAR(&width); zephir_array_fetch_long(&width, &tmp, 0, PH_NOISY, "phalcon/Filter/Validation/Validator/File/Resolution/Max.zep", 95); @@ -89464,7 +89582,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Resolution_Min, valid ZEPHIR_CALL_METHOD(&value, validation, "getvalue", NULL, 0, field); zephir_check_call_status(); zephir_array_fetch_string(&_1, &value, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/File/Resolution/Min.zep", 94); - ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 335, &_1); + ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 308, &_1); zephir_check_call_status(); ZEPHIR_OBS_VAR(&width); zephir_array_fetch_long(&width, &tmp, 0, PH_NOISY, "phalcon/Filter/Validation/Validator/File/Resolution/Min.zep", 95); @@ -90056,7 +90174,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength_Max, validate RETURN_MM_BOOL(1); } if ((zephir_function_exists_ex(ZEND_STRL("mb_strlen")) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 254, &value); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 227, &value); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&length); @@ -90197,7 +90315,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength_Min, validate RETURN_MM_BOOL(1); } if ((zephir_function_exists_ex(ZEND_STRL("mb_strlen")) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 254, &value); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 227, &value); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&length); @@ -90765,9 +90883,9 @@ static PHP_METHOD(Phalcon_Flash_AbstractFlash, outputMessage) { ZEPHIR_INIT_NVAR(&item); ZVAL_COPY(&item, _2); - ZEPHIR_CALL_METHOD(&prepared, this_ptr, "prepareescapedmessage", &_4, 109, &item); + ZEPHIR_CALL_METHOD(&prepared, this_ptr, "prepareescapedmessage", &_4, 78, &item); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&html, this_ptr, "preparehtmlmessage", &_5, 110, &type, &prepared); + ZEPHIR_CALL_METHOD(&html, this_ptr, "preparehtmlmessage", &_5, 79, &type, &prepared); zephir_check_call_status(); zephir_read_property(&_6$$5, this_ptr, ZEND_STRL("implicitFlush"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_6$$5)) { @@ -90788,9 +90906,9 @@ static PHP_METHOD(Phalcon_Flash_AbstractFlash, outputMessage) } ZEPHIR_CALL_METHOD(&item, message, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prepared, this_ptr, "prepareescapedmessage", &_4, 109, &item); + ZEPHIR_CALL_METHOD(&prepared, this_ptr, "prepareescapedmessage", &_4, 78, &item); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&html, this_ptr, "preparehtmlmessage", &_5, 110, &type, &prepared); + ZEPHIR_CALL_METHOD(&html, this_ptr, "preparehtmlmessage", &_5, 79, &type, &prepared); zephir_check_call_status(); zephir_read_property(&_7$$8, this_ptr, ZEND_STRL("implicitFlush"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_7$$8)) { @@ -90978,13 +91096,13 @@ static PHP_METHOD(Phalcon_Flash_AbstractFlash, prepareHtmlMessage) RETURN_CTOR(&message); } zephir_read_property(&_1, this_ptr, ZEND_STRL("cssClasses"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&cssClasses, this_ptr, "checkclasses", NULL, 111, &_1, &type); + ZEPHIR_CALL_METHOD(&cssClasses, this_ptr, "checkclasses", NULL, 80, &_1, &type); zephir_check_call_status(); zephir_read_property(&_2, this_ptr, ZEND_STRL("cssIconClasses"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&cssIconClasses, this_ptr, "checkclasses", NULL, 111, &_2, &type); + ZEPHIR_CALL_METHOD(&cssIconClasses, this_ptr, "checkclasses", NULL, 80, &_2, &type); zephir_check_call_status(); zephir_read_property(&_3, this_ptr, ZEND_STRL("interpolator"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "gettemplate", NULL, 112, &cssClasses, &cssIconClasses); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "gettemplate", NULL, 81, &cssClasses, &cssIconClasses); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5); zephir_create_array(&_5, 3, 0); @@ -91745,7 +91863,7 @@ static PHP_METHOD(Phalcon_Forms_Form, __construct) zephir_update_property_zval(this_ptr, ZEND_STRL("options"), &userOptions); ZEPHIR_INIT_VAR(&_1); object_init_ex(&_1, phalcon_html_attributes_ce); - ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 24); + ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 22); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("attributes"), &_1); if ((zephir_method_exists_ex(this_ptr, ZEND_STRL("initialize")) == SUCCESS)) { @@ -92289,7 +92407,7 @@ static PHP_METHOD(Phalcon_Forms_Form, get) object_init_ex(&_1$$3, phalcon_forms_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZEPHIR_CONCAT_SVS(&_2$$3, "Element with ID=", &name, " is not part of the form"); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 31, &_2$$3); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_2$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Forms/Form.zep", 343); ZEPHIR_MM_RESTORE(); @@ -92341,7 +92459,7 @@ static PHP_METHOD(Phalcon_Forms_Form, getAttributes) if (UNEXPECTED(Z_TYPE_P(&_0) == IS_NULL)) { ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_html_attributes_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 24); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 22); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("attributes"), &_1$$3); } @@ -92454,7 +92572,7 @@ static PHP_METHOD(Phalcon_Forms_Form, getLabel) object_init_ex(&_1$$3, phalcon_forms_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZEPHIR_CONCAT_SVS(&_2$$3, "Element with ID=", &name, " is not part of the form"); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 31, &_2$$3); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_2$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Forms/Form.zep", 418); ZEPHIR_MM_RESTORE(); @@ -92900,7 +93018,7 @@ static PHP_METHOD(Phalcon_Forms_Form, isValid) if (_7) { ZEPHIR_INIT_NVAR(&validation); object_init_ex(&validation, phalcon_filter_validation_ce); - ZEPHIR_CALL_METHOD(NULL, &validation, "__construct", NULL, 339); + ZEPHIR_CALL_METHOD(NULL, &validation, "__construct", NULL, 312); zephir_check_call_status(); } zephir_read_property(&_8, this_ptr, ZEND_STRL("elements"), PH_NOISY_CC | PH_READONLY); @@ -92923,7 +93041,7 @@ static PHP_METHOD(Phalcon_Forms_Form, isValid) { ZEPHIR_INIT_NVAR(&validator); ZVAL_COPY(&validator, _11$$10); - ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 340, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 313, &name, &validator); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -92937,7 +93055,7 @@ static PHP_METHOD(Phalcon_Forms_Form, isValid) } ZEPHIR_CALL_METHOD(&validator, &validators, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 340, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 313, &name, &validator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &validators, "next", NULL, 0); zephir_check_call_status(); @@ -92947,7 +93065,7 @@ static PHP_METHOD(Phalcon_Forms_Form, isValid) ZEPHIR_CALL_METHOD(&filters, &element, "getfilters", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&filters) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, &validation, "setfilters", &_14, 341, &name, &filters); + ZEPHIR_CALL_METHOD(NULL, &validation, "setfilters", &_14, 314, &name, &filters); zephir_check_call_status(); } } ZEND_HASH_FOREACH_END(); @@ -92975,7 +93093,7 @@ static PHP_METHOD(Phalcon_Forms_Form, isValid) { ZEPHIR_INIT_NVAR(&validator); ZVAL_COPY(&validator, _15$$15); - ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 340, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 313, &name, &validator); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -92989,7 +93107,7 @@ static PHP_METHOD(Phalcon_Forms_Form, isValid) } ZEPHIR_CALL_METHOD(&validator, &validators, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 340, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 313, &name, &validator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &validators, "next", NULL, 0); zephir_check_call_status(); @@ -92999,7 +93117,7 @@ static PHP_METHOD(Phalcon_Forms_Form, isValid) ZEPHIR_CALL_METHOD(&filters, &element, "getfilters", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&filters) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, &validation, "setfilters", &_14, 341, &name, &filters); + ZEPHIR_CALL_METHOD(NULL, &validation, "setfilters", &_14, 314, &name, &filters); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, &_8, "next", NULL, 0); @@ -93007,7 +93125,7 @@ static PHP_METHOD(Phalcon_Forms_Form, isValid) } } ZEPHIR_INIT_NVAR(&element); - ZEPHIR_CALL_METHOD(&messages, &validation, "validate", NULL, 342, data, entity); + ZEPHIR_CALL_METHOD(&messages, &validation, "validate", NULL, 315, data, entity); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_17, &messages, "count", NULL, 0); zephir_check_call_status(); @@ -93099,7 +93217,7 @@ static PHP_METHOD(Phalcon_Forms_Form, label) object_init_ex(&_1$$3, phalcon_forms_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZEPHIR_CONCAT_SVS(&_2$$3, "Element with ID=", &name, " is not part of the form"); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 31, &_2$$3); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_2$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Forms/Form.zep", 748); ZEPHIR_MM_RESTORE(); @@ -93170,7 +93288,7 @@ static PHP_METHOD(Phalcon_Forms_Form, render) object_init_ex(&_1$$3, phalcon_forms_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZEPHIR_CONCAT_SVS(&_2$$3, "Element with ID=", &name, " is not part of the form"); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 31, &_2$$3); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_2$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Forms/Form.zep", 772); ZEPHIR_MM_RESTORE(); @@ -93581,7 +93699,7 @@ static PHP_METHOD(Phalcon_Forms_Manager, create) ZEPHIR_INIT_VAR(&form); object_init_ex(&form, phalcon_forms_form_ce); - ZEPHIR_CALL_METHOD(NULL, &form, "__construct", NULL, 343, entity); + ZEPHIR_CALL_METHOD(NULL, &form, "__construct", NULL, 316, entity); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("forms"), &name, &form); RETURN_CCTOR(&form); @@ -93620,7 +93738,7 @@ static PHP_METHOD(Phalcon_Forms_Manager, get) object_init_ex(&_1$$3, phalcon_forms_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZEPHIR_CONCAT_SVS(&_2$$3, "There is no form with name='", &name, "'"); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 31, &_2$$3); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_2$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Forms/Manager.zep", 46); ZEPHIR_MM_RESTORE(); @@ -95368,7 +95486,7 @@ static PHP_METHOD(Phalcon_Html_Attributes, renderAttributes) ZVAL_LONG(&_5$$4, 3); ZEPHIR_INIT_NVAR(&_6$$4); ZVAL_STRING(&_6$$4, "utf-8"); - ZEPHIR_CALL_FUNCTION(&_7$$4, "htmlspecialchars", &_8, 344, &value, &_5$$4, &_6$$4, &__$true); + ZEPHIR_CALL_FUNCTION(&_7$$4, "htmlspecialchars", &_8, 317, &value, &_5$$4, &_6$$4, &__$true); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_9$$4); ZEPHIR_CONCAT_VSVS(&_9$$4, &key, "=\"", &_7$$4, "\" "); @@ -95396,7 +95514,7 @@ static PHP_METHOD(Phalcon_Html_Attributes, renderAttributes) ZVAL_LONG(&_11$$6, 3); ZEPHIR_INIT_NVAR(&_12$$6); ZVAL_STRING(&_12$$6, "utf-8"); - ZEPHIR_CALL_FUNCTION(&_13$$6, "htmlspecialchars", &_8, 344, &value, &_11$$6, &_12$$6, &__$true); + ZEPHIR_CALL_FUNCTION(&_13$$6, "htmlspecialchars", &_8, 317, &value, &_11$$6, &_12$$6, &__$true); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_14$$6); ZEPHIR_CONCAT_VSVS(&_14$$6, &key, "=\"", &_13$$6, "\" "); @@ -95596,7 +95714,7 @@ static PHP_METHOD(Phalcon_Html_Breadcrumbs, render) ZEPHIR_INIT_VAR(&urls); zephir_array_keys(&urls, &elements); ZEPHIR_MAKE_REF(&urls); - ZEPHIR_CALL_FUNCTION(&lastUrl, "end", NULL, 345, &urls); + ZEPHIR_CALL_FUNCTION(&lastUrl, "end", NULL, 318, &urls); ZEPHIR_UNREF(&urls); zephir_check_call_status(); ZEPHIR_OBS_VAR(&lastLabel); @@ -95794,7 +95912,7 @@ static PHP_METHOD(Phalcon_Html_Escaper, attributes) zephir_read_property(&_0, this_ptr, ZEND_STRL("encoding"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_1, this_ptr, ZEND_STRL("doubleEncode"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_2, 3); - ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 344, &input, &_2, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 317, &input, &_2, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -95822,9 +95940,9 @@ static PHP_METHOD(Phalcon_Html_Escaper, css) zephir_get_strval(&input, input_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 346, &input); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 319, &input); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapecss", NULL, 347, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapecss", NULL, 320, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -95888,7 +96006,7 @@ static PHP_METHOD(Phalcon_Html_Escaper, detectEncoding) { ZEPHIR_INIT_NVAR(&charset); ZVAL_COPY(&charset, _2); - ZEPHIR_CALL_FUNCTION(&_4$$5, "mb_detect_encoding", &_5, 348, &input, &charset, &__$true); + ZEPHIR_CALL_FUNCTION(&_4$$5, "mb_detect_encoding", &_5, 321, &input, &charset, &__$true); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&_4$$5)) { RETURN_CCTOR(&charset); @@ -95905,7 +96023,7 @@ static PHP_METHOD(Phalcon_Html_Escaper, detectEncoding) } ZEPHIR_CALL_METHOD(&charset, &_0, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_6$$7, "mb_detect_encoding", &_5, 348, &input, &charset, &__$true); + ZEPHIR_CALL_FUNCTION(&_6$$7, "mb_detect_encoding", &_5, 321, &input, &charset, &__$true); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&_6$$7)) { RETURN_CCTOR(&charset); @@ -95915,7 +96033,7 @@ static PHP_METHOD(Phalcon_Html_Escaper, detectEncoding) } } ZEPHIR_INIT_NVAR(&charset); - ZEPHIR_RETURN_CALL_FUNCTION("mb_detect_encoding", &_5, 348, &input); + ZEPHIR_RETURN_CALL_FUNCTION("mb_detect_encoding", &_5, 321, &input); zephir_check_call_status(); RETURN_MM(); } @@ -96105,7 +96223,7 @@ static PHP_METHOD(Phalcon_Html_Escaper, html) zephir_read_property(&_0, this_ptr, ZEND_STRL("flags"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_1, this_ptr, ZEND_STRL("encoding"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_2, this_ptr, ZEND_STRL("doubleEncode"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 344, &input, &_0, &_1, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 317, &input, &_0, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -96133,9 +96251,9 @@ static PHP_METHOD(Phalcon_Html_Escaper, js) zephir_get_strval(&input, input_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 346, &input); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 319, &input); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapejs", NULL, 349, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapejs", NULL, 322, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -96164,11 +96282,11 @@ static PHP_METHOD(Phalcon_Html_Escaper, normalizeEncoding) zephir_get_strval(&input, input_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "detectencoding", NULL, 350, &input); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "detectencoding", NULL, 323, &input); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "UTF-32"); - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 351, &input, &_1, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 324, &input, &_1, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -96300,7 +96418,7 @@ static PHP_METHOD(Phalcon_Html_Escaper, url) zephir_get_strval(&input, input_param); - ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 352, &input); + ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 325, &input); zephir_check_call_status(); RETURN_MM(); } @@ -98695,7 +98813,7 @@ static PHP_METHOD(Phalcon_Html_Helper_Meta, addHttp) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "http-equiv"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addelement", NULL, 354, &_0, &httpEquiv, &content); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addelement", NULL, 327, &_0, &httpEquiv, &content); zephir_check_call_status(); RETURN_MM(); } @@ -98728,7 +98846,7 @@ static PHP_METHOD(Phalcon_Html_Helper_Meta, addName) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "name"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 354, &_0, &name, &content); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 327, &_0, &name, &content); zephir_check_call_status(); RETURN_THIS(); } @@ -98761,7 +98879,7 @@ static PHP_METHOD(Phalcon_Html_Helper_Meta, addProperty) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "property"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 354, &_0, &name, &content); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 327, &_0, &name, &content); zephir_check_call_status(); RETURN_THIS(); } @@ -99296,7 +99414,7 @@ static PHP_METHOD(Phalcon_Html_Helper_Title, __toString) zephir_read_property(&_2, this_ptr, ZEND_STRL("title"), PH_NOISY_CC); zephir_array_fast_append(&_1, &_2); zephir_read_property(&_3, this_ptr, ZEND_STRL("append"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&items, "array_merge", NULL, 355, &_0, &_1, &_3); + ZEPHIR_CALL_FUNCTION(&items, "array_merge", NULL, 328, &_0, &_1, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); zephir_read_property(&_5, this_ptr, ZEND_STRL("indent"), PH_NOISY_CC | PH_READONLY); @@ -99845,9 +99963,9 @@ static PHP_METHOD(Phalcon_Html_Helper_Input_Checkbox, __toString) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "processchecked", NULL, 123); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "processchecked", NULL, 90); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&unchecked, this_ptr, "processunchecked", NULL, 124); + ZEPHIR_CALL_METHOD(&unchecked, this_ptr, "processunchecked", NULL, 91); zephir_check_call_status(); ZEPHIR_CALL_PARENT(&element, phalcon_html_helper_input_checkbox_ce, getThis(), "__tostring", &_0, 0); zephir_check_call_status(); @@ -100412,7 +100530,7 @@ static PHP_METHOD(Phalcon_Html_Helper_Input_Select, add) } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "processvalue", NULL, 353, &attributes, &value); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "processvalue", NULL, 326, &attributes, &value); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attributes, &_0); ZEPHIR_INIT_VAR(&_1); @@ -100982,12 +101100,12 @@ static PHP_METHOD(Phalcon_Html_Link_AbstractLink, __construct) ZEPHIR_INIT_VAR(&_0); object_init_ex(&_0, phalcon_support_collection_ce); - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 24, &attributes); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 22, &attributes); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("attributes"), &_0); ZEPHIR_INIT_VAR(&_1); object_init_ex(&_1, phalcon_support_collection_ce); - ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 24); + ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 22); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("rels"), &_1); zephir_update_property_zval(this_ptr, ZEND_STRL("href"), &href); @@ -101087,13 +101205,13 @@ static PHP_METHOD(Phalcon_Html_Link_AbstractLink, hrefIsTemplated) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "{"); - ZEPHIR_CALL_FUNCTION(&_1, "mb_strpos", NULL, 113, &href, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "mb_strpos", NULL, 82, &href, &_0); zephir_check_call_status(); _2 = !ZEPHIR_IS_FALSE_IDENTICAL(&_1); if (_2) { ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "}"); - ZEPHIR_CALL_FUNCTION(&_3, "mb_strpos", NULL, 113, &href, &_0); + ZEPHIR_CALL_FUNCTION(&_3, "mb_strpos", NULL, 82, &href, &_0); zephir_check_call_status(); _2 = !ZEPHIR_IS_FALSE_IDENTICAL(&_3); } @@ -101343,13 +101461,13 @@ static PHP_METHOD(Phalcon_Html_Link_AbstractLinkProvider, __construct) ZVAL_COPY(&link, _0); ZEPHIR_INIT_NVAR(&_2$$3); ZVAL_STRING(&_2$$3, "Phalcon\\Html\\Link\\Interfaces\\LinkInterface"); - ZEPHIR_CALL_FUNCTION(&_3$$3, "is_a", &_4, 114, &link, &_2$$3); + ZEPHIR_CALL_FUNCTION(&_3$$3, "is_a", &_4, 83, &link, &_2$$3); zephir_check_call_status(); _5$$3 = ZEPHIR_IS_TRUE_IDENTICAL(&_3$$3); if (!(_5$$3)) { ZEPHIR_INIT_NVAR(&_2$$3); ZVAL_STRING(&_2$$3, "Psr\\Link\\LinkInterface"); - ZEPHIR_CALL_FUNCTION(&_6$$3, "is_a", &_4, 114, &link, &_2$$3); + ZEPHIR_CALL_FUNCTION(&_6$$3, "is_a", &_4, 83, &link, &_2$$3); zephir_check_call_status(); _5$$3 = ZEPHIR_IS_TRUE_IDENTICAL(&_6$$3); } @@ -101372,13 +101490,13 @@ static PHP_METHOD(Phalcon_Html_Link_AbstractLinkProvider, __construct) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_9$$5); ZVAL_STRING(&_9$$5, "Phalcon\\Html\\Link\\Interfaces\\LinkInterface"); - ZEPHIR_CALL_FUNCTION(&_10$$5, "is_a", &_4, 114, &link, &_9$$5); + ZEPHIR_CALL_FUNCTION(&_10$$5, "is_a", &_4, 83, &link, &_9$$5); zephir_check_call_status(); _11$$5 = ZEPHIR_IS_TRUE_IDENTICAL(&_10$$5); if (!(_11$$5)) { ZEPHIR_INIT_NVAR(&_9$$5); ZVAL_STRING(&_9$$5, "Psr\\Link\\LinkInterface"); - ZEPHIR_CALL_FUNCTION(&_12$$5, "is_a", &_4, 114, &link, &_9$$5); + ZEPHIR_CALL_FUNCTION(&_12$$5, "is_a", &_4, 83, &link, &_9$$5); zephir_check_call_status(); _11$$5 = ZEPHIR_IS_TRUE_IDENTICAL(&_12$$5); } @@ -101558,7 +101676,7 @@ static PHP_METHOD(Phalcon_Html_Link_AbstractLinkProvider, getKey) zephir_fetch_params(1, 1, 0, &link); - ZEPHIR_RETURN_CALL_FUNCTION("spl_object_hash", NULL, 108, link); + ZEPHIR_RETURN_CALL_FUNCTION("spl_object_hash", NULL, 77, link); zephir_check_call_status(); RETURN_MM(); } @@ -102112,7 +102230,7 @@ static PHP_METHOD(Phalcon_Html_Link_Serializer_Header, serialize) ZVAL_NULL(&result); ZEPHIR_INIT_VAR(&elements); array_init(&elements); - zephir_is_iterable(&links, 0, "phalcon/Html/Link/Serializer/Header.zep", 72); + zephir_is_iterable(&links, 0, "phalcon/Html/Link/Serializer/Header.zep", 70); if (Z_TYPE_P(&links) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&links), _0) { @@ -102137,7 +102255,7 @@ static PHP_METHOD(Phalcon_Html_Link_Serializer_Header, serialize) ZEPHIR_INIT_NVAR(&_4$$3); ZEPHIR_CONCAT_SVS(&_4$$3, "rel=\"", &_3$$3, "\""); zephir_array_fast_append(&parts, &_4$$3); - zephir_is_iterable(&attributes, 0, "phalcon/Html/Link/Serializer/Header.zep", 66); + zephir_is_iterable(&attributes, 0, "phalcon/Html/Link/Serializer/Header.zep", 64); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&attributes), _7$$3, _8$$3, _5$$3) { @@ -102150,7 +102268,7 @@ static PHP_METHOD(Phalcon_Html_Link_Serializer_Header, serialize) ZEPHIR_INIT_NVAR(&value); ZVAL_COPY(&value, _5$$3); if (Z_TYPE_P(&value) == IS_ARRAY) { - zephir_is_iterable(&value, 0, "phalcon/Html/Link/Serializer/Header.zep", 52); + zephir_is_iterable(&value, 0, "phalcon/Html/Link/Serializer/Header.zep", 50); if (Z_TYPE_P(&value) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&value), _9$$6) { @@ -102158,7 +102276,7 @@ static PHP_METHOD(Phalcon_Html_Link_Serializer_Header, serialize) ZVAL_COPY(&subValue, _9$$6); ZEPHIR_INIT_NVAR(&_11$$7); ZEPHIR_CONCAT_VSVS(&_11$$7, &key, "=\"", &subValue, "\""); - zephir_array_append(&parts, &_11$$7, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 50); + zephir_array_append(&parts, &_11$$7, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 48); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &value, "rewind", NULL, 0); @@ -102173,7 +102291,7 @@ static PHP_METHOD(Phalcon_Html_Link_Serializer_Header, serialize) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_12$$8); ZEPHIR_CONCAT_VSVS(&_12$$8, &key, "=\"", &subValue, "\""); - zephir_array_append(&parts, &_12$$8, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 50); + zephir_array_append(&parts, &_12$$8, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 48); ZEPHIR_CALL_METHOD(NULL, &value, "next", NULL, 0); zephir_check_call_status(); } @@ -102184,11 +102302,11 @@ static PHP_METHOD(Phalcon_Html_Link_Serializer_Header, serialize) if (((Z_TYPE_P(&value) == IS_TRUE || Z_TYPE_P(&value) == IS_FALSE) != 1)) { ZEPHIR_INIT_NVAR(&_13$$9); ZEPHIR_CONCAT_VSVS(&_13$$9, &key, "=\"", &value, "\""); - zephir_array_append(&parts, &_13$$9, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 56); + zephir_array_append(&parts, &_13$$9, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 54); continue; } if (ZEPHIR_IS_TRUE_IDENTICAL(&value)) { - zephir_array_append(&parts, &key, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 61); + zephir_array_append(&parts, &key, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 59); continue; } } ZEND_HASH_FOREACH_END(); @@ -102206,7 +102324,7 @@ static PHP_METHOD(Phalcon_Html_Link_Serializer_Header, serialize) ZEPHIR_CALL_METHOD(&value, &attributes, "current", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&value) == IS_ARRAY) { - zephir_is_iterable(&value, 0, "phalcon/Html/Link/Serializer/Header.zep", 52); + zephir_is_iterable(&value, 0, "phalcon/Html/Link/Serializer/Header.zep", 50); if (Z_TYPE_P(&value) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&value), _14$$12) { @@ -102214,7 +102332,7 @@ static PHP_METHOD(Phalcon_Html_Link_Serializer_Header, serialize) ZVAL_COPY(&subValue, _14$$12); ZEPHIR_INIT_NVAR(&_16$$13); ZEPHIR_CONCAT_VSVS(&_16$$13, &key, "=\"", &subValue, "\""); - zephir_array_append(&parts, &_16$$13, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 50); + zephir_array_append(&parts, &_16$$13, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 48); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &value, "rewind", NULL, 0); @@ -102229,7 +102347,7 @@ static PHP_METHOD(Phalcon_Html_Link_Serializer_Header, serialize) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_17$$14); ZEPHIR_CONCAT_VSVS(&_17$$14, &key, "=\"", &subValue, "\""); - zephir_array_append(&parts, &_17$$14, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 50); + zephir_array_append(&parts, &_17$$14, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 48); ZEPHIR_CALL_METHOD(NULL, &value, "next", NULL, 0); zephir_check_call_status(); } @@ -102240,11 +102358,11 @@ static PHP_METHOD(Phalcon_Html_Link_Serializer_Header, serialize) if (((Z_TYPE_P(&value) == IS_TRUE || Z_TYPE_P(&value) == IS_FALSE) != 1)) { ZEPHIR_INIT_NVAR(&_18$$15); ZEPHIR_CONCAT_VSVS(&_18$$15, &key, "=\"", &value, "\""); - zephir_array_append(&parts, &_18$$15, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 56); + zephir_array_append(&parts, &_18$$15, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 54); continue; } if (ZEPHIR_IS_TRUE_IDENTICAL(&value)) { - zephir_array_append(&parts, &key, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 61); + zephir_array_append(&parts, &key, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 59); continue; } ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0); @@ -102259,7 +102377,7 @@ static PHP_METHOD(Phalcon_Html_Link_Serializer_Header, serialize) zephir_fast_join_str(&_20$$3, SL("; "), &parts); ZEPHIR_INIT_NVAR(&_4$$3); ZEPHIR_CONCAT_SVSV(&_4$$3, "<", &_19$$3, ">", &_20$$3); - zephir_array_append(&elements, &_4$$3, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 69); + zephir_array_append(&elements, &_4$$3, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 67); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &links, "rewind", NULL, 0); @@ -102292,7 +102410,7 @@ static PHP_METHOD(Phalcon_Html_Link_Serializer_Header, serialize) ZEPHIR_CONCAT_SVS(&_24$$17, "rel=\"", &_23$$17, "\""); zephir_array_fast_append(&_22$$17, &_24$$17); ZEPHIR_CPY_WRT(&parts, &_22$$17); - zephir_is_iterable(&attributes, 0, "phalcon/Html/Link/Serializer/Header.zep", 66); + zephir_is_iterable(&attributes, 0, "phalcon/Html/Link/Serializer/Header.zep", 64); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&attributes), _27$$17, _28$$17, _25$$17) { @@ -102305,7 +102423,7 @@ static PHP_METHOD(Phalcon_Html_Link_Serializer_Header, serialize) ZEPHIR_INIT_NVAR(&value); ZVAL_COPY(&value, _25$$17); if (Z_TYPE_P(&value) == IS_ARRAY) { - zephir_is_iterable(&value, 0, "phalcon/Html/Link/Serializer/Header.zep", 52); + zephir_is_iterable(&value, 0, "phalcon/Html/Link/Serializer/Header.zep", 50); if (Z_TYPE_P(&value) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&value), _29$$20) { @@ -102313,7 +102431,7 @@ static PHP_METHOD(Phalcon_Html_Link_Serializer_Header, serialize) ZVAL_COPY(&subValue, _29$$20); ZEPHIR_INIT_NVAR(&_31$$21); ZEPHIR_CONCAT_VSVS(&_31$$21, &key, "=\"", &subValue, "\""); - zephir_array_append(&parts, &_31$$21, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 50); + zephir_array_append(&parts, &_31$$21, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 48); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &value, "rewind", NULL, 0); @@ -102328,7 +102446,7 @@ static PHP_METHOD(Phalcon_Html_Link_Serializer_Header, serialize) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_32$$22); ZEPHIR_CONCAT_VSVS(&_32$$22, &key, "=\"", &subValue, "\""); - zephir_array_append(&parts, &_32$$22, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 50); + zephir_array_append(&parts, &_32$$22, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 48); ZEPHIR_CALL_METHOD(NULL, &value, "next", NULL, 0); zephir_check_call_status(); } @@ -102339,11 +102457,11 @@ static PHP_METHOD(Phalcon_Html_Link_Serializer_Header, serialize) if (((Z_TYPE_P(&value) == IS_TRUE || Z_TYPE_P(&value) == IS_FALSE) != 1)) { ZEPHIR_INIT_NVAR(&_33$$23); ZEPHIR_CONCAT_VSVS(&_33$$23, &key, "=\"", &value, "\""); - zephir_array_append(&parts, &_33$$23, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 56); + zephir_array_append(&parts, &_33$$23, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 54); continue; } if (ZEPHIR_IS_TRUE_IDENTICAL(&value)) { - zephir_array_append(&parts, &key, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 61); + zephir_array_append(&parts, &key, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 59); continue; } } ZEND_HASH_FOREACH_END(); @@ -102361,7 +102479,7 @@ static PHP_METHOD(Phalcon_Html_Link_Serializer_Header, serialize) ZEPHIR_CALL_METHOD(&value, &attributes, "current", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&value) == IS_ARRAY) { - zephir_is_iterable(&value, 0, "phalcon/Html/Link/Serializer/Header.zep", 52); + zephir_is_iterable(&value, 0, "phalcon/Html/Link/Serializer/Header.zep", 50); if (Z_TYPE_P(&value) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&value), _34$$26) { @@ -102369,7 +102487,7 @@ static PHP_METHOD(Phalcon_Html_Link_Serializer_Header, serialize) ZVAL_COPY(&subValue, _34$$26); ZEPHIR_INIT_NVAR(&_36$$27); ZEPHIR_CONCAT_VSVS(&_36$$27, &key, "=\"", &subValue, "\""); - zephir_array_append(&parts, &_36$$27, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 50); + zephir_array_append(&parts, &_36$$27, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 48); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &value, "rewind", NULL, 0); @@ -102384,7 +102502,7 @@ static PHP_METHOD(Phalcon_Html_Link_Serializer_Header, serialize) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_37$$28); ZEPHIR_CONCAT_VSVS(&_37$$28, &key, "=\"", &subValue, "\""); - zephir_array_append(&parts, &_37$$28, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 50); + zephir_array_append(&parts, &_37$$28, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 48); ZEPHIR_CALL_METHOD(NULL, &value, "next", NULL, 0); zephir_check_call_status(); } @@ -102395,11 +102513,11 @@ static PHP_METHOD(Phalcon_Html_Link_Serializer_Header, serialize) if (((Z_TYPE_P(&value) == IS_TRUE || Z_TYPE_P(&value) == IS_FALSE) != 1)) { ZEPHIR_INIT_NVAR(&_38$$29); ZEPHIR_CONCAT_VSVS(&_38$$29, &key, "=\"", &value, "\""); - zephir_array_append(&parts, &_38$$29, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 56); + zephir_array_append(&parts, &_38$$29, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 54); continue; } if (ZEPHIR_IS_TRUE_IDENTICAL(&value)) { - zephir_array_append(&parts, &key, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 61); + zephir_array_append(&parts, &key, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 59); continue; } ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0); @@ -102414,7 +102532,7 @@ static PHP_METHOD(Phalcon_Html_Link_Serializer_Header, serialize) zephir_fast_join_str(&_40$$17, SL("; "), &parts); ZEPHIR_INIT_NVAR(&_24$$17); ZEPHIR_CONCAT_SVSV(&_24$$17, "<", &_39$$17, ">", &_40$$17); - zephir_array_append(&elements, &_24$$17, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 69); + zephir_array_append(&elements, &_24$$17, PH_SEPARATE, "phalcon/Html/Link/Serializer/Header.zep", 67); ZEPHIR_CALL_METHOD(NULL, &links, "next", NULL, 0); zephir_check_call_status(); } @@ -102682,30 +102800,30 @@ static PHP_METHOD(Phalcon_Http_Cookie, delete) ZEPHIR_INIT_VAR(&_8); ZVAL_STRING(&_8, "expires"); ZVAL_LONG(&_0, (zephir_get_numberval(&_3) - 691200)); - ZEPHIR_CALL_METHOD(&_7, this_ptr, "getarrval", NULL, 356, &options, &_8, &_0); + ZEPHIR_CALL_METHOD(&_7, this_ptr, "getarrval", NULL, 329, &options, &_8, &_0); zephir_check_call_status(); zephir_array_update_string(&options, SL("expires"), &_7, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_8); ZVAL_STRING(&_8, "domain"); - ZEPHIR_CALL_METHOD(&_9, this_ptr, "getarrval", NULL, 356, &options, &_8, &domain); + ZEPHIR_CALL_METHOD(&_9, this_ptr, "getarrval", NULL, 329, &options, &_8, &domain); zephir_check_call_status(); zephir_array_update_string(&options, SL("domain"), &_9, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_8); ZVAL_STRING(&_8, "path"); - ZEPHIR_CALL_METHOD(&_10, this_ptr, "getarrval", NULL, 356, &options, &_8, &path); + ZEPHIR_CALL_METHOD(&_10, this_ptr, "getarrval", NULL, 329, &options, &_8, &path); zephir_check_call_status(); zephir_array_update_string(&options, SL("path"), &_10, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_8); ZVAL_STRING(&_8, "secure"); - ZEPHIR_CALL_METHOD(&_11, this_ptr, "getarrval", NULL, 356, &options, &_8, &secure); + ZEPHIR_CALL_METHOD(&_11, this_ptr, "getarrval", NULL, 329, &options, &_8, &secure); zephir_check_call_status(); zephir_array_update_string(&options, SL("secure"), &_11, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_8); ZVAL_STRING(&_8, "httponly"); - ZEPHIR_CALL_METHOD(&_12, this_ptr, "getarrval", NULL, 356, &options, &_8, &httpOnly); + ZEPHIR_CALL_METHOD(&_12, this_ptr, "getarrval", NULL, 329, &options, &_8, &httpOnly); zephir_check_call_status(); zephir_array_update_string(&options, SL("httponly"), &_12, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 357, &name, &__$null, &options); + ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 330, &name, &__$null, &options); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -103186,30 +103304,30 @@ static PHP_METHOD(Phalcon_Http_Cookie, send) } ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "expires"); - ZEPHIR_CALL_METHOD(&_13, this_ptr, "getarrval", NULL, 356, &options, &_3, &expire); + ZEPHIR_CALL_METHOD(&_13, this_ptr, "getarrval", NULL, 329, &options, &_3, &expire); zephir_check_call_status(); zephir_array_update_string(&options, SL("expires"), &_13, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "domain"); - ZEPHIR_CALL_METHOD(&_14, this_ptr, "getarrval", NULL, 356, &options, &_3, &domain); + ZEPHIR_CALL_METHOD(&_14, this_ptr, "getarrval", NULL, 329, &options, &_3, &domain); zephir_check_call_status(); zephir_array_update_string(&options, SL("domain"), &_14, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "path"); - ZEPHIR_CALL_METHOD(&_15, this_ptr, "getarrval", NULL, 356, &options, &_3, &path); + ZEPHIR_CALL_METHOD(&_15, this_ptr, "getarrval", NULL, 329, &options, &_3, &path); zephir_check_call_status(); zephir_array_update_string(&options, SL("path"), &_15, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "secure"); - ZEPHIR_CALL_METHOD(&_16, this_ptr, "getarrval", NULL, 356, &options, &_3, &secure); + ZEPHIR_CALL_METHOD(&_16, this_ptr, "getarrval", NULL, 329, &options, &_3, &secure); zephir_check_call_status(); zephir_array_update_string(&options, SL("secure"), &_16, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "httponly"); - ZEPHIR_CALL_METHOD(&_17, this_ptr, "getarrval", NULL, 356, &options, &_3, &httpOnly); + ZEPHIR_CALL_METHOD(&_17, this_ptr, "getarrval", NULL, 329, &options, &_3, &httpOnly); zephir_check_call_status(); zephir_array_update_string(&options, SL("httponly"), &_17, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 357, &name, &encryptValue, &options); + ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 330, &name, &encryptValue, &options); zephir_check_call_status(); RETURN_THIS(); } @@ -103551,16 +103669,16 @@ static PHP_METHOD(Phalcon_Http_Cookie, assertSignKeyIsLongEnough) } - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 254, &signKey); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 227, &signKey); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_LT_LONG(&length, 32))) { ZEPHIR_INIT_VAR(&_0$$3); object_init_ex(&_0$$3, phalcon_http_cookie_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "The cookie's key should be at least 32 characters long. Current length is %d."); - ZEPHIR_CALL_FUNCTION(&_2$$3, "sprintf", NULL, 145, &_1$$3, &length); + ZEPHIR_CALL_FUNCTION(&_2$$3, "sprintf", NULL, 112, &_1$$3, &length); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 31, &_2$$3); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 29, &_2$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Http/Cookie.zep", 649); ZEPHIR_MM_RESTORE(); @@ -103771,7 +103889,7 @@ static PHP_METHOD(Phalcon_Http_Request, get) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 418, &_REQUEST, &name, filters, defaultValue, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 331, &_REQUEST, &name, filters, defaultValue, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -103793,7 +103911,7 @@ static PHP_METHOD(Phalcon_Http_Request, getAcceptableContent) ZVAL_STRING(&_0, "HTTP_ACCEPT"); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "accept"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 419, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 332, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -103816,13 +103934,13 @@ static PHP_METHOD(Phalcon_Http_Request, getBasicAuth) ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "PHP_AUTH_USER"); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 420, &_1); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 333, &_1); zephir_check_call_status(); _2 = !zephir_is_true(&_0); if (!(_2)) { ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "PHP_AUTH_PW"); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "hasserver", NULL, 420, &_1); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "hasserver", NULL, 333, &_1); zephir_check_call_status(); _2 = !zephir_is_true(&_3); } @@ -103860,7 +103978,7 @@ static PHP_METHOD(Phalcon_Http_Request, getBestAccept) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "accept"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 421, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 334, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -103882,7 +104000,7 @@ static PHP_METHOD(Phalcon_Http_Request, getBestCharset) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "charset"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 421, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 334, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -103904,7 +104022,7 @@ static PHP_METHOD(Phalcon_Http_Request, getBestLanguage) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "language"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 421, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 334, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -103977,7 +104095,7 @@ static PHP_METHOD(Phalcon_Http_Request, getClientAddress) ZEPHIR_INIT_VAR(&address); ZVAL_NULL(&address); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 422); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 335); zephir_check_call_status(); if (trustForwardedHeader) { ZEPHIR_OBS_NVAR(&address); @@ -104020,7 +104138,7 @@ static PHP_METHOD(Phalcon_Http_Request, getClientCharsets) ZVAL_STRING(&_0, "HTTP_ACCEPT_CHARSET"); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "charset"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 419, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 332, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -104038,7 +104156,7 @@ static PHP_METHOD(Phalcon_Http_Request, getContentType) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 422); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 335); zephir_check_call_status(); if (!(zephir_array_isset_string_fetch(&contentType, &server, SL("CONTENT_TYPE"), 1))) { RETURN_MM_NULL(); @@ -104073,7 +104191,7 @@ static PHP_METHOD(Phalcon_Http_Request, getDigestAuth) ZEPHIR_INIT_VAR(&auth); array_init(&auth); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 422); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 335); zephir_check_call_status(); ZEPHIR_OBS_VAR(&digest); if (zephir_array_isset_string_fetch(&digest, &server, SL("PHP_AUTH_DIGEST"), 0)) { @@ -104416,7 +104534,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHeader) zephir_check_call_status(); ZEPHIR_INIT_VAR(&name); zephir_fast_strtoupper(&name, &_2); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 422); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 335); zephir_check_call_status(); ZEPHIR_OBS_VAR(&value); if (zephir_array_isset_fetch(&value, &server, &name, 0)) { @@ -104496,7 +104614,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHeaders) zephir_array_update_string(&contentHeaders, SL("CONTENT_TYPE"), &__$true, PH_COPY | PH_SEPARATE); zephir_array_update_string(&contentHeaders, SL("CONTENT_LENGTH"), &__$true, PH_COPY | PH_SEPARATE); zephir_array_update_string(&contentHeaders, SL("CONTENT_MD5"), &__$true, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 422); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 335); zephir_check_call_status(); zephir_is_iterable(&server, 0, "phalcon/Http/Request.zep", 441); if (Z_TYPE_P(&server) == IS_ARRAY) { @@ -104522,7 +104640,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHeaders) ZVAL_STRING(&_9$$4, " "); zephir_fast_str_replace(&_5$$4, &_8$$4, &_9$$4, &_7$$4); zephir_fast_strtolower(&_4$$4, &_5$$4); - ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 309, &_4$$4); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 282, &_4$$4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_11$$4); ZEPHIR_INIT_NVAR(&_12$$4); @@ -104546,7 +104664,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHeaders) ZVAL_STRING(&_18$$5, " "); zephir_fast_str_replace(&_16$$5, &_17$$5, &_18$$5, &name); zephir_fast_strtolower(&_15$$5, &_16$$5); - ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 309, &_15$$5); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 282, &_15$$5); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_19$$5); ZEPHIR_INIT_NVAR(&_20$$5); @@ -104583,7 +104701,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHeaders) ZVAL_STRING(&_27$$7, " "); zephir_fast_str_replace(&_23$$7, &_26$$7, &_27$$7, &_25$$7); zephir_fast_strtolower(&_22$$7, &_23$$7); - ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 309, &_22$$7); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 282, &_22$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_28$$7); ZEPHIR_INIT_NVAR(&_29$$7); @@ -104607,7 +104725,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHeaders) ZVAL_STRING(&_35$$8, " "); zephir_fast_str_replace(&_33$$8, &_34$$8, &_35$$8, &name); zephir_fast_strtolower(&_32$$8, &_33$$8); - ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 309, &_32$$8); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 282, &_32$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_36$$8); ZEPHIR_INIT_NVAR(&_37$$8); @@ -104694,7 +104812,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHttpHost) ZVAL_STRING(&_5$$6, "/:[[:digit:]]+$/"); ZEPHIR_INIT_VAR(&_6$$6); ZVAL_STRING(&_6$$6, ""); - ZEPHIR_CALL_FUNCTION(&_7$$6, "preg_replace", NULL, 50, &_5$$6, &_6$$6, &cleanHost); + ZEPHIR_CALL_FUNCTION(&_7$$6, "preg_replace", NULL, 37, &_5$$6, &_6$$6, &cleanHost); zephir_check_call_status(); ZEPHIR_CPY_WRT(&cleanHost, &_7$$6); } @@ -104702,7 +104820,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHttpHost) ZVAL_STRING(&_8$$5, "/[a-z0-9-]+\\.?/"); ZEPHIR_INIT_VAR(&_9$$5); ZVAL_STRING(&_9$$5, ""); - ZEPHIR_CALL_FUNCTION(&_10$$5, "preg_replace", NULL, 50, &_8$$5, &_9$$5, &cleanHost); + ZEPHIR_CALL_FUNCTION(&_10$$5, "preg_replace", NULL, 37, &_8$$5, &_9$$5, &cleanHost); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_11$$5); ZVAL_STRING(&_11$$5, ""); @@ -104711,7 +104829,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHttpHost) object_init_ex(&_12$$7, spl_ce_UnexpectedValueException); ZEPHIR_INIT_VAR(&_13$$7); ZEPHIR_CONCAT_SV(&_13$$7, "Invalid host ", &host); - ZEPHIR_CALL_METHOD(NULL, &_12$$7, "__construct", NULL, 423, &_13$$7); + ZEPHIR_CALL_METHOD(NULL, &_12$$7, "__construct", NULL, 336, &_13$$7); zephir_check_call_status(); zephir_throw_exception_debug(&_12$$7, "phalcon/Http/Request.zep", 525); ZEPHIR_MM_RESTORE(); @@ -104737,7 +104855,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHTTPReferer) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 422); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 335); zephir_check_call_status(); if (!(zephir_array_isset_string_fetch(&httpReferer, &server, SL("HTTP_REFERER"), 1))) { RETURN_MM_STRING(""); @@ -104800,7 +104918,7 @@ static PHP_METHOD(Phalcon_Http_Request, getLanguages) ZVAL_STRING(&_0, "HTTP_ACCEPT_LANGUAGE"); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "language"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 419, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 332, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -104829,7 +104947,7 @@ static PHP_METHOD(Phalcon_Http_Request, getMethod) zephir_get_global(&_REQUEST, SL("_REQUEST")); ZEPHIR_INIT_VAR(&returnMethod); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 422); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 335); zephir_check_call_status(); ZEPHIR_OBS_VAR(&requestMethod); if (EXPECTED(zephir_array_isset_string_fetch(&requestMethod, &server, SL("REQUEST_METHOD"), 0))) { @@ -104843,7 +104961,7 @@ static PHP_METHOD(Phalcon_Http_Request, getMethod) if (ZEPHIR_IS_IDENTICAL(&_0, &returnMethod)) { ZEPHIR_INIT_VAR(&_1$$5); ZVAL_STRING(&_1$$5, "X-HTTP-METHOD-OVERRIDE"); - ZEPHIR_CALL_METHOD(&overridedMethod, this_ptr, "getheader", NULL, 424, &_1$$5); + ZEPHIR_CALL_METHOD(&overridedMethod, this_ptr, "getheader", NULL, 337, &_1$$5); zephir_check_call_status(); zephir_read_property(&_2$$5, this_ptr, ZEND_STRL("httpMethodParameterOverride"), PH_NOISY_CC | PH_READONLY); if (!(ZEPHIR_IS_EMPTY(&overridedMethod))) { @@ -104900,7 +105018,7 @@ static PHP_METHOD(Phalcon_Http_Request, getPort) if (zephir_memnstr_str(&host, SL(":"), "phalcon/Http/Request.zep", 634)) { ZEPHIR_INIT_VAR(&_3$$4); ZVAL_STRING(&_3$$4, ":"); - ZEPHIR_CALL_FUNCTION(&pos, "strrpos", NULL, 262, &host, &_3$$4); + ZEPHIR_CALL_FUNCTION(&pos, "strrpos", NULL, 235, &host, &_3$$4); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&pos)) { ZVAL_LONG(&_4$$5, (zephir_get_numberval(&pos) + 1)); @@ -104997,7 +105115,7 @@ static PHP_METHOD(Phalcon_Http_Request, getPost) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 418, &_POST, &name, filters, defaultValue, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 331, &_POST, &name, filters, defaultValue, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -105080,7 +105198,7 @@ static PHP_METHOD(Phalcon_Http_Request, getPut) if (_0$$3) { ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "json"); - ZEPHIR_CALL_FUNCTION(&_2$$3, "stripos", NULL, 425, &contentType, &_1$$3); + ZEPHIR_CALL_FUNCTION(&_2$$3, "stripos", NULL, 338, &contentType, &_1$$3); zephir_check_call_status(); _0$$3 = !ZEPHIR_IS_FALSE(&_2$$3); } @@ -105098,7 +105216,7 @@ static PHP_METHOD(Phalcon_Http_Request, getPut) ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "getrawbody", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&put); - ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 382, &_4$$6, &put); + ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 339, &_4$$6, &put); ZEPHIR_UNREF(&put); zephir_check_call_status(); } @@ -105114,7 +105232,7 @@ static PHP_METHOD(Phalcon_Http_Request, getPut) } else { ZVAL_BOOL(&_6, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 418, &put, &name, filters, defaultValue, &_5, &_6); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 331, &put, &name, filters, defaultValue, &_5, &_6); zephir_check_call_status(); RETURN_MM(); } @@ -105194,7 +105312,7 @@ static PHP_METHOD(Phalcon_Http_Request, getQuery) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 418, &_GET, &name, filters, defaultValue, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 331, &_GET, &name, filters, defaultValue, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -105286,7 +105404,7 @@ static PHP_METHOD(Phalcon_Http_Request, getServer) } - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 422); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 335); zephir_check_call_status(); if (!(zephir_array_isset_fetch(&serverValue, &server, &name, 1))) { RETURN_MM_NULL(); @@ -105315,7 +105433,7 @@ static PHP_METHOD(Phalcon_Http_Request, getServerAddress) if (Z_TYPE_P(&serverAddr) == IS_NULL) { ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "localhost"); - ZEPHIR_RETURN_CALL_FUNCTION("gethostbyname", NULL, 426, &_1$$3); + ZEPHIR_RETURN_CALL_FUNCTION("gethostbyname", NULL, 340, &_1$$3); zephir_check_call_status(); RETURN_MM(); } @@ -105466,7 +105584,7 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) zephir_array_fetch_string(&_7$$5, &input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 861); zephir_array_fetch_string(&_8$$5, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 862); zephir_array_fetch_string(&_9$$5, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 863); - ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 427, &_5$$5, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &prefix); + ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 341, &_5$$5, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &prefix); zephir_check_call_status(); zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 890); if (Z_TYPE_P(&smoothInput) == IS_ARRAY) { @@ -105501,7 +105619,7 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZEPHIR_INIT_NVAR(&_16$$8); object_init_ex(&_16$$8, phalcon_http_request_file_ce); zephir_array_fetch_string(&_17$$8, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 881); - ZEPHIR_CALL_METHOD(NULL, &_16$$8, "__construct", &_18, 428, &dataFile, &_17$$8); + ZEPHIR_CALL_METHOD(NULL, &_16$$8, "__construct", &_18, 342, &dataFile, &_17$$8); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&_19$$8); zephir_array_fetch_string(&_19$$8, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 878); @@ -105510,7 +105628,7 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZEPHIR_INIT_NVAR(&_20$$9); object_init_ex(&_20$$9, phalcon_http_request_file_ce); zephir_array_fetch_string(&_21$$9, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 886); - ZEPHIR_CALL_METHOD(NULL, &_20$$9, "__construct", &_18, 428, &dataFile, &_21$$9); + ZEPHIR_CALL_METHOD(NULL, &_20$$9, "__construct", &_18, 342, &dataFile, &_21$$9); zephir_check_call_status(); zephir_array_append(&files, &_20$$9, PH_SEPARATE, "phalcon/Http/Request.zep", 886); } @@ -105555,7 +105673,7 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZEPHIR_INIT_NVAR(&_26$$12); object_init_ex(&_26$$12, phalcon_http_request_file_ce); zephir_array_fetch_string(&_27$$12, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 881); - ZEPHIR_CALL_METHOD(NULL, &_26$$12, "__construct", &_18, 428, &dataFile, &_27$$12); + ZEPHIR_CALL_METHOD(NULL, &_26$$12, "__construct", &_18, 342, &dataFile, &_27$$12); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&_28$$12); zephir_array_fetch_string(&_28$$12, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 878); @@ -105564,7 +105682,7 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZEPHIR_INIT_NVAR(&_29$$13); object_init_ex(&_29$$13, phalcon_http_request_file_ce); zephir_array_fetch_string(&_30$$13, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 886); - ZEPHIR_CALL_METHOD(NULL, &_29$$13, "__construct", &_18, 428, &dataFile, &_30$$13); + ZEPHIR_CALL_METHOD(NULL, &_29$$13, "__construct", &_18, 342, &dataFile, &_30$$13); zephir_check_call_status(); zephir_array_append(&files, &_29$$13, PH_SEPARATE, "phalcon/Http/Request.zep", 886); } @@ -105584,13 +105702,13 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) if (namedKeys == 1) { ZEPHIR_INIT_NVAR(&_33$$16); object_init_ex(&_33$$16, phalcon_http_request_file_ce); - ZEPHIR_CALL_METHOD(NULL, &_33$$16, "__construct", &_18, 428, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_33$$16, "__construct", &_18, 342, &input, &prefix); zephir_check_call_status(); zephir_array_update_zval(&files, &prefix, &_33$$16, PH_COPY | PH_SEPARATE); } else { ZEPHIR_INIT_NVAR(&_34$$17); object_init_ex(&_34$$17, phalcon_http_request_file_ce); - ZEPHIR_CALL_METHOD(NULL, &_34$$17, "__construct", &_18, 428, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_34$$17, "__construct", &_18, 342, &input, &prefix); zephir_check_call_status(); zephir_array_append(&files, &_34$$17, PH_SEPARATE, "phalcon/Http/Request.zep", 895); } @@ -105618,7 +105736,7 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) zephir_array_fetch_string(&_38$$19, &input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 861); zephir_array_fetch_string(&_39$$19, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 862); zephir_array_fetch_string(&_40$$19, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 863); - ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 427, &_36$$19, &_37$$19, &_38$$19, &_39$$19, &_40$$19, &prefix); + ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 341, &_36$$19, &_37$$19, &_38$$19, &_39$$19, &_40$$19, &prefix); zephir_check_call_status(); zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 890); if (Z_TYPE_P(&smoothInput) == IS_ARRAY) { @@ -105654,7 +105772,7 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZEPHIR_INIT_NVAR(&_47$$22); object_init_ex(&_47$$22, phalcon_http_request_file_ce); zephir_array_fetch_string(&_48$$22, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 881); - ZEPHIR_CALL_METHOD(NULL, &_47$$22, "__construct", &_18, 428, &dataFile, &_48$$22); + ZEPHIR_CALL_METHOD(NULL, &_47$$22, "__construct", &_18, 342, &dataFile, &_48$$22); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&_49$$22); zephir_array_fetch_string(&_49$$22, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 878); @@ -105663,7 +105781,7 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZEPHIR_INIT_NVAR(&_50$$23); object_init_ex(&_50$$23, phalcon_http_request_file_ce); zephir_array_fetch_string(&_51$$23, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 886); - ZEPHIR_CALL_METHOD(NULL, &_50$$23, "__construct", &_18, 428, &dataFile, &_51$$23); + ZEPHIR_CALL_METHOD(NULL, &_50$$23, "__construct", &_18, 342, &dataFile, &_51$$23); zephir_check_call_status(); zephir_array_append(&files, &_50$$23, PH_SEPARATE, "phalcon/Http/Request.zep", 886); } @@ -105708,7 +105826,7 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZEPHIR_INIT_NVAR(&_56$$26); object_init_ex(&_56$$26, phalcon_http_request_file_ce); zephir_array_fetch_string(&_57$$26, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 881); - ZEPHIR_CALL_METHOD(NULL, &_56$$26, "__construct", &_18, 428, &dataFile, &_57$$26); + ZEPHIR_CALL_METHOD(NULL, &_56$$26, "__construct", &_18, 342, &dataFile, &_57$$26); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&_58$$26); zephir_array_fetch_string(&_58$$26, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 878); @@ -105717,7 +105835,7 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZEPHIR_INIT_NVAR(&_59$$27); object_init_ex(&_59$$27, phalcon_http_request_file_ce); zephir_array_fetch_string(&_60$$27, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 886); - ZEPHIR_CALL_METHOD(NULL, &_59$$27, "__construct", &_18, 428, &dataFile, &_60$$27); + ZEPHIR_CALL_METHOD(NULL, &_59$$27, "__construct", &_18, 342, &dataFile, &_60$$27); zephir_check_call_status(); zephir_array_append(&files, &_59$$27, PH_SEPARATE, "phalcon/Http/Request.zep", 886); } @@ -105737,13 +105855,13 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) if (namedKeys == 1) { ZEPHIR_INIT_NVAR(&_63$$30); object_init_ex(&_63$$30, phalcon_http_request_file_ce); - ZEPHIR_CALL_METHOD(NULL, &_63$$30, "__construct", &_18, 428, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_63$$30, "__construct", &_18, 342, &input, &prefix); zephir_check_call_status(); zephir_array_update_zval(&files, &prefix, &_63$$30, PH_COPY | PH_SEPARATE); } else { ZEPHIR_INIT_NVAR(&_64$$31); object_init_ex(&_64$$31, phalcon_http_request_file_ce); - ZEPHIR_CALL_METHOD(NULL, &_64$$31, "__construct", &_18, 428, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_64$$31, "__construct", &_18, 342, &input, &prefix); zephir_check_call_status(); zephir_array_append(&files, &_64$$31, PH_SEPARATE, "phalcon/Http/Request.zep", 895); } @@ -105930,13 +106048,13 @@ static PHP_METHOD(Phalcon_Http_Request, hasHeader) zephir_check_call_status(); ZEPHIR_INIT_VAR(&name); zephir_fast_strtoupper(&name, &_2); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "hasserver", NULL, 420, &name); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "hasserver", NULL, 333, &name); zephir_check_call_status(); _4 = zephir_is_true(&_3); if (!(_4)) { ZEPHIR_INIT_VAR(&_6); ZEPHIR_CONCAT_SV(&_6, "HTTP_", &name); - ZEPHIR_CALL_METHOD(&_5, this_ptr, "hasserver", NULL, 420, &_6); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "hasserver", NULL, 333, &_6); zephir_check_call_status(); _4 = zephir_is_true(&_5); } @@ -106078,7 +106196,7 @@ static PHP_METHOD(Phalcon_Http_Request, hasServer) } - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 422); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 335); zephir_check_call_status(); RETURN_MM_BOOL(zephir_array_isset(&server, &name)); } @@ -106100,7 +106218,7 @@ static PHP_METHOD(Phalcon_Http_Request, isAjax) ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "HTTP_X_REQUESTED_WITH"); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 420, &_1); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 333, &_1); zephir_check_call_status(); _2 = zephir_is_true(&_0); if (_2) { @@ -106125,7 +106243,7 @@ static PHP_METHOD(Phalcon_Http_Request, isConnect) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 429); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 343); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "CONNECT")); } @@ -106142,7 +106260,7 @@ static PHP_METHOD(Phalcon_Http_Request, isDelete) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 429); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 343); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "DELETE")); } @@ -106159,7 +106277,7 @@ static PHP_METHOD(Phalcon_Http_Request, isGet) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 429); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 343); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "GET")); } @@ -106176,7 +106294,7 @@ static PHP_METHOD(Phalcon_Http_Request, isHead) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 429); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 343); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "HEAD")); } @@ -106220,7 +106338,7 @@ static PHP_METHOD(Phalcon_Http_Request, isMethod) } - ZEPHIR_CALL_METHOD(&httpMethod, this_ptr, "getmethod", NULL, 429); + ZEPHIR_CALL_METHOD(&httpMethod, this_ptr, "getmethod", NULL, 343); zephir_check_call_status(); if (Z_TYPE_P(methods) == IS_STRING) { _0$$3 = strict; @@ -106234,7 +106352,7 @@ static PHP_METHOD(Phalcon_Http_Request, isMethod) object_init_ex(&_2$$4, phalcon_http_request_exception_ce); ZEPHIR_INIT_VAR(&_3$$4); ZEPHIR_CONCAT_SV(&_3$$4, "Invalid HTTP method: ", methods); - ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 31, &_3$$4); + ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 29, &_3$$4); zephir_check_call_status(); zephir_throw_exception_debug(&_2$$4, "phalcon/Http/Request.zep", 1075); ZEPHIR_MM_RESTORE(); @@ -106254,7 +106372,7 @@ static PHP_METHOD(Phalcon_Http_Request, isMethod) } else { ZVAL_BOOL(&_7$$6, 0); } - ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "ismethod", &_8, 430, &method, &_7$$6); + ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "ismethod", &_8, 344, &method, &_7$$6); zephir_check_call_status(); if (zephir_is_true(&_6$$6)) { RETURN_MM_BOOL(1); @@ -106276,7 +106394,7 @@ static PHP_METHOD(Phalcon_Http_Request, isMethod) } else { ZVAL_BOOL(&_10$$8, 0); } - ZEPHIR_CALL_METHOD(&_9$$8, this_ptr, "ismethod", &_8, 430, &method, &_10$$8); + ZEPHIR_CALL_METHOD(&_9$$8, this_ptr, "ismethod", &_8, 344, &method, &_10$$8); zephir_check_call_status(); if (zephir_is_true(&_9$$8)) { RETURN_MM_BOOL(1); @@ -106307,7 +106425,7 @@ static PHP_METHOD(Phalcon_Http_Request, isOptions) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 429); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 343); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "OPTIONS")); } @@ -106324,7 +106442,7 @@ static PHP_METHOD(Phalcon_Http_Request, isPatch) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 429); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 343); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "PATCH")); } @@ -106341,7 +106459,7 @@ static PHP_METHOD(Phalcon_Http_Request, isPost) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 429); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 343); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "POST")); } @@ -106358,7 +106476,7 @@ static PHP_METHOD(Phalcon_Http_Request, isPut) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 429); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 343); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "PUT")); } @@ -106375,7 +106493,7 @@ static PHP_METHOD(Phalcon_Http_Request, isPurge) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 429); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 343); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "PURGE")); } @@ -106422,7 +106540,7 @@ static PHP_METHOD(Phalcon_Http_Request, isSoap) ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "HTTP_SOAPACTION"); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 420, &_1); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 333, &_1); zephir_check_call_status(); if (zephir_is_true(&_0)) { RETURN_MM_BOOL(1); @@ -106447,7 +106565,7 @@ static PHP_METHOD(Phalcon_Http_Request, isTrace) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 429); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 343); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "TRACE")); } @@ -106550,7 +106668,7 @@ static PHP_METHOD(Phalcon_Http_Request, numFiles) } else { ZVAL_BOOL(&_4$$8, 0); } - ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "hasfilehelper", &_5, 431, &error, &_4$$8); + ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "hasfilehelper", &_5, 345, &error, &_4$$8); zephir_check_call_status(); numberFiles += zephir_get_numberval(&_3$$8); } @@ -106584,7 +106702,7 @@ static PHP_METHOD(Phalcon_Http_Request, numFiles) } else { ZVAL_BOOL(&_8$$13, 0); } - ZEPHIR_CALL_METHOD(&_7$$13, this_ptr, "hasfilehelper", &_5, 431, &error, &_8$$13); + ZEPHIR_CALL_METHOD(&_7$$13, this_ptr, "hasfilehelper", &_5, 345, &error, &_8$$13); zephir_check_call_status(); numberFiles += zephir_get_numberval(&_7$$13); } @@ -106668,13 +106786,13 @@ static PHP_METHOD(Phalcon_Http_Request, setParameterFilters) object_init_ex(&_0$$3, phalcon_http_request_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZEPHIR_CONCAT_SVS(&_1$$3, "Filters have not been defined for '", &name, "'"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 31, &_1$$3); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 29, &_1$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Http/Request.zep", 1259); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 432); + ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 346); zephir_check_call_status(); zephir_is_iterable(&filters, 0, "phalcon/Http/Request.zep", 1272); if (Z_TYPE_P(&filters) == IS_ARRAY) { @@ -106689,7 +106807,7 @@ static PHP_METHOD(Phalcon_Http_Request, setParameterFilters) object_init_ex(&_6$$5, phalcon_http_request_exception_ce); ZEPHIR_INIT_NVAR(&_7$$5); ZEPHIR_CONCAT_SVS(&_7$$5, "Sanitizer '", &sanitizer, "' does not exist in the filter locator"); - ZEPHIR_CALL_METHOD(NULL, &_6$$5, "__construct", NULL, 31, &_7$$5); + ZEPHIR_CALL_METHOD(NULL, &_6$$5, "__construct", NULL, 29, &_7$$5); zephir_check_call_status(); zephir_throw_exception_debug(&_6$$5, "phalcon/Http/Request.zep", 1268); ZEPHIR_MM_RESTORE(); @@ -106714,7 +106832,7 @@ static PHP_METHOD(Phalcon_Http_Request, setParameterFilters) object_init_ex(&_10$$7, phalcon_http_request_exception_ce); ZEPHIR_INIT_NVAR(&_11$$7); ZEPHIR_CONCAT_SVS(&_11$$7, "Sanitizer '", &sanitizer, "' does not exist in the filter locator"); - ZEPHIR_CALL_METHOD(NULL, &_10$$7, "__construct", NULL, 31, &_11$$7); + ZEPHIR_CALL_METHOD(NULL, &_10$$7, "__construct", NULL, 29, &_11$$7); zephir_check_call_status(); zephir_throw_exception_debug(&_10$$7, "phalcon/Http/Request.zep", 1268); ZEPHIR_MM_RESTORE(); @@ -107001,7 +107119,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHelper) RETURN_MM(); } if (Z_TYPE_P(filters) != IS_NULL) { - ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 432); + ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 346); zephir_check_call_status(); if (noRecursive) { ZVAL_BOOL(&_3$$6, 1); @@ -107070,7 +107188,7 @@ static PHP_METHOD(Phalcon_Http_Request, hasFileHelper) } else { ZVAL_BOOL(&_4$$7, 0); } - ZEPHIR_CALL_METHOD(&_3$$7, this_ptr, "hasfilehelper", &_5, 431, &value, &_4$$7); + ZEPHIR_CALL_METHOD(&_3$$7, this_ptr, "hasfilehelper", &_5, 345, &value, &_4$$7); zephir_check_call_status(); numberFiles += zephir_get_numberval(&_3$$7); } @@ -107101,7 +107219,7 @@ static PHP_METHOD(Phalcon_Http_Request, hasFileHelper) } else { ZVAL_BOOL(&_8$$11, 0); } - ZEPHIR_CALL_METHOD(&_7$$11, this_ptr, "hasfilehelper", &_5, 431, &value, &_8$$11); + ZEPHIR_CALL_METHOD(&_7$$11, this_ptr, "hasfilehelper", &_5, 345, &value, &_8$$11); zephir_check_call_status(); numberFiles += zephir_get_numberval(&_7$$11); } @@ -107217,7 +107335,7 @@ static PHP_METHOD(Phalcon_Http_Request, getQualityHeader) ZVAL_STRING(&_1, "/,\\s*/"); ZVAL_LONG(&_2, -1); ZVAL_LONG(&_3, 1); - ZEPHIR_CALL_FUNCTION(&parts, "preg_split", NULL, 98, &_1, &_0, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&parts, "preg_split", NULL, 67, &_1, &_0, &_2, &_3); zephir_check_call_status(); zephir_is_iterable(&parts, 0, "phalcon/Http/Request.zep", 1430); if (Z_TYPE_P(&parts) == IS_ARRAY) { @@ -107233,7 +107351,7 @@ static PHP_METHOD(Phalcon_Http_Request, getQualityHeader) ZVAL_STRING(&_7$$3, "/\\s*;\\s*/"); ZVAL_LONG(&_8$$3, -1); ZVAL_LONG(&_9$$3, 1); - ZEPHIR_CALL_FUNCTION(&_10$$3, "preg_split", NULL, 98, &_7$$3, &_6$$3, &_8$$3, &_9$$3); + ZEPHIR_CALL_FUNCTION(&_10$$3, "preg_split", NULL, 67, &_7$$3, &_6$$3, &_8$$3, &_9$$3); zephir_check_call_status(); zephir_is_iterable(&_10$$3, 0, "phalcon/Http/Request.zep", 1427); if (Z_TYPE_P(&_10$$3) == IS_ARRAY) { @@ -107331,7 +107449,7 @@ static PHP_METHOD(Phalcon_Http_Request, getQualityHeader) ZVAL_STRING(&_30$$14, "/\\s*;\\s*/"); ZVAL_LONG(&_31$$14, -1); ZVAL_LONG(&_32$$14, 1); - ZEPHIR_CALL_FUNCTION(&_33$$14, "preg_split", NULL, 98, &_30$$14, &_29$$14, &_31$$14, &_32$$14); + ZEPHIR_CALL_FUNCTION(&_33$$14, "preg_split", NULL, 67, &_30$$14, &_29$$14, &_31$$14, &_32$$14); zephir_check_call_status(); zephir_is_iterable(&_33$$14, 0, "phalcon/Http/Request.zep", 1427); if (Z_TYPE_P(&_33$$14) == IS_ARRAY) { @@ -107481,7 +107599,7 @@ static PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdi", NULL, 0); zephir_check_call_status(); ZEPHIR_CPY_WRT(&container, &_0); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 422); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 335); zephir_check_call_status(); if (Z_TYPE_P(&container) == IS_OBJECT) { ZEPHIR_INIT_VAR(&_2$$3); @@ -107517,13 +107635,13 @@ static PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) } ZEPHIR_INIT_VAR(&_9); ZVAL_STRING(&_9, "PHP_AUTH_USER"); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 420, &_9); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 333, &_9); zephir_check_call_status(); _10 = zephir_is_true(&_0); if (_10) { ZEPHIR_INIT_NVAR(&_9); ZVAL_STRING(&_9, "PHP_AUTH_PW"); - ZEPHIR_CALL_METHOD(&_11, this_ptr, "hasserver", NULL, 420, &_9); + ZEPHIR_CALL_METHOD(&_11, this_ptr, "hasserver", NULL, 333, &_9); zephir_check_call_status(); _10 = zephir_is_true(&_11); } @@ -107541,11 +107659,11 @@ static PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) } else { ZEPHIR_INIT_VAR(&_16$$8); ZVAL_STRING(&_16$$8, "HTTP_AUTHORIZATION"); - ZEPHIR_CALL_METHOD(&_15$$8, this_ptr, "hasserver", NULL, 420, &_16$$8); + ZEPHIR_CALL_METHOD(&_15$$8, this_ptr, "hasserver", NULL, 333, &_16$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$8); ZVAL_STRING(&_16$$8, "REDIRECT_HTTP_AUTHORIZATION"); - ZEPHIR_CALL_METHOD(&_17$$8, this_ptr, "hasserver", NULL, 420, &_16$$8); + ZEPHIR_CALL_METHOD(&_17$$8, this_ptr, "hasserver", NULL, 333, &_16$$8); zephir_check_call_status(); if (zephir_is_true(&_15$$8)) { ZEPHIR_INIT_VAR(&_18$$9); @@ -107561,29 +107679,29 @@ static PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) if (zephir_is_true(&authHeader)) { ZEPHIR_INIT_VAR(&_20$$11); ZVAL_STRING(&_20$$11, "basic "); - ZEPHIR_CALL_FUNCTION(&_21$$11, "stripos", NULL, 425, &authHeader, &_20$$11); + ZEPHIR_CALL_FUNCTION(&_21$$11, "stripos", NULL, 338, &authHeader, &_20$$11); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_20$$11); ZVAL_STRING(&_20$$11, "digest "); - ZEPHIR_CALL_FUNCTION(&_22$$11, "stripos", NULL, 425, &authHeader, &_20$$11); + ZEPHIR_CALL_FUNCTION(&_22$$11, "stripos", NULL, 338, &authHeader, &_20$$11); zephir_check_call_status(); _23$$11 = ZEPHIR_IS_LONG_IDENTICAL(&_22$$11, 0); if (_23$$11) { ZEPHIR_INIT_NVAR(&_20$$11); ZVAL_STRING(&_20$$11, "PHP_AUTH_DIGEST"); - ZEPHIR_CALL_METHOD(&_24$$11, this_ptr, "hasserver", NULL, 420, &_20$$11); + ZEPHIR_CALL_METHOD(&_24$$11, this_ptr, "hasserver", NULL, 333, &_20$$11); zephir_check_call_status(); _23$$11 = !zephir_is_true(&_24$$11); } ZEPHIR_INIT_NVAR(&_20$$11); ZVAL_STRING(&_20$$11, "bearer "); - ZEPHIR_CALL_FUNCTION(&_25$$11, "stripos", NULL, 425, &authHeader, &_20$$11); + ZEPHIR_CALL_FUNCTION(&_25$$11, "stripos", NULL, 338, &authHeader, &_20$$11); zephir_check_call_status(); if (ZEPHIR_IS_LONG_IDENTICAL(&_21$$11, 0)) { ZVAL_LONG(&_26$$12, 6); ZEPHIR_INIT_VAR(&_27$$12); zephir_substr(&_27$$12, &authHeader, 6 , 0, ZEPHIR_SUBSTR_NO_LENGTH); - ZEPHIR_CALL_FUNCTION(&_28$$12, "base64_decode", NULL, 250, &_27$$12); + ZEPHIR_CALL_FUNCTION(&_28$$12, "base64_decode", NULL, 223, &_27$$12); zephir_check_call_status(); ZEPHIR_INIT_VAR(&exploded); zephir_fast_explode_str(&exploded, SL(":"), &_28$$12, 2 ); @@ -107607,7 +107725,7 @@ static PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) zephir_array_fetch_string(&_32$$17, &headers, SL("Php-Auth-Pw"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1502); ZEPHIR_INIT_VAR(&_33$$17); ZEPHIR_CONCAT_VSV(&_33$$17, &_31$$17, ":", &_32$$17); - ZEPHIR_CALL_FUNCTION(&_34$$17, "base64_encode", NULL, 251, &_33$$17); + ZEPHIR_CALL_FUNCTION(&_34$$17, "base64_encode", NULL, 224, &_33$$17); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_35$$17); ZEPHIR_CONCAT_SV(&_35$$17, "Basic ", &_34$$17); @@ -107743,7 +107861,7 @@ static PHP_METHOD(Phalcon_Http_Request, smoothFiles) zephir_array_fetch(&_8$$5, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1554); zephir_array_fetch(&_9$$5, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1555); zephir_array_fetch(&_10$$5, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1556); - ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 427, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &_10$$5, &p); + ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 341, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &_10$$5, &p); zephir_check_call_status(); zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1563); if (Z_TYPE_P(&parentFiles) == IS_ARRAY) { @@ -107812,7 +107930,7 @@ static PHP_METHOD(Phalcon_Http_Request, smoothFiles) zephir_array_fetch(&_18$$10, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1554); zephir_array_fetch(&_19$$10, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1555); zephir_array_fetch(&_20$$10, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1556); - ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 427, &_16$$10, &_17$$10, &_18$$10, &_19$$10, &_20$$10, &p); + ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 341, &_16$$10, &_17$$10, &_18$$10, &_19$$10, &_20$$10, &p); zephir_check_call_status(); zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1563); if (Z_TYPE_P(&parentFiles) == IS_ARRAY) { @@ -108373,7 +108491,7 @@ static PHP_METHOD(Phalcon_Http_Response, redirect) if (_0$$5) { ZEPHIR_INIT_VAR(&_1$$5); ZVAL_STRING(&_1$$5, "://"); - ZEPHIR_CALL_FUNCTION(&_2$$5, "strstr", NULL, 434, location, &_1$$5); + ZEPHIR_CALL_FUNCTION(&_2$$5, "strstr", NULL, 349, location, &_1$$5); zephir_check_call_status(); _0$$5 = zephir_is_true(&_2$$5); } @@ -108525,7 +108643,7 @@ static PHP_METHOD(Phalcon_Http_Response, send) _3$$5 = ((zephir_fast_strlen_ev(&file)) ? 1 : 0); } if (_3$$5) { - ZEPHIR_CALL_FUNCTION(NULL, "readfile", NULL, 435, &file); + ZEPHIR_CALL_FUNCTION(NULL, "readfile", NULL, 350, &file); zephir_check_call_status(); } } @@ -108950,16 +109068,16 @@ static PHP_METHOD(Phalcon_Http_Response, setFileToSend) ZEPHIR_INIT_VAR(&basePathEncoding); ZVAL_STRING(&basePathEncoding, "ASCII"); if (Z_TYPE_P(attachmentName) != IS_STRING) { - ZEPHIR_CALL_METHOD(&basePath, this_ptr, "getbasename", NULL, 436, &filePath); + ZEPHIR_CALL_METHOD(&basePath, this_ptr, "getbasename", NULL, 351, &filePath); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&basePath, attachmentName); } if (zephir_is_true(attachment)) { if ((zephir_function_exists_ex(ZEND_STRL("mb_detect_encoding")) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&_0$$6, "mb_detect_order", NULL, 437); + ZEPHIR_CALL_FUNCTION(&_0$$6, "mb_detect_order", NULL, 352); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&basePathEncoding, "mb_detect_encoding", NULL, 348, &basePath, &_0$$6, &__$true); + ZEPHIR_CALL_FUNCTION(&basePathEncoding, "mb_detect_encoding", NULL, 321, &basePath, &_0$$6, &__$true); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_1$$5); @@ -108975,7 +109093,7 @@ static PHP_METHOD(Phalcon_Http_Response, setFileToSend) ZEPHIR_CALL_METHOD(NULL, this_ptr, "setrawheader", NULL, 0, &_1$$5); zephir_check_call_status(); if (!ZEPHIR_IS_STRING(&basePathEncoding, "ASCII")) { - ZEPHIR_CALL_FUNCTION(&_2$$7, "rawurlencode", NULL, 352, &basePath); + ZEPHIR_CALL_FUNCTION(&_2$$7, "rawurlencode", NULL, 325, &basePath); zephir_check_call_status(); ZEPHIR_CPY_WRT(&basePath, &_2$$7); ZEPHIR_INIT_VAR(&_3$$7); @@ -108987,7 +109105,7 @@ static PHP_METHOD(Phalcon_Http_Response, setFileToSend) } else { ZEPHIR_INIT_VAR(&_5$$8); ZVAL_STRING(&_5$$8, "\15\17\\\""); - ZEPHIR_CALL_FUNCTION(&_6$$8, "addcslashes", NULL, 235, &basePath, &_5$$8); + ZEPHIR_CALL_FUNCTION(&_6$$8, "addcslashes", NULL, 208, &basePath, &_5$$8); zephir_check_call_status(); ZEPHIR_CPY_WRT(&basePath, &_6$$8); ZEPHIR_INIT_VAR(&_7$$8); @@ -109145,7 +109263,7 @@ static PHP_METHOD(Phalcon_Http_Response, setJsonContent) zephir_check_call_status(); ZVAL_LONG(&_2, jsonOptions); ZVAL_LONG(&_3, depth); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "encode", NULL, 438, content, &_2, &_3); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "encode", NULL, 353, content, &_2, &_3); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "setcontent", NULL, 0, &_1); zephir_check_call_status(); @@ -109261,7030 +109379,28 @@ static PHP_METHOD(Phalcon_Http_Response, setStatusCode) ZEND_PARSE_PARAMETERS_START(1, 2) Z_PARAM_LONG(code) Z_PARAM_OPTIONAL - Z_PARAM_STR_OR_NULL(message) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 1, &code_param, &message_param); - code = zephir_get_intval(code_param); - if (!message_param) { - ZEPHIR_INIT_VAR(&message); - } else { - zephir_get_strval(&message, message_param); - } - - - zephir_read_property(&_0, this_ptr, ZEND_STRL("headers"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(¤tHeadersRaw, &_0, "toarray", NULL, 0); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_1); - zephir_is_iterable(¤tHeadersRaw, 0, "phalcon/Http/Response.zep", 711); - if (Z_TYPE_P(¤tHeadersRaw) == IS_ARRAY) { - ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(¤tHeadersRaw), _4, _5, _2) - { - ZEPHIR_INIT_NVAR(&key); - if (_5 != NULL) { - ZVAL_STR_COPY(&key, _5); - } else { - ZVAL_LONG(&key, _4); - } - ZEPHIR_INIT_NVAR(&_1); - ZVAL_COPY(&_1, _2); - _6$$3 = Z_TYPE_P(&key) == IS_STRING; - if (_6$$3) { - ZEPHIR_INIT_NVAR(&_7$$3); - ZVAL_STRING(&_7$$3, "HTTP/"); - ZEPHIR_CALL_FUNCTION(&_8$$3, "strstr", &_9, 434, &key, &_7$$3); - zephir_check_call_status(); - _6$$3 = zephir_is_true(&_8$$3); - } - if (_6$$3) { - zephir_read_property(&_10$$4, this_ptr, ZEND_STRL("headers"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, &_10$$4, "remove", NULL, 0, &key); - zephir_check_call_status(); - } - } ZEND_HASH_FOREACH_END(); - } else { - ZEPHIR_CALL_METHOD(NULL, ¤tHeadersRaw, "rewind", NULL, 0); - zephir_check_call_status(); - while (1) { - ZEPHIR_CALL_METHOD(&_3, ¤tHeadersRaw, "valid", NULL, 0); - zephir_check_call_status(); - if (!zend_is_true(&_3)) { - break; - } - ZEPHIR_CALL_METHOD(&key, ¤tHeadersRaw, "key", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, ¤tHeadersRaw, "current", NULL, 0); - zephir_check_call_status(); - _11$$5 = Z_TYPE_P(&key) == IS_STRING; - if (_11$$5) { - ZEPHIR_INIT_NVAR(&_12$$5); - ZVAL_STRING(&_12$$5, "HTTP/"); - ZEPHIR_CALL_FUNCTION(&_13$$5, "strstr", &_9, 434, &key, &_12$$5); - zephir_check_call_status(); - _11$$5 = zephir_is_true(&_13$$5); - } - if (_11$$5) { - zephir_read_property(&_14$$6, this_ptr, ZEND_STRL("headers"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, &_14$$6, "remove", NULL, 0, &key); - zephir_check_call_status(); - } - ZEPHIR_CALL_METHOD(NULL, ¤tHeadersRaw, "next", NULL, 0); - zephir_check_call_status(); - } - } - ZEPHIR_INIT_NVAR(&_1); - ZEPHIR_INIT_NVAR(&key); - if (ZEPHIR_IS_NULL(&message)) { - ZEPHIR_INIT_VAR(&statusCodes); - zephir_create_array(&statusCodes, 89, 0); - add_index_stringl(&statusCodes, 100, SL("Continue")); - add_index_stringl(&statusCodes, 101, SL("Switching Protocols")); - add_index_stringl(&statusCodes, 102, SL("Processing")); - add_index_stringl(&statusCodes, 103, SL("Early Hints")); - add_index_stringl(&statusCodes, 200, SL("OK")); - add_index_stringl(&statusCodes, 201, SL("Created")); - add_index_stringl(&statusCodes, 202, SL("Accepted")); - add_index_stringl(&statusCodes, 203, SL("Non-Authoritative Information")); - add_index_stringl(&statusCodes, 204, SL("No Content")); - add_index_stringl(&statusCodes, 205, SL("Reset Content")); - add_index_stringl(&statusCodes, 206, SL("Partial Content")); - add_index_stringl(&statusCodes, 207, SL("Multi-status")); - add_index_stringl(&statusCodes, 208, SL("Already Reported")); - add_index_stringl(&statusCodes, 226, SL("IM Used")); - add_index_stringl(&statusCodes, 300, SL("Multiple Choices")); - add_index_stringl(&statusCodes, 301, SL("Moved Permanently")); - add_index_stringl(&statusCodes, 302, SL("Found")); - add_index_stringl(&statusCodes, 303, SL("See Other")); - add_index_stringl(&statusCodes, 304, SL("Not Modified")); - add_index_stringl(&statusCodes, 305, SL("Use Proxy")); - add_index_stringl(&statusCodes, 306, SL("Switch Proxy")); - add_index_stringl(&statusCodes, 307, SL("Temporary Redirect")); - add_index_stringl(&statusCodes, 308, SL("Permanent Redirect")); - add_index_stringl(&statusCodes, 400, SL("Bad Request")); - add_index_stringl(&statusCodes, 401, SL("Unauthorized")); - add_index_stringl(&statusCodes, 402, SL("Payment Required")); - add_index_stringl(&statusCodes, 403, SL("Forbidden")); - add_index_stringl(&statusCodes, 404, SL("Not Found")); - add_index_stringl(&statusCodes, 405, SL("Method Not Allowed")); - add_index_stringl(&statusCodes, 406, SL("Not Acceptable")); - add_index_stringl(&statusCodes, 407, SL("Proxy Authentication Required")); - add_index_stringl(&statusCodes, 408, SL("Request Time-out")); - add_index_stringl(&statusCodes, 409, SL("Conflict")); - add_index_stringl(&statusCodes, 410, SL("Gone")); - add_index_stringl(&statusCodes, 411, SL("Length Required")); - add_index_stringl(&statusCodes, 412, SL("Precondition Failed")); - add_index_stringl(&statusCodes, 413, SL("Request Entity Too Large")); - add_index_stringl(&statusCodes, 414, SL("Request-URI Too Large")); - add_index_stringl(&statusCodes, 415, SL("Unsupported Media Type")); - add_index_stringl(&statusCodes, 416, SL("Requested range not satisfiable")); - add_index_stringl(&statusCodes, 417, SL("Expectation Failed")); - add_index_stringl(&statusCodes, 418, SL("I'm a teapot")); - add_index_stringl(&statusCodes, 421, SL("Misdirected Request")); - add_index_stringl(&statusCodes, 422, SL("Unprocessable Entity")); - add_index_stringl(&statusCodes, 423, SL("Locked")); - add_index_stringl(&statusCodes, 424, SL("Failed Dependency")); - add_index_stringl(&statusCodes, 425, SL("Unordered Collection")); - add_index_stringl(&statusCodes, 426, SL("Upgrade Required")); - add_index_stringl(&statusCodes, 428, SL("Precondition Required")); - add_index_stringl(&statusCodes, 429, SL("Too Many Requests")); - add_index_stringl(&statusCodes, 431, SL("Request Header Fields Too Large")); - add_index_stringl(&statusCodes, 451, SL("Unavailable For Legal Reasons")); - add_index_stringl(&statusCodes, 500, SL("Internal Server Error")); - add_index_stringl(&statusCodes, 501, SL("Not Implemented")); - add_index_stringl(&statusCodes, 502, SL("Bad Gateway")); - add_index_stringl(&statusCodes, 503, SL("Service Unavailable")); - add_index_stringl(&statusCodes, 504, SL("Gateway Time-out")); - add_index_stringl(&statusCodes, 505, SL("HTTP Version not supported")); - add_index_stringl(&statusCodes, 506, SL("Variant Also Negotiates")); - add_index_stringl(&statusCodes, 507, SL("Insufficient Storage")); - add_index_stringl(&statusCodes, 508, SL("Loop Detected")); - add_index_stringl(&statusCodes, 510, SL("Not Extended")); - add_index_stringl(&statusCodes, 511, SL("Network Authentication Required")); - add_index_stringl(&statusCodes, 218, SL("This is fine")); - add_index_stringl(&statusCodes, 419, SL("Page Expired")); - add_index_stringl(&statusCodes, 420, SL("Method Failure")); - add_index_stringl(&statusCodes, 440, SL("Login Time-out")); - add_index_stringl(&statusCodes, 444, SL("No Response")); - add_index_stringl(&statusCodes, 449, SL("Retry With")); - add_index_stringl(&statusCodes, 450, SL("Blocked by Windows Parental Controls (Microsoft)")); - add_index_stringl(&statusCodes, 494, SL("Request header too large")); - add_index_stringl(&statusCodes, 495, SL("SSL Certificate Error")); - add_index_stringl(&statusCodes, 496, SL("SSL Certificate Required")); - add_index_stringl(&statusCodes, 497, SL("HTTP Request Sent to HTTPS Port")); - add_index_stringl(&statusCodes, 498, SL("Invalid Token (Esri)")); - add_index_stringl(&statusCodes, 499, SL("Client Closed Request")); - add_index_stringl(&statusCodes, 509, SL("Bandwidth Limit Exceeded")); - add_index_stringl(&statusCodes, 520, SL("Unknown Error")); - add_index_stringl(&statusCodes, 521, SL("Web Server Is Down")); - add_index_stringl(&statusCodes, 522, SL("Connection Timed Out")); - add_index_stringl(&statusCodes, 523, SL("Origin Is Unreachable")); - add_index_stringl(&statusCodes, 524, SL("A Timeout Occurred")); - add_index_stringl(&statusCodes, 525, SL("SSL Handshake Failed")); - add_index_stringl(&statusCodes, 526, SL("Invalid SSL Certificate")); - add_index_stringl(&statusCodes, 527, SL("Railgun Error")); - add_index_stringl(&statusCodes, 530, SL("Origin DNS Error")); - add_index_stringl(&statusCodes, 598, SL("Network read timeout error")); - add_index_stringl(&statusCodes, 599, SL("Network Connect Timeout Error")); - if (UNEXPECTED(!(zephir_array_isset_long(&statusCodes, code)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "Non-standard statuscode given without a message", "phalcon/Http/Response.zep", 818); - return; - } - ZEPHIR_OBS_VAR(&defaultMessage); - zephir_array_fetch_long(&defaultMessage, &statusCodes, code, PH_NOISY, "phalcon/Http/Response.zep", 821); - zephir_get_strval(&message, &defaultMessage); - } - zephir_read_property(&_15, this_ptr, ZEND_STRL("headers"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_INIT_VAR(&_16); - ZVAL_LONG(&_16, code); - ZEPHIR_INIT_VAR(&_17); - ZEPHIR_CONCAT_SVSV(&_17, "HTTP/1.1 ", &_16, " ", &message); - ZEPHIR_CALL_METHOD(NULL, &_15, "setraw", NULL, 0, &_17); - zephir_check_call_status(); - zephir_read_property(&_18, this_ptr, ZEND_STRL("headers"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_INIT_VAR(&_19); - ZVAL_LONG(&_19, code); - ZEPHIR_INIT_VAR(&_20); - ZEPHIR_CONCAT_VSV(&_20, &_19, " ", &message); - ZEPHIR_INIT_VAR(&_21); - ZVAL_STRING(&_21, "Status"); - ZEPHIR_CALL_METHOD(NULL, &_18, "set", NULL, 0, &_21, &_20); - zephir_check_call_status(); - RETURN_THIS(); -} - -static PHP_METHOD(Phalcon_Http_Response, setRawHeader) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *header_param = NULL, _0; - zval header; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&header); - ZVAL_UNDEF(&_0); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR(header) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &header_param); - zephir_get_strval(&header, header_param); - - - zephir_read_property(&_0, this_ptr, ZEND_STRL("headers"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, &_0, "setraw", NULL, 0, &header); - zephir_check_call_status(); - RETURN_THIS(); -} - -static PHP_METHOD(Phalcon_Http_Response, getBasename) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *uri_param = NULL, *suffix = NULL, suffix_sub, __$null, filename, matches, _0, _1, _2, _3, _4, _5, _6$$3, _7$$3, _8$$3, _9$$3; - zval uri; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&uri); - ZVAL_UNDEF(&suffix_sub); - ZVAL_NULL(&__$null); - ZVAL_UNDEF(&filename); - ZVAL_UNDEF(&matches); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_3); - ZVAL_UNDEF(&_4); - ZVAL_UNDEF(&_5); - ZVAL_UNDEF(&_6$$3); - ZVAL_UNDEF(&_7$$3); - ZVAL_UNDEF(&_8$$3); - ZVAL_UNDEF(&_9$$3); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_STR(uri) - Z_PARAM_OPTIONAL - Z_PARAM_ZVAL_OR_NULL(suffix) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 1, &uri_param, &suffix); - if (UNEXPECTED(Z_TYPE_P(uri_param) != IS_STRING && Z_TYPE_P(uri_param) != IS_NULL)) { - zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'uri' must be of the type string")); - RETURN_MM_NULL(); - } - if (EXPECTED(Z_TYPE_P(uri_param) == IS_STRING)) { - zephir_get_strval(&uri, uri_param); - } else { - ZEPHIR_INIT_VAR(&uri); - } - if (!suffix) { - suffix = &suffix_sub; - suffix = &__$null; - } - - - ZEPHIR_INIT_VAR(&_0); - ZEPHIR_INIT_VAR(&_1); - ZVAL_STRING(&_1, "/"); - zephir_fast_trim(&_0, &uri, &_1, ZEPHIR_TRIM_RIGHT); - zephir_get_strval(&uri, &_0); - ZEPHIR_INIT_VAR(&_2); - ZVAL_STRING(&_2, "/"); - ZEPHIR_INIT_VAR(&_3); - ZVAL_STRING(&_3, "@"); - ZEPHIR_CALL_FUNCTION(&_4, "preg_quote", NULL, 439, &_2, &_3); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_5); - ZEPHIR_CONCAT_SVS(&_5, "@[^", &_4, "]+$@"); - ZEPHIR_INIT_NVAR(&_2); - zephir_preg_match(&_2, &_5, &uri, &matches, 0, 0 , 0 ); - if (zephir_is_true(&_2)) { - ZEPHIR_OBS_VAR(&filename); - zephir_array_fetch_long(&filename, &matches, 0, PH_NOISY, "phalcon/Http/Response.zep", 861); - } else { - ZEPHIR_INIT_NVAR(&filename); - ZVAL_STRING(&filename, ""); - } - if (zephir_is_true(suffix)) { - ZEPHIR_INIT_VAR(&_6$$3); - ZVAL_STRING(&_6$$3, "@"); - ZEPHIR_CALL_FUNCTION(&_7$$3, "preg_quote", NULL, 439, suffix, &_6$$3); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_8$$3); - ZEPHIR_CONCAT_SVS(&_8$$3, "@", &_7$$3, "$@"); - ZEPHIR_INIT_NVAR(&_6$$3); - ZVAL_STRING(&_6$$3, ""); - ZEPHIR_CALL_FUNCTION(&_9$$3, "preg_replace", NULL, 50, &_8$$3, &_6$$3, &filename); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(&filename, &_9$$3); - } - RETURN_CCTOR(&filename); -} - -static PHP_METHOD(Phalcon_Http_Response, encode) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long options, depth, ZEPHIR_LAST_CALL_STATUS; - zval *data, data_sub, *options_param = NULL, *depth_param = NULL, encoded, _0, _1, _2, _3$$3, _4$$3, _5$$3; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&data_sub); - ZVAL_UNDEF(&encoded); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_3$$3); - ZVAL_UNDEF(&_4$$3); - ZVAL_UNDEF(&_5$$3); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 3) - Z_PARAM_ZVAL(data) - Z_PARAM_OPTIONAL - Z_PARAM_LONG(options) - Z_PARAM_LONG(depth) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 2, &data, &options_param, &depth_param); - if (!options_param) { - options = 0; - } else { - options = zephir_get_intval(options_param); - } - if (!depth_param) { - depth = 512; - } else { - depth = zephir_get_intval(depth_param); - } - - - ZVAL_LONG(&_0, options); - ZVAL_LONG(&_1, depth); - ZEPHIR_INIT_VAR(&encoded); - zephir_json_encode(&encoded, data, zephir_get_intval(&_0) ); - ZEPHIR_CALL_FUNCTION(&_2, "json_last_error", NULL, 215); - zephir_check_call_status(); - if (UNEXPECTED(!ZEPHIR_IS_LONG_IDENTICAL(&_2, 0))) { - ZEPHIR_INIT_VAR(&_3$$3); - object_init_ex(&_3$$3, spl_ce_InvalidArgumentException); - ZEPHIR_CALL_FUNCTION(&_4$$3, "json_last_error_msg", NULL, 216); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_5$$3); - ZEPHIR_CONCAT_SV(&_5$$3, "json_encode error: ", &_4$$3); - ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 40, &_5$$3); - zephir_check_call_status(); - zephir_throw_exception_debug(&_3$$3, "phalcon/Http/Response.zep", 885); - ZEPHIR_MM_RESTORE(); - return; - } - RETURN_CCTOR(&encoded); -} - -zend_object *zephir_init_properties_Phalcon_Http_Response(zend_class_entry *class_type) -{ - zval _0, _1$$3; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1$$3); - - - ZEPHIR_MM_GROW(); - - { - zval local_this_ptr, *this_ptr = &local_this_ptr; - ZEPHIR_CREATE_OBJECT(this_ptr, class_type); - zephir_read_property_ex(&_0, this_ptr, ZEND_STRL("statusCodes"), PH_NOISY_CC | PH_READONLY); - if (Z_TYPE_P(&_0) == IS_NULL) { - ZEPHIR_INIT_VAR(&_1$$3); - array_init(&_1$$3); - zephir_update_property_zval_ex(this_ptr, ZEND_STRL("statusCodes"), &_1$$3); - } - ZEPHIR_MM_RESTORE(); - return Z_OBJ_P(this_ptr); - } -} - - - - -#ifdef HAVE_CONFIG_H -#endif - - - - - -ZEPHIR_INIT_CLASS(Phalcon_Http_ResponseInterface) -{ - ZEPHIR_REGISTER_INTERFACE(Phalcon\\Http, ResponseInterface, phalcon, http_responseinterface, phalcon_http_responseinterface_method_entry); - - return SUCCESS; -} - -ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, appendContent); -ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, getContent); -ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, getStatusCode); -ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, getHeaders); -ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, hasHeader); -ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, isSent); -ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, redirect); -ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, resetHeaders); -ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, setContent); -ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, setContentLength); -ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, setContentType); -ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, setExpires); -ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, setFileToSend); -ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, setHeader); -ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, setJsonContent); -ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, setNotModified); -ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, setRawHeader); -ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, setStatusCode); -ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, send); -ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, sendCookies); -ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, sendHeaders); - - - -#ifdef HAVE_CONFIG_H -#endif - - - - - -ZEPHIR_INIT_CLASS(Phalcon_Http_Cookie_CookieInterface) -{ - ZEPHIR_REGISTER_INTERFACE(Phalcon\\Http\\Cookie, CookieInterface, phalcon, http_cookie_cookieinterface, phalcon_http_cookie_cookieinterface_method_entry); - - return SUCCESS; -} - -ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, delete); -ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, getDomain); -ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, getExpiration); -ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, getHttpOnly); -ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, getName); -ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, getOptions); -ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, getPath); -ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, getSecure); -ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, getValue); -ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, isUsingEncryption); -ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, send); -ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, setDomain); -ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, setExpiration); -ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, setHttpOnly); -ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, setOptions); -ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, setPath); -ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, setSecure); -ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, setValue); -ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, useEncryption); - - - -#ifdef HAVE_CONFIG_H -#endif - - - - - -ZEPHIR_INIT_CLASS(Phalcon_Http_Cookie_Exception) -{ - ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Http\\Cookie, Exception, phalcon, http_cookie_exception, zend_ce_exception, NULL, 0); - - return SUCCESS; -} - - - - -#ifdef HAVE_CONFIG_H -#endif - - - - - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_AbstractCommon) -{ - ZEPHIR_REGISTER_CLASS(Phalcon\\Http\\Message, AbstractCommon, phalcon, http_message_abstractcommon, phalcon_http_message_abstractcommon_method_entry, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); - - return SUCCESS; -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractCommon, cloneInstance) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval property; - zval *element, element_sub, *property_param = NULL, newInstance; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&element_sub); - ZVAL_UNDEF(&newInstance); - ZVAL_UNDEF(&property); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_ZVAL(element) - Z_PARAM_STR(property) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 2, 0, &element, &property_param); - zephir_get_strval(&property, property_param); - - - ZEPHIR_INIT_VAR(&newInstance); - if (zephir_clone(&newInstance, this_ptr) == FAILURE) { - RETURN_MM(); - } - zephir_update_property_zval_zval(&newInstance, &property, element); - RETURN_CCTOR(&newInstance); -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractCommon, checkStringParameter) -{ - zval *element, element_sub; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&element_sub); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(element) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - zephir_fetch_params_without_memory_grow(1, 0, &element); - - - if (Z_TYPE_P(element) != IS_STRING) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_http_message_exception_invalidargumentexception_ce, "Method requires a string argument", "phalcon/Http/Message/AbstractCommon.zep", 52); - return; - } -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractCommon, processWith) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval property; - zval *element, element_sub, *property_param = NULL; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&element_sub); - ZVAL_UNDEF(&property); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_ZVAL(element) - Z_PARAM_STR(property) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 2, 0, &element, &property_param); - zephir_get_strval(&property, property_param); - - - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkstringparameter", NULL, 20, element); - zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "cloneinstance", NULL, 21, element, &property); - zephir_check_call_status(); - RETURN_MM(); -} - - - - -#ifdef HAVE_CONFIG_H -#endif - - - - - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_AbstractMessage) -{ - ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Http\\Message, AbstractMessage, phalcon, http_message_abstractmessage, phalcon_http_message_abstractcommon_ce, phalcon_http_message_abstractmessage_method_entry, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); - - zend_declare_property_null(phalcon_http_message_abstractmessage_ce, SL("body"), ZEND_ACC_PROTECTED); - zend_declare_property_null(phalcon_http_message_abstractmessage_ce, SL("headers"), ZEND_ACC_PROTECTED); - zend_declare_property_string(phalcon_http_message_abstractmessage_ce, SL("protocolVersion"), "1.1", ZEND_ACC_PROTECTED); - zend_declare_property_null(phalcon_http_message_abstractmessage_ce, SL("uri"), ZEND_ACC_PROTECTED); - return SUCCESS; -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, getBody) -{ - zval *this_ptr = getThis(); - - - - RETURN_MEMBER(getThis(), "body"); -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, getProtocolVersion) -{ - zval *this_ptr = getThis(); - - - - RETURN_MEMBER(getThis(), "protocolVersion"); -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, getUri) -{ - zval *this_ptr = getThis(); - - - - RETURN_MEMBER(getThis(), "uri"); -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, getHeader) -{ - zval _0; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *name = NULL, name_sub, _1, _2; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&name_sub); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_0); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(name) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &name); - ZEPHIR_SEPARATE_PARAM(name); - - - zephir_cast_to_string(&_0, name); - ZEPHIR_CPY_WRT(name, &_0); - zephir_read_property(&_1, this_ptr, ZEND_STRL("headers"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_INIT_VAR(&_2); - array_init(&_2); - ZEPHIR_RETURN_CALL_METHOD(&_1, "get", NULL, 0, name, &_2); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, getHeaderLine) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *name, name_sub, header, _0; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&name_sub); - ZVAL_UNDEF(&header); - ZVAL_UNDEF(&_0); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(name) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &name); - - - ZEPHIR_CALL_METHOD(&header, this_ptr, "getheader", NULL, 0, name); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, ","); - zephir_fast_join(return_value, &_0, &header); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, getHeaders) -{ - zval _0; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&_0); - - - ZEPHIR_MM_GROW(); - - zephir_read_property(&_0, this_ptr, ZEND_STRL("headers"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_METHOD(&_0, "toarray", NULL, 0); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, hasHeader) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *name, name_sub, _0; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&name_sub); - ZVAL_UNDEF(&_0); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(name) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &name); - - - zephir_read_property(&_0, this_ptr, ZEND_STRL("headers"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_METHOD(&_0, "has", NULL, 0, name); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, withAddedHeader) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *name, name_sub, *value = NULL, value_sub, existing, headers, _0, _1, _2, _3, _4; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&name_sub); - ZVAL_UNDEF(&value_sub); - ZVAL_UNDEF(&existing); - ZVAL_UNDEF(&headers); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_3); - ZVAL_UNDEF(&_4); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_ZVAL(name) - Z_PARAM_ZVAL(value) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 2, 0, &name, &value); - ZEPHIR_SEPARATE_PARAM(value); - - - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkheadername", NULL, 35, name); - zephir_check_call_status(); - zephir_read_property(&_0, this_ptr, ZEND_STRL("headers"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_INIT_VAR(&_1); - if (zephir_clone(&_1, &_0) == FAILURE) { - RETURN_MM(); - } - ZEPHIR_CPY_WRT(&headers, &_1); - ZEPHIR_INIT_VAR(&_2); - array_init(&_2); - ZEPHIR_CALL_METHOD(&existing, &headers, "get", NULL, 0, name, &_2); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "getheadervalue", NULL, 36, value); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(value, &_3); - ZEPHIR_INIT_VAR(&_4); - zephir_fast_array_merge(&_4, &existing, value); - ZEPHIR_CPY_WRT(value, &_4); - ZEPHIR_CALL_METHOD(NULL, &headers, "set", NULL, 0, name, value); - zephir_check_call_status(); - ZEPHIR_INIT_NVAR(&_4); - ZVAL_STRING(&_4, "headers"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "cloneinstance", NULL, 21, &headers, &_4); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, withBody) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *body, body_sub, newBody, _0; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&body_sub); - ZVAL_UNDEF(&newBody); - ZVAL_UNDEF(&_0); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(body, zephir_get_internal_ce(SL("psr\\http\\message\\streaminterface"))) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &body); - - - ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, "w+b"); - ZEPHIR_CALL_METHOD(&newBody, this_ptr, "processbody", NULL, 37, body, &_0); - zephir_check_call_status(); - ZEPHIR_INIT_NVAR(&_0); - ZVAL_STRING(&_0, "body"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "cloneinstance", NULL, 21, &newBody, &_0); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, withHeader) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *name, name_sub, *value = NULL, value_sub, headers, _0, _1, _2, _3; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&name_sub); - ZVAL_UNDEF(&value_sub); - ZVAL_UNDEF(&headers); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_3); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_ZVAL(name) - Z_PARAM_ZVAL(value) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 2, 0, &name, &value); - ZEPHIR_SEPARATE_PARAM(value); - - - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkheadername", NULL, 35, name); - zephir_check_call_status(); - zephir_read_property(&_0, this_ptr, ZEND_STRL("headers"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_INIT_VAR(&_1); - if (zephir_clone(&_1, &_0) == FAILURE) { - RETURN_MM(); - } - ZEPHIR_CPY_WRT(&headers, &_1); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "getheadervalue", NULL, 36, value); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(value, &_2); - ZEPHIR_CALL_METHOD(NULL, &headers, "set", NULL, 0, name, value); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_3); - ZVAL_STRING(&_3, "headers"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "cloneinstance", NULL, 21, &headers, &_3); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, withProtocolVersion) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *version, version_sub, _0; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&version_sub); - ZVAL_UNDEF(&_0); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(version) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &version); - - - ZEPHIR_CALL_METHOD(NULL, this_ptr, "processprotocol", NULL, 38, version); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, "protocolVersion"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "cloneinstance", NULL, 21, version, &_0); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, withoutHeader) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *name, name_sub, headers, _0, _1, _2; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&name_sub); - ZVAL_UNDEF(&headers); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(name) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &name); - - - zephir_read_property(&_0, this_ptr, ZEND_STRL("headers"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_INIT_VAR(&_1); - if (zephir_clone(&_1, &_0) == FAILURE) { - RETURN_MM(); - } - ZEPHIR_CPY_WRT(&headers, &_1); - ZEPHIR_CALL_METHOD(NULL, &headers, "remove", NULL, 0, name); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_2); - ZVAL_STRING(&_2, "headers"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "cloneinstance", NULL, 21, &headers, &_2); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, checkHeaderHost) -{ - zend_bool _2, _4; - zval header, _11$$3; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *collection, collection_sub, data, host, hostArray, _0, _1, _3, _5, _6, _7, _8$$3, _10$$3, _12$$3, _9$$4; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&collection_sub); - ZVAL_UNDEF(&data); - ZVAL_UNDEF(&host); - ZVAL_UNDEF(&hostArray); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_3); - ZVAL_UNDEF(&_5); - ZVAL_UNDEF(&_6); - ZVAL_UNDEF(&_7); - ZVAL_UNDEF(&_8$$3); - ZVAL_UNDEF(&_10$$3); - ZVAL_UNDEF(&_12$$3); - ZVAL_UNDEF(&_9$$4); - ZVAL_UNDEF(&header); - ZVAL_UNDEF(&_11$$3); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(collection, phalcon_support_collection_collectioninterface_ce) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &collection); - - - ZEPHIR_INIT_VAR(&_1); - ZVAL_STRING(&_1, "host"); - ZEPHIR_CALL_METHOD(&_0, collection, "has", NULL, 0, &_1); - zephir_check_call_status(); - _2 = zephir_is_true(&_0); - if (_2) { - ZEPHIR_OBS_VAR(&_3); - zephir_read_property(&_3, this_ptr, ZEND_STRL("uri"), PH_NOISY_CC); - _2 = !(ZEPHIR_IS_EMPTY(&_3)); - } - _4 = _2; - if (_4) { - zephir_read_property(&_5, this_ptr, ZEND_STRL("uri"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_6, &_5, "gethost", NULL, 0); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_7); - ZVAL_STRING(&_7, ""); - _4 = !ZEPHIR_IS_IDENTICAL(&_7, &_6); - } - if (UNEXPECTED(_4)) { - zephir_read_property(&_8$$3, this_ptr, ZEND_STRL("uri"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&host, this_ptr, "geturihost", NULL, 39, &_8$$3); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(&hostArray, &host); - if (UNEXPECTED(Z_TYPE_P(&host) != IS_ARRAY)) { - ZEPHIR_INIT_VAR(&_9$$4); - zephir_create_array(&_9$$4, 1, 0); - zephir_array_fast_append(&_9$$4, &host); - ZEPHIR_CPY_WRT(&hostArray, &_9$$4); - } - ZEPHIR_INIT_VAR(&_10$$3); - ZVAL_STRING(&_10$$3, "host"); - ZEPHIR_CALL_METHOD(NULL, collection, "remove", NULL, 0, &_10$$3); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&data, collection, "toarray", NULL, 0); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&header); - array_init(&header); - zephir_array_update_string(&header, SL("Host"), &hostArray, PH_COPY | PH_SEPARATE); - zephir_get_arrval(&_11$$3, &data); - ZEPHIR_INIT_VAR(&_12$$3); - zephir_add_function(&_12$$3, &header, &_11$$3); - ZEPHIR_CPY_WRT(&header, &_12$$3); - ZEPHIR_CALL_METHOD(NULL, collection, "clear", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, collection, "init", NULL, 0, &header); - zephir_check_call_status(); - } - RETVAL_ZVAL(collection, 1, 0); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, checkHeaderName) -{ - zend_bool _0; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *name, name_sub, _1, _2, _3, _4, _5$$3, _6$$3; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&name_sub); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_3); - ZVAL_UNDEF(&_4); - ZVAL_UNDEF(&_5$$3); - ZVAL_UNDEF(&_6$$3); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(name) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &name); - - - _0 = Z_TYPE_P(name) != IS_STRING; - if (!(_0)) { - ZEPHIR_INIT_VAR(&_1); - ZEPHIR_INIT_VAR(&_2); - ZVAL_STRING(&_2, "/^[a-zA-Z0-9'`#$%&*+.^_|~!-]+$/"); - ZEPHIR_INIT_VAR(&_3); - ZEPHIR_INIT_VAR(&_4); - ZVAL_STRING(&_4, "/^[a-zA-Z0-9'`#$%&*+.^_|~!-]+$/"); - zephir_preg_match(&_3, &_4, name, &_1, 0, 0 , 0 ); - _0 = !zephir_is_true(&_3); - } - if (UNEXPECTED(_0)) { - ZEPHIR_INIT_VAR(&_5$$3); - object_init_ex(&_5$$3, phalcon_http_message_exception_invalidargumentexception_ce); - ZEPHIR_INIT_VAR(&_6$$3); - ZEPHIR_CONCAT_SV(&_6$$3, "Invalid header name ", name); - ZEPHIR_CALL_METHOD(NULL, &_5$$3, "__construct", NULL, 40, &_6$$3); - zephir_check_call_status(); - zephir_throw_exception_debug(&_5$$3, "phalcon/Http/Message/AbstractMessage.zep", 333); - ZEPHIR_MM_RESTORE(); - return; - } - ZEPHIR_MM_RESTORE(); -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, checkHeaderValue) -{ - zval _1; - zend_bool _0, _6; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *value = NULL, value_sub, _2, _3, _4, _5, _7, _8, _9, _10; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&value_sub); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_3); - ZVAL_UNDEF(&_4); - ZVAL_UNDEF(&_5); - ZVAL_UNDEF(&_7); - ZVAL_UNDEF(&_8); - ZVAL_UNDEF(&_9); - ZVAL_UNDEF(&_10); - ZVAL_UNDEF(&_1); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(value) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &value); - ZEPHIR_SEPARATE_PARAM(value); - - - _0 = Z_TYPE_P(value) != IS_STRING; - if (_0) { - _0 = 1 != zephir_is_numeric(value); - } - if (UNEXPECTED(_0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Invalid header value", "phalcon/Http/Message/AbstractMessage.zep", 385); - return; - } - zephir_cast_to_string(&_1, value); - ZEPHIR_CPY_WRT(value, &_1); - ZEPHIR_INIT_VAR(&_2); - ZEPHIR_INIT_VAR(&_3); - ZVAL_STRING(&_3, "#(?:(?:(?= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(values) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &values); - - - ZEPHIR_CPY_WRT(&valueArray, values); - if (UNEXPECTED(Z_TYPE_P(values) != IS_ARRAY)) { - ZEPHIR_INIT_VAR(&_0$$3); - zephir_create_array(&_0$$3, 1, 0); - zephir_array_fast_append(&_0$$3, values); - ZEPHIR_CPY_WRT(&valueArray, &_0$$3); - } - if (UNEXPECTED(ZEPHIR_IS_EMPTY(&valueArray))) { - ZEPHIR_INIT_VAR(&_1$$4); - object_init_ex(&_1$$4, phalcon_http_message_exception_invalidargumentexception_ce); - ZEPHIR_INIT_VAR(&_2$$4); - ZEPHIR_CONCAT_SS(&_2$$4, "Invalid header value: must be a string or ", "array of strings; cannot be an empty array"); - ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 40, &_2$$4); - zephir_check_call_status(); - zephir_throw_exception_debug(&_1$$4, "phalcon/Http/Message/AbstractMessage.zep", 412); - ZEPHIR_MM_RESTORE(); - return; - } - ZEPHIR_INIT_VAR(&valueData); - array_init(&valueData); - zephir_is_iterable(&valueArray, 0, "phalcon/Http/Message/AbstractMessage.zep", 422); - if (Z_TYPE_P(&valueArray) == IS_ARRAY) { - ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&valueArray), _3) - { - ZEPHIR_INIT_NVAR(&value); - ZVAL_COPY(&value, _3); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkheadervalue", &_5, 41, &value); - zephir_check_call_status(); - zephir_cast_to_string(&_6$$5, &value); - zephir_array_append(&valueData, &_6$$5, PH_SEPARATE, "phalcon/Http/Message/AbstractMessage.zep", 419); - } ZEND_HASH_FOREACH_END(); - } else { - ZEPHIR_CALL_METHOD(NULL, &valueArray, "rewind", NULL, 0); - zephir_check_call_status(); - while (1) { - ZEPHIR_CALL_METHOD(&_4, &valueArray, "valid", NULL, 0); - zephir_check_call_status(); - if (!zend_is_true(&_4)) { - break; - } - ZEPHIR_CALL_METHOD(&value, &valueArray, "current", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkheadervalue", &_5, 41, &value); - zephir_check_call_status(); - zephir_cast_to_string(&_7$$6, &value); - zephir_array_append(&valueData, &_7$$6, PH_SEPARATE, "phalcon/Http/Message/AbstractMessage.zep", 419); - ZEPHIR_CALL_METHOD(NULL, &valueArray, "next", NULL, 0); - zephir_check_call_status(); - } - } - ZEPHIR_INIT_NVAR(&value); - RETURN_CCTOR(&valueData); -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, getUriHost) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *uri, uri_sub, host, _0, _1$$3, _2$$3; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&uri_sub); - ZVAL_UNDEF(&host); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1$$3); - ZVAL_UNDEF(&_2$$3); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(uri, zephir_get_internal_ce(SL("psr\\http\\message\\uriinterface"))) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &uri); - - - ZEPHIR_CALL_METHOD(&host, uri, "gethost", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_0, uri, "getport", NULL, 0); - zephir_check_call_status(); - if (UNEXPECTED(Z_TYPE_P(&_0) != IS_NULL)) { - ZEPHIR_CALL_METHOD(&_1$$3, uri, "getport", NULL, 0); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_2$$3); - ZEPHIR_CONCAT_SV(&_2$$3, ":", &_1$$3); - zephir_concat_self(&host, &_2$$3); - } - RETURN_CCTOR(&host); -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, populateHeaderCollection) -{ - zval _5$$3, _9$$4; - zend_string *_3; - zend_ulong _2; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zephir_fcall_cache_entry *_4 = NULL, *_7 = NULL, *_8 = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *headers_param = NULL, collection, name, value, *_0, _1, _6$$3, _10$$4; - zval headers; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&headers); - ZVAL_UNDEF(&collection); - ZVAL_UNDEF(&name); - ZVAL_UNDEF(&value); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_6$$3); - ZVAL_UNDEF(&_10$$4); - ZVAL_UNDEF(&_5$$3); - ZVAL_UNDEF(&_9$$4); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ARRAY(headers) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &headers_param); - zephir_get_arrval(&headers, headers_param); - - - ZEPHIR_INIT_VAR(&collection); - object_init_ex(&collection, phalcon_support_collection_ce); - ZEPHIR_CALL_METHOD(NULL, &collection, "__construct", NULL, 24); - zephir_check_call_status(); - zephir_is_iterable(&headers, 0, "phalcon/Http/Message/AbstractMessage.zep", 466); - if (Z_TYPE_P(&headers) == IS_ARRAY) { - ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&headers), _2, _3, _0) - { - ZEPHIR_INIT_NVAR(&name); - if (_3 != NULL) { - ZVAL_STR_COPY(&name, _3); - } else { - ZVAL_LONG(&name, _2); - } - ZEPHIR_INIT_NVAR(&value); - ZVAL_COPY(&value, _0); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkheadername", &_4, 35, &name); - zephir_check_call_status(); - zephir_cast_to_string(&_5$$3, &name); - ZEPHIR_CPY_WRT(&name, &_5$$3); - ZEPHIR_CALL_METHOD(&_6$$3, this_ptr, "getheadervalue", &_7, 36, &value); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(&value, &_6$$3); - ZEPHIR_CALL_METHOD(NULL, &collection, "set", &_8, 42, &name, &value); - zephir_check_call_status(); - } ZEND_HASH_FOREACH_END(); - } else { - ZEPHIR_CALL_METHOD(NULL, &headers, "rewind", NULL, 0); - zephir_check_call_status(); - while (1) { - ZEPHIR_CALL_METHOD(&_1, &headers, "valid", NULL, 0); - zephir_check_call_status(); - if (!zend_is_true(&_1)) { - break; - } - ZEPHIR_CALL_METHOD(&name, &headers, "key", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&value, &headers, "current", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkheadername", &_4, 35, &name); - zephir_check_call_status(); - zephir_cast_to_string(&_9$$4, &name); - ZEPHIR_CPY_WRT(&name, &_9$$4); - ZEPHIR_CALL_METHOD(&_10$$4, this_ptr, "getheadervalue", &_7, 36, &value); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(&value, &_10$$4); - ZEPHIR_CALL_METHOD(NULL, &collection, "set", &_8, 42, &name, &value); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &headers, "next", NULL, 0); - zephir_check_call_status(); - } - } - ZEPHIR_INIT_NVAR(&value); - ZEPHIR_INIT_NVAR(&name); - RETURN_CCTOR(&collection); -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, processBody) -{ - zend_bool _0, _1; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval mode; - zval *body = NULL, body_sub, *mode_param = NULL; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&body_sub); - ZVAL_UNDEF(&mode); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(0, 2) - Z_PARAM_OPTIONAL - Z_PARAM_ZVAL(body) - Z_PARAM_STR(mode) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 0, 2, &body, &mode_param); - if (!body) { - body = &body_sub; - ZEPHIR_INIT_VAR(body); - ZVAL_STRING(body, "php://memory"); - } - if (!mode_param) { - ZEPHIR_INIT_VAR(&mode); - ZVAL_STRING(&mode, "r+b"); - } else { - if (UNEXPECTED(Z_TYPE_P(mode_param) != IS_STRING && Z_TYPE_P(mode_param) != IS_NULL)) { - zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'mode' must be of the type string")); - RETURN_MM_NULL(); - } - if (EXPECTED(Z_TYPE_P(mode_param) == IS_STRING)) { - zephir_get_strval(&mode, mode_param); - } else { - ZEPHIR_INIT_VAR(&mode); - } - } - - - _0 = Z_TYPE_P(body) == IS_OBJECT; - if (_0) { - _0 = zephir_is_instance_of(body, SL("Psr\\Http\\Message\\StreamInterface")); - } - if (UNEXPECTED(_0)) { - RETVAL_ZVAL(body, 1, 0); - RETURN_MM(); - } - _1 = Z_TYPE_P(body) != IS_STRING; - if (_1) { - _1 = Z_TYPE_P(body) != IS_RESOURCE; - } - if (UNEXPECTED(_1)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Invalid stream passed as a parameter", "phalcon/Http/Message/AbstractMessage.zep", 486); - return; - } - object_init_ex(return_value, phalcon_http_message_stream_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 43, body, &mode); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, processHeaders) -{ - zend_bool _1$$4; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *headers, headers_sub, collection, _0$$3; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&headers_sub); - ZVAL_UNDEF(&collection); - ZVAL_UNDEF(&_0$$3); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(headers) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &headers); - - - if (EXPECTED(Z_TYPE_P(headers) == IS_ARRAY)) { - ZEPHIR_CALL_METHOD(&collection, this_ptr, "populateheadercollection", NULL, 44, headers); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "checkheaderhost", NULL, 45, &collection); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(&collection, &_0$$3); - } else { - _1$$4 = Z_TYPE_P(headers) == IS_OBJECT; - if (_1$$4) { - _1$$4 = zephir_instance_of_ev(headers, phalcon_support_collection_collectioninterface_ce); - } - if (UNEXPECTED(!(_1$$4))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Headers needs to be either an array or instance of Phalcon\\Support\\Collection", "phalcon/Http/Message/AbstractMessage.zep", 506); - return; - } - ZEPHIR_CPY_WRT(&collection, headers); - } - RETURN_CCTOR(&collection); -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, processProtocol) -{ - zend_bool _0; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *protocol = NULL, protocol_sub, protocols, _1$$4, _2$$4; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&protocol_sub); - ZVAL_UNDEF(&protocols); - ZVAL_UNDEF(&_1$$4); - ZVAL_UNDEF(&_2$$4); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(0, 1) - Z_PARAM_OPTIONAL - Z_PARAM_ZVAL(protocol) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 0, 1, &protocol); - if (!protocol) { - protocol = &protocol_sub; - ZEPHIR_INIT_VAR(protocol); - ZVAL_STRING(protocol, ""); - } - - - ZEPHIR_INIT_VAR(&protocols); - zephir_create_array(&protocols, 4, 0); - add_assoc_long_ex(&protocols, SL("1.0"), 1); - add_assoc_long_ex(&protocols, SL("1.1"), 1); - add_assoc_long_ex(&protocols, SL("2.0"), 1); - add_assoc_long_ex(&protocols, SL("3.0"), 1); - _0 = ZEPHIR_IS_EMPTY(protocol); - if (!(_0)) { - _0 = Z_TYPE_P(protocol) != IS_STRING; - } - if (UNEXPECTED(_0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Invalid protocol value", "phalcon/Http/Message/AbstractMessage.zep", 534); - return; - } - if (UNEXPECTED(!(zephir_array_isset(&protocols, protocol)))) { - ZEPHIR_INIT_VAR(&_1$$4); - object_init_ex(&_1$$4, phalcon_http_message_exception_invalidargumentexception_ce); - ZEPHIR_INIT_VAR(&_2$$4); - ZEPHIR_CONCAT_SV(&_2$$4, "Unsupported protocol ", protocol); - ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 40, &_2$$4); - zephir_check_call_status(); - zephir_throw_exception_debug(&_1$$4, "phalcon/Http/Message/AbstractMessage.zep", 540); - ZEPHIR_MM_RESTORE(); - return; - } - RETVAL_ZVAL(protocol, 1, 0); - RETURN_MM(); -} - - - - -#ifdef HAVE_CONFIG_H -#endif - - - - - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_AbstractRequest) -{ - ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Http\\Message, AbstractRequest, phalcon, http_message_abstractrequest, phalcon_http_message_abstractmessage_ce, phalcon_http_message_abstractrequest_method_entry, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); - - zend_declare_property_string(phalcon_http_message_abstractrequest_ce, SL("method"), "GET", ZEND_ACC_PROTECTED); - zend_declare_property_null(phalcon_http_message_abstractrequest_ce, SL("requestTarget"), ZEND_ACC_PROTECTED); - zend_declare_property_null(phalcon_http_message_abstractrequest_ce, SL("uri"), ZEND_ACC_PROTECTED); - zend_class_implements(phalcon_http_message_abstractrequest_ce, 1, phalcon_http_message_requestmethodinterface_ce); - return SUCCESS; -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractRequest, getMethod) -{ - zval *this_ptr = getThis(); - - - - RETURN_MEMBER(getThis(), "method"); -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractRequest, getUri) -{ - zval *this_ptr = getThis(); - - - - RETURN_MEMBER(getThis(), "uri"); -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractRequest, getRequestTarget) -{ - zval requestTarget, _0, _1$$3, _2$$3, _3$$3, _4$$4, _5$$4, _6$$4; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&requestTarget); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1$$3); - ZVAL_UNDEF(&_2$$3); - ZVAL_UNDEF(&_3$$3); - ZVAL_UNDEF(&_4$$4); - ZVAL_UNDEF(&_5$$4); - ZVAL_UNDEF(&_6$$4); - - - ZEPHIR_MM_GROW(); - - zephir_read_property(&_0, this_ptr, ZEND_STRL("requestTarget"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CPY_WRT(&requestTarget, &_0); - if (UNEXPECTED(Z_TYPE_P(&requestTarget) == IS_NULL)) { - zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("uri"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&requestTarget, &_1$$3, "getpath", NULL, 0); - zephir_check_call_status(); - zephir_read_property(&_2$$3, this_ptr, ZEND_STRL("uri"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_3$$3, &_2$$3, "getquery", NULL, 0); - zephir_check_call_status(); - if (UNEXPECTED(!(ZEPHIR_IS_EMPTY(&_3$$3)))) { - zephir_read_property(&_4$$4, this_ptr, ZEND_STRL("uri"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_5$$4, &_4$$4, "getquery", NULL, 0); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_6$$4); - ZEPHIR_CONCAT_SV(&_6$$4, "?", &_5$$4); - zephir_concat_self(&requestTarget, &_6$$4); - } - if (UNEXPECTED(ZEPHIR_IS_EMPTY(&requestTarget))) { - ZEPHIR_INIT_NVAR(&requestTarget); - ZVAL_STRING(&requestTarget, "/"); - } - } - RETURN_CCTOR(&requestTarget); -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractRequest, withMethod) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *method, method_sub, _0; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&method_sub); - ZVAL_UNDEF(&_0); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(method) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &method); - - - ZEPHIR_CALL_METHOD(NULL, this_ptr, "processmethod", NULL, 115, method); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, "method"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "cloneinstance", NULL, 21, method, &_0); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractRequest, withRequestTarget) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *requestTarget, requestTarget_sub, _0, _1, _2, _3, _4; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&requestTarget_sub); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_3); - ZVAL_UNDEF(&_4); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(requestTarget) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &requestTarget); - - - ZEPHIR_INIT_VAR(&_0); - ZEPHIR_INIT_VAR(&_1); - ZVAL_STRING(&_1, "/\\s/"); - ZEPHIR_INIT_VAR(&_2); - ZEPHIR_INIT_VAR(&_3); - ZVAL_STRING(&_3, "/\\s/"); - zephir_preg_match(&_2, &_3, requestTarget, &_0, 0, 0 , 0 ); - if (UNEXPECTED(zephir_is_true(&_2))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Invalid request target: cannot contain whitespace", "phalcon/Http/Message/AbstractRequest.zep", 131); - return; - } - ZEPHIR_INIT_VAR(&_4); - ZVAL_STRING(&_4, "requestTarget"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "cloneinstance", NULL, 21, requestTarget, &_4); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractRequest, withUri) -{ - double _0; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *uri, uri_sub, *preserveHost = NULL, preserveHost_sub, __$false, headers, newInstance, _1, _2, _3, _4$$3; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&uri_sub); - ZVAL_UNDEF(&preserveHost_sub); - ZVAL_BOOL(&__$false, 0); - ZVAL_UNDEF(&headers); - ZVAL_UNDEF(&newInstance); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_3); - ZVAL_UNDEF(&_4$$3); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(uri, zephir_get_internal_ce(SL("psr\\http\\message\\uriinterface"))) - Z_PARAM_OPTIONAL - Z_PARAM_ZVAL(preserveHost) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 1, &uri, &preserveHost); - if (!preserveHost) { - preserveHost = &preserveHost_sub; - ZEPHIR_CPY_WRT(preserveHost, &__$false); - } else { - ZEPHIR_SEPARATE_PARAM(preserveHost); - } - - - _0 = zephir_get_boolval(preserveHost); - ZEPHIR_INIT_NVAR(preserveHost); - ZVAL_BOOL(preserveHost, _0); - zephir_read_property(&_1, this_ptr, ZEND_STRL("headers"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_INIT_VAR(&_2); - if (zephir_clone(&_2, &_1) == FAILURE) { - RETURN_MM(); - } - ZEPHIR_CPY_WRT(&headers, &_2); - ZEPHIR_INIT_VAR(&_3); - ZVAL_STRING(&_3, "uri"); - ZEPHIR_CALL_METHOD(&newInstance, this_ptr, "cloneinstance", NULL, 21, uri, &_3); - zephir_check_call_status(); - if (UNEXPECTED(!zephir_is_true(preserveHost))) { - ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "checkheaderhost", NULL, 45, &headers); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(&headers, &_4$$3); - zephir_update_property_zval(&newInstance, ZEND_STRL("headers"), &headers); - } - RETURN_CCTOR(&newInstance); -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractRequest, processMethod) -{ - zend_bool _0, _1; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *method = NULL, method_sub, methods, _2$$3, _3$$3; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&method_sub); - ZVAL_UNDEF(&methods); - ZVAL_UNDEF(&_2$$3); - ZVAL_UNDEF(&_3$$3); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(0, 1) - Z_PARAM_OPTIONAL - Z_PARAM_ZVAL(method) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 0, 1, &method); - if (!method) { - method = &method_sub; - ZEPHIR_INIT_VAR(method); - ZVAL_STRING(method, ""); - } - - - ZEPHIR_INIT_VAR(&methods); - zephir_create_array(&methods, 10, 0); - add_assoc_long_ex(&methods, SL("CONNECT"), 1); - add_assoc_long_ex(&methods, SL("DELETE"), 1); - add_assoc_long_ex(&methods, SL("GET"), 1); - add_assoc_long_ex(&methods, SL("HEAD"), 1); - add_assoc_long_ex(&methods, SL("OPTIONS"), 1); - add_assoc_long_ex(&methods, SL("PATCH"), 1); - add_assoc_long_ex(&methods, SL("POST"), 1); - add_assoc_long_ex(&methods, SL("PURGE"), 1); - add_assoc_long_ex(&methods, SL("PUT"), 1); - add_assoc_long_ex(&methods, SL("TRACE"), 1); - _0 = !(ZEPHIR_IS_EMPTY(method)); - if (_0) { - _0 = Z_TYPE_P(method) == IS_STRING; - } - _1 = _0; - if (_1) { - _1 = zephir_array_isset(&methods, method); - } - if (UNEXPECTED(!(_1))) { - ZEPHIR_INIT_VAR(&_2$$3); - object_init_ex(&_2$$3, phalcon_http_message_exception_invalidargumentexception_ce); - ZEPHIR_INIT_VAR(&_3$$3); - ZEPHIR_CONCAT_SV(&_3$$3, "Invalid or unsupported method ", method); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 40, &_3$$3); - zephir_check_call_status(); - zephir_throw_exception_debug(&_2$$3, "phalcon/Http/Message/AbstractRequest.zep", 216); - ZEPHIR_MM_RESTORE(); - return; - } - RETVAL_ZVAL(method, 1, 0); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_AbstractRequest, processUri) -{ - zend_bool _0; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *uri, uri_sub; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&uri_sub); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(uri) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &uri); - - - _0 = Z_TYPE_P(uri) == IS_OBJECT; - if (_0) { - _0 = zephir_is_instance_of(uri, SL("Psr\\Http\\Message\\UriInterface")); - } - if (UNEXPECTED(_0)) { - RETVAL_ZVAL(uri, 1, 0); - RETURN_MM(); - } - if (EXPECTED(Z_TYPE_P(uri) == IS_STRING)) { - object_init_ex(return_value, phalcon_http_message_uri_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 116, uri); - zephir_check_call_status(); - RETURN_MM(); - } - if (Z_TYPE_P(uri) == IS_NULL) { - object_init_ex(return_value, phalcon_http_message_uri_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 116); - zephir_check_call_status(); - RETURN_MM(); - } - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Invalid uri passed as a parameter", "phalcon/Http/Message/AbstractRequest.zep", 245); - return; -} - - - - -#ifdef HAVE_CONFIG_H -#endif - - - - - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_Request) -{ - ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Http\\Message, Request, phalcon, http_message_request, phalcon_http_message_abstractrequest_ce, phalcon_http_message_request_method_entry, ZEND_ACC_FINAL_CLASS); - - zend_class_implements(phalcon_http_message_request_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\message\\requestinterface"))); - return SUCCESS; -} - -static PHP_METHOD(Phalcon_Http_Message_Request, __construct) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *method_param = NULL, *uri = NULL, uri_sub, *body = NULL, body_sub, *headers = NULL, headers_sub, __$null, _0, _1, _2, _3, _4, _5; - zval method; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&method); - ZVAL_UNDEF(&uri_sub); - ZVAL_UNDEF(&body_sub); - ZVAL_UNDEF(&headers_sub); - ZVAL_NULL(&__$null); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_3); - ZVAL_UNDEF(&_4); - ZVAL_UNDEF(&_5); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(0, 4) - Z_PARAM_OPTIONAL - Z_PARAM_STR(method) - Z_PARAM_ZVAL_OR_NULL(uri) - Z_PARAM_ZVAL(body) - Z_PARAM_ZVAL(headers) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 0, 4, &method_param, &uri, &body, &headers); - if (!method_param) { - ZEPHIR_INIT_VAR(&method); - ZVAL_STRING(&method, "GET"); - } else { - zephir_get_strval(&method, method_param); - } - if (!uri) { - uri = &uri_sub; - uri = &__$null; - } - if (!body) { - body = &body_sub; - ZEPHIR_INIT_VAR(body); - ZVAL_STRING(body, "php://memory"); - } else { - ZEPHIR_SEPARATE_PARAM(body); - } - if (!headers) { - headers = &headers_sub; - ZEPHIR_INIT_VAR(headers); - array_init(headers); - } - - - ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, "php://input"); - if (UNEXPECTED(ZEPHIR_IS_IDENTICAL(&_0, body))) { - ZEPHIR_INIT_NVAR(body); - object_init_ex(body, phalcon_http_message_stream_input_ce); - ZEPHIR_CALL_METHOD(NULL, body, "__construct", NULL, 358); - zephir_check_call_status(); - } - ZEPHIR_CALL_METHOD(&_1, this_ptr, "processuri", NULL, 359, uri); - zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("uri"), &_1); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "processheaders", NULL, 360, headers); - zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("headers"), &_2); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "processmethod", NULL, 115, &method); - zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("method"), &_3); - ZEPHIR_INIT_VAR(&_5); - ZVAL_STRING(&_5, "w+b"); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "processbody", NULL, 37, body, &_5); - zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("body"), &_4); - ZEPHIR_MM_RESTORE(); -} - - - - -#ifdef HAVE_CONFIG_H -#endif - - - - - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_RequestFactory) -{ - ZEPHIR_REGISTER_CLASS(Phalcon\\Http\\Message, RequestFactory, phalcon, http_message_requestfactory, phalcon_http_message_requestfactory_method_entry, ZEND_ACC_FINAL_CLASS); - - zend_class_implements(phalcon_http_message_requestfactory_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\message\\requestfactoryinterface"))); - return SUCCESS; -} - -static PHP_METHOD(Phalcon_Http_Message_RequestFactory, createRequest) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *method_param = NULL, *uri, uri_sub; - zval method; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&method); - ZVAL_UNDEF(&uri_sub); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_STR(method) - Z_PARAM_ZVAL(uri) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 2, 0, &method_param, &uri); - if (UNEXPECTED(Z_TYPE_P(method_param) != IS_STRING && Z_TYPE_P(method_param) != IS_NULL)) { - zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'method' must be of the type string")); - RETURN_MM_NULL(); - } - if (EXPECTED(Z_TYPE_P(method_param) == IS_STRING)) { - zephir_get_strval(&method, method_param); - } else { - ZEPHIR_INIT_VAR(&method); - } - - - object_init_ex(return_value, phalcon_http_message_request_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 361, &method, uri); - zephir_check_call_status(); - RETURN_MM(); -} - - - - -#ifdef HAVE_CONFIG_H -#endif - - - - - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_RequestMethodInterface) -{ - ZEPHIR_REGISTER_INTERFACE(Phalcon\\Http\\Message, RequestMethodInterface, phalcon, http_message_requestmethodinterface, NULL); - - zephir_declare_class_constant_string(phalcon_http_message_requestmethodinterface_ce, SL("METHOD_CONNECT"), "CONNECT"); - - zephir_declare_class_constant_string(phalcon_http_message_requestmethodinterface_ce, SL("METHOD_DELETE"), "DELETE"); - - zephir_declare_class_constant_string(phalcon_http_message_requestmethodinterface_ce, SL("METHOD_GET"), "GET"); - - zephir_declare_class_constant_string(phalcon_http_message_requestmethodinterface_ce, SL("METHOD_HEAD"), "HEAD"); - - zephir_declare_class_constant_string(phalcon_http_message_requestmethodinterface_ce, SL("METHOD_OPTIONS"), "OPTIONS"); - - zephir_declare_class_constant_string(phalcon_http_message_requestmethodinterface_ce, SL("METHOD_PATCH"), "PATCH"); - - zephir_declare_class_constant_string(phalcon_http_message_requestmethodinterface_ce, SL("METHOD_POST"), "POST"); - - zephir_declare_class_constant_string(phalcon_http_message_requestmethodinterface_ce, SL("METHOD_PURGE"), "PURGE"); - - zephir_declare_class_constant_string(phalcon_http_message_requestmethodinterface_ce, SL("METHOD_PUT"), "PUT"); - - zephir_declare_class_constant_string(phalcon_http_message_requestmethodinterface_ce, SL("METHOD_TRACE"), "TRACE"); - - return SUCCESS; -} - - - - -#ifdef HAVE_CONFIG_H -#endif - - - - - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_Response) -{ - ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Http\\Message, Response, phalcon, http_message_response, phalcon_http_message_abstractmessage_ce, phalcon_http_message_response_method_entry, ZEND_ACC_FINAL_CLASS); - - zend_declare_property_string(phalcon_http_message_response_ce, SL("reasonPhrase"), "", ZEND_ACC_PROTECTED); - zend_declare_property_long(phalcon_http_message_response_ce, SL("statusCode"), 200, ZEND_ACC_PROTECTED); - zend_class_implements(phalcon_http_message_response_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\message\\responseinterface"))); - zend_class_implements(phalcon_http_message_response_ce, 1, phalcon_http_message_responsestatuscodeinterface_ce); - return SUCCESS; -} - -static PHP_METHOD(Phalcon_Http_Message_Response, getReasonPhrase) -{ - zval *this_ptr = getThis(); - - - - RETURN_MEMBER(getThis(), "reasonPhrase"); -} - -static PHP_METHOD(Phalcon_Http_Message_Response, getStatusCode) -{ - zval *this_ptr = getThis(); - - - - RETURN_MEMBER(getThis(), "statusCode"); -} - -static PHP_METHOD(Phalcon_Http_Message_Response, __construct) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval headers; - zend_long code, ZEPHIR_LAST_CALL_STATUS; - zval *body = NULL, body_sub, *code_param = NULL, *headers_param = NULL, _0, _1, _2, _3; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&body_sub); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_3); - ZVAL_UNDEF(&headers); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(0, 3) - Z_PARAM_OPTIONAL - Z_PARAM_ZVAL(body) - Z_PARAM_LONG(code) - Z_PARAM_ARRAY(headers) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 0, 3, &body, &code_param, &headers_param); - if (!body) { - body = &body_sub; - ZEPHIR_INIT_VAR(body); - ZVAL_STRING(body, "php://memory"); - } - if (!code_param) { - code = 200; - } else { - code = zephir_get_intval(code_param); - } - if (!headers_param) { - ZEPHIR_INIT_VAR(&headers); - array_init(&headers); - } else { - zephir_get_arrval(&headers, headers_param); - } - - - ZVAL_LONG(&_0, code); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "processcode", NULL, 362, &_0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "processheaders", NULL, 360, &headers); - zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("headers"), &_1); - ZEPHIR_INIT_VAR(&_3); - ZVAL_STRING(&_3, "w+b"); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "processbody", NULL, 37, body, &_3); - zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("body"), &_2); - ZEPHIR_MM_RESTORE(); -} - -static PHP_METHOD(Phalcon_Http_Message_Response, withStatus) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *code, code_sub, *reasonPhrase = NULL, reasonPhrase_sub, newInstance; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&code_sub); - ZVAL_UNDEF(&reasonPhrase_sub); - ZVAL_UNDEF(&newInstance); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_ZVAL(code) - Z_PARAM_OPTIONAL - Z_PARAM_ZVAL(reasonPhrase) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 1, &code, &reasonPhrase); - if (!reasonPhrase) { - reasonPhrase = &reasonPhrase_sub; - ZEPHIR_INIT_VAR(reasonPhrase); - ZVAL_STRING(reasonPhrase, ""); - } - - - ZEPHIR_INIT_VAR(&newInstance); - if (zephir_clone(&newInstance, this_ptr) == FAILURE) { - RETURN_MM(); - } - ZEPHIR_CALL_METHOD(NULL, &newInstance, "processcode", NULL, 0, code, reasonPhrase); - zephir_check_call_status(); - RETURN_CCTOR(&newInstance); -} - -static PHP_METHOD(Phalcon_Http_Message_Response, getPhrases) -{ - zval *this_ptr = getThis(); - - - - zephir_create_array(return_value, 89, 0); - add_index_stringl(return_value, 100, SL("Continue")); - add_index_stringl(return_value, 101, SL("Switching Protocols")); - add_index_stringl(return_value, 102, SL("Processing")); - add_index_stringl(return_value, 103, SL("Early Hints")); - add_index_stringl(return_value, 200, SL("OK")); - add_index_stringl(return_value, 201, SL("Created")); - add_index_stringl(return_value, 202, SL("Accepted")); - add_index_stringl(return_value, 203, SL("Non-Authoritative Information")); - add_index_stringl(return_value, 204, SL("No Content")); - add_index_stringl(return_value, 205, SL("Reset Content")); - add_index_stringl(return_value, 206, SL("Partial Content")); - add_index_stringl(return_value, 207, SL("Multi-status")); - add_index_stringl(return_value, 208, SL("Already Reported")); - add_index_stringl(return_value, 226, SL("IM Used")); - add_index_stringl(return_value, 300, SL("Multiple Choices")); - add_index_stringl(return_value, 301, SL("Moved Permanently")); - add_index_stringl(return_value, 302, SL("Found")); - add_index_stringl(return_value, 303, SL("See Other")); - add_index_stringl(return_value, 304, SL("Not Modified")); - add_index_stringl(return_value, 305, SL("Use Proxy")); - add_index_stringl(return_value, 306, SL("Switch Proxy")); - add_index_stringl(return_value, 307, SL("Temporary Redirect")); - add_index_stringl(return_value, 308, SL("Permanent Redirect")); - add_index_stringl(return_value, 400, SL("Bad Request")); - add_index_stringl(return_value, 401, SL("Unauthorized")); - add_index_stringl(return_value, 402, SL("Payment Required")); - add_index_stringl(return_value, 403, SL("Forbidden")); - add_index_stringl(return_value, 404, SL("Not Found")); - add_index_stringl(return_value, 405, SL("Method Not Allowed")); - add_index_stringl(return_value, 406, SL("Not Acceptable")); - add_index_stringl(return_value, 407, SL("Proxy Authentication Required")); - add_index_stringl(return_value, 408, SL("Request Time-out")); - add_index_stringl(return_value, 409, SL("Conflict")); - add_index_stringl(return_value, 410, SL("Gone")); - add_index_stringl(return_value, 411, SL("Length Required")); - add_index_stringl(return_value, 412, SL("Precondition Failed")); - add_index_stringl(return_value, 413, SL("Request Entity Too Large")); - add_index_stringl(return_value, 414, SL("Request-URI Too Large")); - add_index_stringl(return_value, 415, SL("Unsupported Media Type")); - add_index_stringl(return_value, 416, SL("Requested range not satisfiable")); - add_index_stringl(return_value, 417, SL("Expectation Failed")); - add_index_stringl(return_value, 418, SL("I'm a teapot")); - add_index_stringl(return_value, 421, SL("Misdirected Request")); - add_index_stringl(return_value, 422, SL("Unprocessable Entity")); - add_index_stringl(return_value, 423, SL("Locked")); - add_index_stringl(return_value, 424, SL("Failed Dependency")); - add_index_stringl(return_value, 425, SL("Unordered Collection")); - add_index_stringl(return_value, 426, SL("Upgrade Required")); - add_index_stringl(return_value, 428, SL("Precondition Required")); - add_index_stringl(return_value, 429, SL("Too Many Requests")); - add_index_stringl(return_value, 431, SL("Request Header Fields Too Large")); - add_index_stringl(return_value, 451, SL("Unavailable For Legal Reasons")); - add_index_stringl(return_value, 500, SL("Internal Server Error")); - add_index_stringl(return_value, 501, SL("Not Implemented")); - add_index_stringl(return_value, 502, SL("Bad Gateway")); - add_index_stringl(return_value, 503, SL("Service Unavailable")); - add_index_stringl(return_value, 504, SL("Gateway Time-out")); - add_index_stringl(return_value, 505, SL("HTTP Version not supported")); - add_index_stringl(return_value, 506, SL("Variant Also Negotiates")); - add_index_stringl(return_value, 507, SL("Insufficient Storage")); - add_index_stringl(return_value, 508, SL("Loop Detected")); - add_index_stringl(return_value, 510, SL("Not Extended")); - add_index_stringl(return_value, 511, SL("Network Authentication Required")); - add_index_stringl(return_value, 218, SL("This is fine")); - add_index_stringl(return_value, 419, SL("Page Expired")); - add_index_stringl(return_value, 420, SL("Method Failure")); - add_index_stringl(return_value, 440, SL("Login Time-out")); - add_index_stringl(return_value, 444, SL("No Response")); - add_index_stringl(return_value, 449, SL("Retry With")); - add_index_stringl(return_value, 450, SL("Blocked by Windows Parental Controls (Microsoft)")); - add_index_stringl(return_value, 494, SL("Request header too large")); - add_index_stringl(return_value, 495, SL("SSL Certificate Error")); - add_index_stringl(return_value, 496, SL("SSL Certificate Required")); - add_index_stringl(return_value, 497, SL("HTTP Request Sent to HTTPS Port")); - add_index_stringl(return_value, 498, SL("Invalid Token (Esri)")); - add_index_stringl(return_value, 499, SL("Client Closed Request")); - add_index_stringl(return_value, 509, SL("Bandwidth Limit Exceeded")); - add_index_stringl(return_value, 520, SL("Unknown Error")); - add_index_stringl(return_value, 521, SL("Web Server Is Down")); - add_index_stringl(return_value, 522, SL("Connection Timed Out")); - add_index_stringl(return_value, 523, SL("Origin Is Unreachable")); - add_index_stringl(return_value, 524, SL("A Timeout Occurred")); - add_index_stringl(return_value, 525, SL("SSL Handshake Failed")); - add_index_stringl(return_value, 526, SL("Invalid SSL Certificate")); - add_index_stringl(return_value, 527, SL("Railgun Error")); - add_index_stringl(return_value, 530, SL("Origin DNS Error")); - add_index_stringl(return_value, 598, SL("Network read timeout error")); - add_index_stringl(return_value, 599, SL("Network Connect Timeout Error")); - return; -} - -static PHP_METHOD(Phalcon_Http_Message_Response, processCode) -{ - zend_bool _2; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS, _0; - zval *code = NULL, code_sub, *phrase = NULL, phrase_sub, phrases, _1; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&code_sub); - ZVAL_UNDEF(&phrase_sub); - ZVAL_UNDEF(&phrases); - ZVAL_UNDEF(&_1); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_ZVAL(code) - Z_PARAM_OPTIONAL - Z_PARAM_ZVAL(phrase) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 1, &code, &phrase); - ZEPHIR_SEPARATE_PARAM(code); - if (!phrase) { - phrase = &phrase_sub; - ZEPHIR_INIT_VAR(phrase); - ZVAL_STRING(phrase, ""); - } else { - ZEPHIR_SEPARATE_PARAM(phrase); - } - - - ZEPHIR_CALL_METHOD(&phrases, this_ptr, "getphrases", NULL, 363); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkcodetype", NULL, 364, code); - zephir_check_call_status(); - _0 = zephir_get_intval(code); - ZEPHIR_INIT_NVAR(code); - ZVAL_LONG(code, _0); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkcodevalue", NULL, 365, code); - zephir_check_call_status(); - if (UNEXPECTED(Z_TYPE_P(phrase) != IS_STRING)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Invalid response reason", "phalcon/Http/Message/Response.zep", 225); - return; - } - ZEPHIR_INIT_VAR(&_1); - ZVAL_STRING(&_1, ""); - _2 = ZEPHIR_IS_IDENTICAL(&_1, phrase); - if (_2) { - _2 = zephir_array_isset(&phrases, code); - } - if (EXPECTED(_2)) { - ZEPHIR_OBS_NVAR(phrase); - zephir_array_fetch(phrase, &phrases, code, PH_NOISY, "phalcon/Http/Message/Response.zep", 229); - } - zephir_update_property_zval(this_ptr, ZEND_STRL("statusCode"), code); - zephir_update_property_zval(this_ptr, ZEND_STRL("reasonPhrase"), phrase); - ZEPHIR_MM_RESTORE(); -} - -static PHP_METHOD(Phalcon_Http_Message_Response, checkCodeType) -{ - zend_bool _0; - zval *code, code_sub; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&code_sub); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(code) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - zephir_fetch_params_without_memory_grow(1, 0, &code); - - - _0 = Z_TYPE_P(code) != IS_LONG; - if (_0) { - _0 = Z_TYPE_P(code) != IS_STRING; - } - if (UNEXPECTED(_0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_http_message_exception_invalidargumentexception_ce, "Invalid status code; it must be an integer or string", "phalcon/Http/Message/Response.zep", 246); - return; - } -} - -static PHP_METHOD(Phalcon_Http_Message_Response, checkCodeValue) -{ - zval _6$$3; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *code_param = NULL, _0, _1, _2, _3, _4$$3, _5$$3; - zend_long code, ZEPHIR_LAST_CALL_STATUS; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_3); - ZVAL_UNDEF(&_4$$3); - ZVAL_UNDEF(&_5$$3); - ZVAL_UNDEF(&_6$$3); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_LONG(code) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &code_param); - code = zephir_get_intval(code_param); - - - ZVAL_LONG(&_1, code); - ZVAL_LONG(&_2, 100); - ZVAL_LONG(&_3, 599); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "isbetween", NULL, 366, &_1, &_2, &_3); - zephir_check_call_status(); - if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - ZEPHIR_INIT_VAR(&_4$$3); - object_init_ex(&_4$$3, phalcon_http_message_exception_invalidargumentexception_ce); - ZEPHIR_INIT_VAR(&_5$$3); - ZVAL_LONG(&_5$$3, code); - ZEPHIR_INIT_VAR(&_6$$3); - ZEPHIR_CONCAT_SVS(&_6$$3, "Invalid status code '", &_5$$3, "', (allowed values 100-599)"); - ZEPHIR_CALL_METHOD(NULL, &_4$$3, "__construct", NULL, 40, &_6$$3); - zephir_check_call_status(); - zephir_throw_exception_debug(&_4$$3, "phalcon/Http/Message/Response.zep", 260); - ZEPHIR_MM_RESTORE(); - return; - } - ZEPHIR_MM_RESTORE(); -} - -static PHP_METHOD(Phalcon_Http_Message_Response, isBetween) -{ - zend_bool _0; - zval *value_param = NULL, *from_param = NULL, *to_param = NULL; - zend_long value, from, to; - zval *this_ptr = getThis(); - -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(3, 3) - Z_PARAM_LONG(value) - Z_PARAM_LONG(from) - Z_PARAM_LONG(to) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - zephir_fetch_params_without_memory_grow(3, 0, &value_param, &from_param, &to_param); - value = zephir_get_intval(value_param); - from = zephir_get_intval(from_param); - to = zephir_get_intval(to_param); - - - _0 = value >= from; - if (_0) { - _0 = value <= to; - } - RETURN_BOOL(_0); -} - - - - -#ifdef HAVE_CONFIG_H -#endif - - - - - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_ResponseFactory) -{ - ZEPHIR_REGISTER_CLASS(Phalcon\\Http\\Message, ResponseFactory, phalcon, http_message_responsefactory, phalcon_http_message_responsefactory_method_entry, ZEND_ACC_FINAL_CLASS); - - zend_class_implements(phalcon_http_message_responsefactory_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\message\\responsefactoryinterface"))); - return SUCCESS; -} - -static PHP_METHOD(Phalcon_Http_Message_ResponseFactory, createResponse) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval reasonPhrase; - zval *code_param = NULL, *reasonPhrase_param = NULL, _0, _1; - zend_long code, ZEPHIR_LAST_CALL_STATUS; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&reasonPhrase); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(0, 2) - Z_PARAM_OPTIONAL - Z_PARAM_LONG(code) - Z_PARAM_STR(reasonPhrase) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 0, 2, &code_param, &reasonPhrase_param); - if (!code_param) { - code = 200; - } else { - code = zephir_get_intval(code_param); - } - if (!reasonPhrase_param) { - ZEPHIR_INIT_VAR(&reasonPhrase); - ZVAL_STRING(&reasonPhrase, ""); - } else { - zephir_get_strval(&reasonPhrase, reasonPhrase_param); - } - - - ZEPHIR_INIT_VAR(&_0); - object_init_ex(&_0, phalcon_http_message_response_ce); - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 367); - zephir_check_call_status(); - ZVAL_LONG(&_1, code); - ZEPHIR_RETURN_CALL_METHOD(&_0, "withstatus", NULL, 368, &_1, &reasonPhrase); - zephir_check_call_status(); - RETURN_MM(); -} - - - - -#ifdef HAVE_CONFIG_H -#endif - - - - - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_ResponseStatusCodeInterface) -{ - ZEPHIR_REGISTER_INTERFACE(Phalcon\\Http\\Message, ResponseStatusCodeInterface, phalcon, http_message_responsestatuscodeinterface, NULL); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_CONTINUE"), 100); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_SWITCHING_PROTOCOLS"), 101); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_PROCESSING"), 102); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_EARLY_HINTS"), 103); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_OK"), 200); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_CREATED"), 201); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_ACCEPTED"), 202); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_NON_AUTHORITATIVE_INFORMATION"), 203); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_NO_CONTENT"), 204); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_RESET_CONTENT"), 205); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_PARTIAL_CONTENT"), 206); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_MULTI_STATUS"), 207); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_ALREADY_REPORTED"), 208); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_IM_USED"), 226); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_MULTIPLE_CHOICES"), 300); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_MOVED_PERMANENTLY"), 301); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_FOUND"), 302); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_SEE_OTHER"), 303); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_NOT_MODIFIED"), 304); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_USE_PROXY"), 305); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_RESERVED"), 306); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_TEMPORARY_REDIRECT"), 307); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_PERMANENT_REDIRECT"), 308); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_BAD_REQUEST"), 400); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_UNAUTHORIZED"), 401); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_PAYMENT_REQUIRED"), 402); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_FORBIDDEN"), 403); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_NOT_FOUND"), 404); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_METHOD_NOT_ALLOWED"), 405); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_NOT_ACCEPTABLE"), 406); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_PROXY_AUTHENTICATION_REQUIRED"), 407); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_REQUEST_TIMEOUT"), 408); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_CONFLICT"), 409); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_GONE"), 410); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_LENGTH_REQUIRED"), 411); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_PRECONDITION_FAILED"), 412); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_PAYLOAD_TOO_LARGE"), 413); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_URI_TOO_LONG"), 414); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_UNSUPPORTED_MEDIA_TYPE"), 415); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_RANGE_NOT_SATISFIABLE"), 416); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_EXPECTATION_FAILED"), 417); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_IM_A_TEAPOT"), 418); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_MISDIRECTED_REQUEST"), 421); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_UNPROCESSABLE_ENTITY"), 422); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_LOCKED"), 423); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_FAILED_DEPENDENCY"), 424); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_TOO_EARLY"), 425); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_UPGRADE_REQUIRED"), 426); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_PRECONDITION_REQUIRED"), 428); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_TOO_MANY_REQUESTS"), 429); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE"), 431); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_UNAVAILABLE_FOR_LEGAL_REASONS"), 451); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_INTERNAL_SERVER_ERROR"), 500); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_NOT_IMPLEMENTED"), 501); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_BAD_GATEWAY"), 502); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_SERVICE_UNAVAILABLE"), 503); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_GATEWAY_TIMEOUT"), 504); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_VERSION_NOT_SUPPORTED"), 505); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_VARIANT_ALSO_NEGOTIATES"), 506); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_INSUFFICIENT_STORAGE"), 507); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_LOOP_DETECTED"), 508); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_NOT_EXTENDED"), 510); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_NETWORK_AUTHENTICATION_REQUIRED"), 511); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_THIS_IS_FINE"), 218); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_PAGE_EXPIRED"), 419); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_METHOD_FAILURE"), 420); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_LOGIN_TIMEOUT"), 440); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_NO_RESPONSE"), 444); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_RETRY_WITH"), 449); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_BLOCKED_BY_WINDOWS_PARENTAL_CONTROLS"), 450); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_REQUEST_HEADER_TOO_LARGE"), 494); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_SSL_CERTIFICATE_ERROR"), 495); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_SSL_CERTIFICATE_REQUIRED"), 496); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_HTTP_REQUEST_SENT_TO_HTTPS_PORT"), 497); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_INVALID_TOKEN_ESRI"), 498); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_CLIENT_CLOSED_REQUEST"), 499); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_BANDWIDTH_LIMIT_EXCEEDED"), 509); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_UNKNOWN_ERROR"), 520); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_WEB_SERVER_IS_DOWN"), 521); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_CONNECTION_TIMEOUT"), 522); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_ORIGIN_IS_UNREACHABLE"), 523); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_TIMEOUT_OCCURRED"), 524); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_SSL_HANDSHAKE_FAILED"), 525); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_INVALID_SSL_CERTIFICATE"), 526); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_RAILGUN_ERROR"), 527); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_ORIGIN_DNS_ERROR"), 530); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_NETWORK_READ_TIMEOUT_ERROR"), 598); - - zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_NETWORK_CONNECT_TIMEOUT_ERROR"), 599); - - return SUCCESS; -} - - - - -#ifdef HAVE_CONFIG_H -#endif - - - - - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_ServerRequest) -{ - ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Http\\Message, ServerRequest, phalcon, http_message_serverrequest, phalcon_http_message_abstractrequest_ce, phalcon_http_message_serverrequest_method_entry, ZEND_ACC_FINAL_CLASS); - - zend_declare_property_null(phalcon_http_message_serverrequest_ce, SL("attributes"), ZEND_ACC_PROTECTED); - zend_declare_property_null(phalcon_http_message_serverrequest_ce, SL("cookieParams"), ZEND_ACC_PROTECTED); - zend_declare_property_null(phalcon_http_message_serverrequest_ce, SL("parsedBody"), ZEND_ACC_PROTECTED); - zend_declare_property_null(phalcon_http_message_serverrequest_ce, SL("queryParams"), ZEND_ACC_PROTECTED); - zend_declare_property_null(phalcon_http_message_serverrequest_ce, SL("serverParams"), ZEND_ACC_PROTECTED); - zend_declare_property_null(phalcon_http_message_serverrequest_ce, SL("uploadedFiles"), ZEND_ACC_PROTECTED); - phalcon_http_message_serverrequest_ce->create_object = zephir_init_properties_Phalcon_Http_Message_ServerRequest; - - zend_class_implements(phalcon_http_message_serverrequest_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\message\\serverrequestinterface"))); - return SUCCESS; -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, getCookieParams) -{ - zval *this_ptr = getThis(); - - - - RETURN_MEMBER(getThis(), "cookieParams"); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, getParsedBody) -{ - zval *this_ptr = getThis(); - - - - RETURN_MEMBER(getThis(), "parsedBody"); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, getQueryParams) -{ - zval *this_ptr = getThis(); - - - - RETURN_MEMBER(getThis(), "queryParams"); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, getServerParams) -{ - zval *this_ptr = getThis(); - - - - RETURN_MEMBER(getThis(), "serverParams"); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, getUploadedFiles) -{ - zval *this_ptr = getThis(); - - - - RETURN_MEMBER(getThis(), "uploadedFiles"); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, __construct) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval serverParams, cookies, queryParams, uploadFiles; - zval *method_param = NULL, *uri = NULL, uri_sub, *serverParams_param = NULL, *body = NULL, body_sub, *headers = NULL, headers_sub, *cookies_param = NULL, *queryParams_param = NULL, *uploadFiles_param = NULL, *parsedBody = NULL, parsedBody_sub, *protocol_param = NULL, __$null, _0, _1, _2, _3, _4, _5, _6; - zval method, protocol; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&method); - ZVAL_UNDEF(&protocol); - ZVAL_UNDEF(&uri_sub); - ZVAL_UNDEF(&body_sub); - ZVAL_UNDEF(&headers_sub); - ZVAL_UNDEF(&parsedBody_sub); - ZVAL_NULL(&__$null); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_3); - ZVAL_UNDEF(&_4); - ZVAL_UNDEF(&_5); - ZVAL_UNDEF(&_6); - ZVAL_UNDEF(&serverParams); - ZVAL_UNDEF(&cookies); - ZVAL_UNDEF(&queryParams); - ZVAL_UNDEF(&uploadFiles); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(0, 10) - Z_PARAM_OPTIONAL - Z_PARAM_STR(method) - Z_PARAM_ZVAL_OR_NULL(uri) - Z_PARAM_ARRAY(serverParams) - Z_PARAM_ZVAL(body) - Z_PARAM_ZVAL(headers) - Z_PARAM_ARRAY(cookies) - Z_PARAM_ARRAY(queryParams) - Z_PARAM_ARRAY(uploadFiles) - Z_PARAM_ZVAL_OR_NULL(parsedBody) - Z_PARAM_STR(protocol) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 0, 10, &method_param, &uri, &serverParams_param, &body, &headers, &cookies_param, &queryParams_param, &uploadFiles_param, &parsedBody, &protocol_param); - if (!method_param) { - ZEPHIR_INIT_VAR(&method); - ZVAL_STRING(&method, "GET"); - } else { - zephir_get_strval(&method, method_param); - } - if (!uri) { - uri = &uri_sub; - uri = &__$null; - } - if (!serverParams_param) { - ZEPHIR_INIT_VAR(&serverParams); - array_init(&serverParams); - } else { - zephir_get_arrval(&serverParams, serverParams_param); - } - if (!body) { - body = &body_sub; - ZEPHIR_INIT_VAR(body); - ZVAL_STRING(body, "php://input"); - } else { - ZEPHIR_SEPARATE_PARAM(body); - } - if (!headers) { - headers = &headers_sub; - ZEPHIR_INIT_VAR(headers); - array_init(headers); - } - if (!cookies_param) { - ZEPHIR_INIT_VAR(&cookies); - array_init(&cookies); - } else { - zephir_get_arrval(&cookies, cookies_param); - } - if (!queryParams_param) { - ZEPHIR_INIT_VAR(&queryParams); - array_init(&queryParams); - } else { - zephir_get_arrval(&queryParams, queryParams_param); - } - if (!uploadFiles_param) { - ZEPHIR_INIT_VAR(&uploadFiles); - array_init(&uploadFiles); - } else { - zephir_get_arrval(&uploadFiles, uploadFiles_param); - } - if (!parsedBody) { - parsedBody = &parsedBody_sub; - parsedBody = &__$null; - } - if (!protocol_param) { - ZEPHIR_INIT_VAR(&protocol); - ZVAL_STRING(&protocol, "1.1"); - } else { - zephir_get_strval(&protocol, protocol_param); - } - - - ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, "php://input"); - if (UNEXPECTED(ZEPHIR_IS_IDENTICAL(&_0, body))) { - ZEPHIR_INIT_NVAR(body); - object_init_ex(body, phalcon_http_message_stream_input_ce); - ZEPHIR_CALL_METHOD(NULL, body, "__construct", NULL, 358); - zephir_check_call_status(); - } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkuploadedfiles", NULL, 369, &uploadFiles); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "processprotocol", NULL, 38, &protocol); - zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("protocolVersion"), &_1); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "processmethod", NULL, 115, &method); - zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("method"), &_2); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "processheaders", NULL, 360, headers); - zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("headers"), &_3); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "processuri", NULL, 359, uri); - zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("uri"), &_4); - ZEPHIR_INIT_VAR(&_6); - ZVAL_STRING(&_6, "w+b"); - ZEPHIR_CALL_METHOD(&_5, this_ptr, "processbody", NULL, 37, body, &_6); - zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("body"), &_5); - zephir_update_property_zval(this_ptr, ZEND_STRL("uploadedFiles"), &uploadFiles); - zephir_update_property_zval(this_ptr, ZEND_STRL("parsedBody"), parsedBody); - zephir_update_property_zval(this_ptr, ZEND_STRL("serverParams"), &serverParams); - zephir_update_property_zval(this_ptr, ZEND_STRL("cookieParams"), &cookies); - zephir_update_property_zval(this_ptr, ZEND_STRL("queryParams"), &queryParams); - ZEPHIR_INIT_NVAR(&_6); - object_init_ex(&_6, phalcon_support_collection_ce); - ZEPHIR_CALL_METHOD(NULL, &_6, "__construct", NULL, 24); - zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("attributes"), &_6); - ZEPHIR_MM_RESTORE(); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, getAttribute) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *name, name_sub, *defaultValue = NULL, defaultValue_sub, __$null, _0; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&name_sub); - ZVAL_UNDEF(&defaultValue_sub); - ZVAL_NULL(&__$null); - ZVAL_UNDEF(&_0); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_ZVAL(name) - Z_PARAM_OPTIONAL - Z_PARAM_ZVAL_OR_NULL(defaultValue) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 1, &name, &defaultValue); - if (!defaultValue) { - defaultValue = &defaultValue_sub; - defaultValue = &__$null; - } - - - zephir_read_property(&_0, this_ptr, ZEND_STRL("attributes"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_METHOD(&_0, "get", NULL, 0, name, defaultValue); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, getAttributes) -{ - zval _0; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&_0); - - - ZEPHIR_MM_GROW(); - - zephir_read_property(&_0, this_ptr, ZEND_STRL("attributes"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_METHOD(&_0, "toarray", NULL, 0); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, withAttribute) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *name, name_sub, *value, value_sub, attributes, _0, _1, _2; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&name_sub); - ZVAL_UNDEF(&value_sub); - ZVAL_UNDEF(&attributes); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_ZVAL(name) - Z_PARAM_ZVAL(value) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 2, 0, &name, &value); - - - zephir_read_property(&_0, this_ptr, ZEND_STRL("attributes"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_INIT_VAR(&_1); - if (zephir_clone(&_1, &_0) == FAILURE) { - RETURN_MM(); - } - ZEPHIR_CPY_WRT(&attributes, &_1); - ZEPHIR_CALL_METHOD(NULL, &attributes, "set", NULL, 0, name, value); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_2); - ZVAL_STRING(&_2, "attributes"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "cloneinstance", NULL, 21, &attributes, &_2); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, withCookieParams) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *cookies_param = NULL, _0; - zval cookies; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&cookies); - ZVAL_UNDEF(&_0); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ARRAY(cookies) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &cookies_param); - zephir_get_arrval(&cookies, cookies_param); - - - ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, "cookieParams"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "cloneinstance", NULL, 21, &cookies, &_0); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, withParsedBody) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *data, data_sub, _0; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&data_sub); - ZVAL_UNDEF(&_0); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(data) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &data); - - - ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, "parsedBody"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "cloneinstance", NULL, 21, data, &_0); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, withQueryParams) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *query_param = NULL, _0; - zval query; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&query); - ZVAL_UNDEF(&_0); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ARRAY(query) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &query_param); - zephir_get_arrval(&query, query_param); - - - ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, "queryParams"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "cloneinstance", NULL, 21, &query, &_0); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, withUploadedFiles) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *uploadedFiles_param = NULL, _0; - zval uploadedFiles; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&uploadedFiles); - ZVAL_UNDEF(&_0); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ARRAY(uploadedFiles) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &uploadedFiles_param); - zephir_get_arrval(&uploadedFiles, uploadedFiles_param); - - - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkuploadedfiles", NULL, 369, &uploadedFiles); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, "uploadedFiles"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "cloneinstance", NULL, 21, &uploadedFiles, &_0); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, withoutAttribute) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *name, name_sub, attributes, _0, _1, _2; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&name_sub); - ZVAL_UNDEF(&attributes); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(name) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &name); - - - zephir_read_property(&_0, this_ptr, ZEND_STRL("attributes"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_INIT_VAR(&_1); - if (zephir_clone(&_1, &_0) == FAILURE) { - RETURN_MM(); - } - ZEPHIR_CPY_WRT(&attributes, &_1); - ZEPHIR_CALL_METHOD(NULL, &attributes, "remove", NULL, 0, name); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_2); - ZVAL_STRING(&_2, "attributes"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "cloneinstance", NULL, 21, &attributes, &_2); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, checkUploadedFiles) -{ - zend_bool _3$$5, _4$$9; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zephir_fcall_cache_entry *_2 = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *files_param = NULL, file, *_0, _1; - zval files; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&files); - ZVAL_UNDEF(&file); - ZVAL_UNDEF(&_1); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ARRAY(files) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &files_param); - zephir_get_arrval(&files, files_param); - - - zephir_is_iterable(&files, 0, "phalcon/Http/Message/ServerRequest.zep", 354); - if (Z_TYPE_P(&files) == IS_ARRAY) { - ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&files), _0) - { - ZEPHIR_INIT_NVAR(&file); - ZVAL_COPY(&file, _0); - if (UNEXPECTED(Z_TYPE_P(&file) == IS_ARRAY)) { - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkuploadedfiles", &_2, 369, &file); - zephir_check_call_status(); - } else { - _3$$5 = Z_TYPE_P(&file) == IS_OBJECT; - if (_3$$5) { - _3$$5 = zephir_is_instance_of(&file, SL("Psr\\Http\\Message\\UploadedFileInterface")); - } - if (UNEXPECTED(!(_3$$5))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Invalid uploaded file", "phalcon/Http/Message/ServerRequest.zep", 350); - return; - } - } - } ZEND_HASH_FOREACH_END(); - } else { - ZEPHIR_CALL_METHOD(NULL, &files, "rewind", NULL, 0); - zephir_check_call_status(); - while (1) { - ZEPHIR_CALL_METHOD(&_1, &files, "valid", NULL, 0); - zephir_check_call_status(); - if (!zend_is_true(&_1)) { - break; - } - ZEPHIR_CALL_METHOD(&file, &files, "current", NULL, 0); - zephir_check_call_status(); - if (UNEXPECTED(Z_TYPE_P(&file) == IS_ARRAY)) { - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkuploadedfiles", &_2, 369, &file); - zephir_check_call_status(); - } else { - _4$$9 = Z_TYPE_P(&file) == IS_OBJECT; - if (_4$$9) { - _4$$9 = zephir_is_instance_of(&file, SL("Psr\\Http\\Message\\UploadedFileInterface")); - } - if (UNEXPECTED(!(_4$$9))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Invalid uploaded file", "phalcon/Http/Message/ServerRequest.zep", 350); - return; - } - } - ZEPHIR_CALL_METHOD(NULL, &files, "next", NULL, 0); - zephir_check_call_status(); - } - } - ZEPHIR_INIT_NVAR(&file); - ZEPHIR_MM_RESTORE(); -} - -zend_object *zephir_init_properties_Phalcon_Http_Message_ServerRequest(zend_class_entry *class_type) -{ - zval _0, _2, _4, _6, _1$$3, _3$$4, _5$$5, _7$$6; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_4); - ZVAL_UNDEF(&_6); - ZVAL_UNDEF(&_1$$3); - ZVAL_UNDEF(&_3$$4); - ZVAL_UNDEF(&_5$$5); - ZVAL_UNDEF(&_7$$6); - - - ZEPHIR_MM_GROW(); - - { - zval local_this_ptr, *this_ptr = &local_this_ptr; - ZEPHIR_CREATE_OBJECT(this_ptr, class_type); - zephir_read_property_ex(&_0, this_ptr, ZEND_STRL("uploadedFiles"), PH_NOISY_CC | PH_READONLY); - if (Z_TYPE_P(&_0) == IS_NULL) { - ZEPHIR_INIT_VAR(&_1$$3); - array_init(&_1$$3); - zephir_update_property_zval_ex(this_ptr, ZEND_STRL("uploadedFiles"), &_1$$3); - } - zephir_read_property_ex(&_2, this_ptr, ZEND_STRL("serverParams"), PH_NOISY_CC | PH_READONLY); - if (Z_TYPE_P(&_2) == IS_NULL) { - ZEPHIR_INIT_VAR(&_3$$4); - array_init(&_3$$4); - zephir_update_property_zval_ex(this_ptr, ZEND_STRL("serverParams"), &_3$$4); - } - zephir_read_property_ex(&_4, this_ptr, ZEND_STRL("queryParams"), PH_NOISY_CC | PH_READONLY); - if (Z_TYPE_P(&_4) == IS_NULL) { - ZEPHIR_INIT_VAR(&_5$$5); - array_init(&_5$$5); - zephir_update_property_zval_ex(this_ptr, ZEND_STRL("queryParams"), &_5$$5); - } - zephir_read_property_ex(&_6, this_ptr, ZEND_STRL("cookieParams"), PH_NOISY_CC | PH_READONLY); - if (Z_TYPE_P(&_6) == IS_NULL) { - ZEPHIR_INIT_VAR(&_7$$6); - array_init(&_7$$6); - zephir_update_property_zval_ex(this_ptr, ZEND_STRL("cookieParams"), &_7$$6); - } - ZEPHIR_MM_RESTORE(); - return Z_OBJ_P(this_ptr); - } -} - - - - -#ifdef HAVE_CONFIG_H -#endif - - - - - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_ServerRequestFactory) -{ - ZEPHIR_REGISTER_CLASS(Phalcon\\Http\\Message, ServerRequestFactory, phalcon, http_message_serverrequestfactory, phalcon_http_message_serverrequestfactory_method_entry, 0); - - zend_class_implements(phalcon_http_message_serverrequestfactory_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\message\\serverrequestfactoryinterface"))); - zend_class_implements(phalcon_http_message_serverrequestfactory_ce, 1, phalcon_http_message_requestmethodinterface_ce); - return SUCCESS; -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, createServerRequest) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval serverParams; - zval *method_param = NULL, *uri, uri_sub, *serverParams_param = NULL; - zval method; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&method); - ZVAL_UNDEF(&uri_sub); - ZVAL_UNDEF(&serverParams); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(2, 3) - Z_PARAM_STR(method) - Z_PARAM_ZVAL(uri) - Z_PARAM_OPTIONAL - Z_PARAM_ARRAY(serverParams) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 2, 1, &method_param, &uri, &serverParams_param); - zephir_get_strval(&method, method_param); - if (!serverParams_param) { - ZEPHIR_INIT_VAR(&serverParams); - array_init(&serverParams); - } else { - zephir_get_arrval(&serverParams, serverParams_param); - } - - - object_init_ex(return_value, phalcon_http_message_serverrequest_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 370, &method, uri, &serverParams); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, load) -{ - zend_bool _7; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *server_param = NULL, *get_param = NULL, *post_param = NULL, *cookies_param = NULL, *files_param = NULL, _COOKIE, _FILES, _GET, _POST, _SERVER, cookiesCollection, filesCollection, headers, method, protocol, serverCollection, _0, _1, _2, _3, _4, _5, _6, _8, _11, _12, _13, _14, _9$$8, _10$$8; - zval server, get, post, cookies, files, globalCookies, globalFiles, globalGet, globalPost, globalServer; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&server); - ZVAL_UNDEF(&get); - ZVAL_UNDEF(&post); - ZVAL_UNDEF(&cookies); - ZVAL_UNDEF(&files); - ZVAL_UNDEF(&globalCookies); - ZVAL_UNDEF(&globalFiles); - ZVAL_UNDEF(&globalGet); - ZVAL_UNDEF(&globalPost); - ZVAL_UNDEF(&globalServer); - ZVAL_UNDEF(&_COOKIE); - ZVAL_UNDEF(&_FILES); - ZVAL_UNDEF(&_GET); - ZVAL_UNDEF(&_POST); - ZVAL_UNDEF(&_SERVER); - ZVAL_UNDEF(&cookiesCollection); - ZVAL_UNDEF(&filesCollection); - ZVAL_UNDEF(&headers); - ZVAL_UNDEF(&method); - ZVAL_UNDEF(&protocol); - ZVAL_UNDEF(&serverCollection); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_3); - ZVAL_UNDEF(&_4); - ZVAL_UNDEF(&_5); - ZVAL_UNDEF(&_6); - ZVAL_UNDEF(&_8); - ZVAL_UNDEF(&_11); - ZVAL_UNDEF(&_12); - ZVAL_UNDEF(&_13); - ZVAL_UNDEF(&_14); - ZVAL_UNDEF(&_9$$8); - ZVAL_UNDEF(&_10$$8); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(0, 5) - Z_PARAM_OPTIONAL - Z_PARAM_ARRAY_OR_NULL(server) - Z_PARAM_ARRAY_OR_NULL(get) - Z_PARAM_ARRAY_OR_NULL(post) - Z_PARAM_ARRAY_OR_NULL(cookies) - Z_PARAM_ARRAY_OR_NULL(files) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_get_global(&_SERVER, SL("_SERVER")); - zephir_get_global(&_POST, SL("_POST")); - zephir_get_global(&_GET, SL("_GET")); - zephir_get_global(&_FILES, SL("_FILES")); - zephir_get_global(&_COOKIE, SL("_COOKIE")); - zephir_fetch_params(1, 0, 5, &server_param, &get_param, &post_param, &cookies_param, &files_param); - if (!server_param) { - ZEPHIR_INIT_VAR(&server); - } else { - zephir_get_arrval(&server, server_param); - } - if (!get_param) { - ZEPHIR_INIT_VAR(&get); - } else { - zephir_get_arrval(&get, get_param); - } - if (!post_param) { - ZEPHIR_INIT_VAR(&post); - } else { - zephir_get_arrval(&post, post_param); - } - if (!cookies_param) { - ZEPHIR_INIT_VAR(&cookies); - } else { - zephir_get_arrval(&cookies, cookies_param); - } - if (!files_param) { - ZEPHIR_INIT_VAR(&files); - } else { - zephir_get_arrval(&files, files_param); - } - - - ZEPHIR_INIT_VAR(&globalCookies); - array_init(&globalCookies); - ZEPHIR_INIT_VAR(&globalFiles); - array_init(&globalFiles); - ZEPHIR_INIT_VAR(&globalGet); - array_init(&globalGet); - ZEPHIR_INIT_VAR(&globalPost); - array_init(&globalPost); - ZEPHIR_INIT_VAR(&globalServer); - array_init(&globalServer); - if (!(ZEPHIR_IS_EMPTY(&_COOKIE))) { - ZEPHIR_CPY_WRT(&globalCookies, &_COOKIE); - } - if (!(ZEPHIR_IS_EMPTY(&_FILES))) { - ZEPHIR_CPY_WRT(&globalFiles, &_FILES); - } - if (!(ZEPHIR_IS_EMPTY(&_GET))) { - ZEPHIR_CPY_WRT(&globalGet, &_GET); - } - if (!(ZEPHIR_IS_EMPTY(&_POST))) { - ZEPHIR_CPY_WRT(&globalPost, &_POST); - } - if (!(ZEPHIR_IS_EMPTY(&_SERVER))) { - ZEPHIR_CPY_WRT(&globalServer, &_SERVER); - } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "checknullarray", NULL, 371, &server, &globalServer); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(&server, &_0); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "checknullarray", NULL, 371, &files, &globalFiles); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(&files, &_1); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "checknullarray", NULL, 371, &cookies, &globalCookies); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(&cookies, &_2); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "checknullarray", NULL, 371, &get, &globalGet); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(&get, &_3); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "checknullarray", NULL, 371, &post, &globalPost); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(&post, &_4); - ZEPHIR_CALL_METHOD(&serverCollection, this_ptr, "parseserver", NULL, 372, &server); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_5); - ZVAL_STRING(&_5, "REQUEST_METHOD"); - ZEPHIR_INIT_VAR(&_6); - ZVAL_STRING(&_6, "GET"); - ZEPHIR_CALL_METHOD(&method, &serverCollection, "get", NULL, 0, &_5, &_6); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&protocol, this_ptr, "parseprotocol", NULL, 373, &serverCollection); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&headers, this_ptr, "parseheaders", NULL, 374, &serverCollection); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&filesCollection, this_ptr, "parseuploadedfiles", NULL, 375, &files); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(&cookiesCollection, &cookies); - _7 = ZEPHIR_IS_EMPTY(&cookies); - if (_7) { - ZEPHIR_INIT_NVAR(&_5); - ZVAL_STRING(&_5, "cookie"); - ZEPHIR_CALL_METHOD(&_8, &headers, "has", NULL, 0, &_5); - zephir_check_call_status(); - _7 = zephir_is_true(&_8); - } - if (UNEXPECTED(_7)) { - ZEPHIR_INIT_VAR(&_10$$8); - ZVAL_STRING(&_10$$8, "cookie"); - ZEPHIR_CALL_METHOD(&_9$$8, &headers, "get", NULL, 0, &_10$$8); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&cookiesCollection, this_ptr, "parsecookieheader", NULL, 376, &_9$$8); - zephir_check_call_status(); - } - object_init_ex(return_value, phalcon_http_message_serverrequest_ce); - ZEPHIR_CALL_METHOD(&_11, this_ptr, "parseuri", NULL, 377, &serverCollection, &headers); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_12, &serverCollection, "toarray", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_13, &headers, "toarray", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_14, &filesCollection, "toarray", NULL, 0); - zephir_check_call_status(); - ZEPHIR_INIT_NVAR(&_5); - ZVAL_STRING(&_5, "php://input"); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 370, &method, &_11, &_12, &_5, &_13, &cookiesCollection, &get, &_14, &post, &protocol); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, getHeaders) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *this_ptr = getThis(); - - - - ZEPHIR_MM_GROW(); - - if (EXPECTED((zephir_function_exists_ex(ZEND_STRL("apache_request_headers")) == SUCCESS))) { - ZEPHIR_RETURN_CALL_FUNCTION("apache_request_headers", NULL, 378); - zephir_check_call_status(); - RETURN_MM(); - } - RETURN_MM_BOOL(0); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, calculateUriHost) -{ - zval defaults; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *server, server_sub, *headers, headers_sub, __$null, host, port, _0, _1, _2, _4, _3$$3; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&server_sub); - ZVAL_UNDEF(&headers_sub); - ZVAL_NULL(&__$null); - ZVAL_UNDEF(&host); - ZVAL_UNDEF(&port); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_4); - ZVAL_UNDEF(&_3$$3); - ZVAL_UNDEF(&defaults); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(server, phalcon_support_collection_collectioninterface_ce) - Z_PARAM_OBJECT_OF_CLASS(headers, phalcon_support_collection_collectioninterface_ce) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 2, 0, &server, &headers); - - - ZEPHIR_INIT_VAR(&defaults); - zephir_create_array(&defaults, 2, 0); - ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, ""); - zephir_array_fast_append(&defaults, &_0); - zephir_array_fast_append(&defaults, &__$null); - ZEPHIR_INIT_NVAR(&_0); - ZVAL_STRING(&_0, "host"); - ZVAL_BOOL(&_2, 0); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "getheader", NULL, 379, headers, &_0, &_2); - zephir_check_call_status(); - if (UNEXPECTED(zephir_is_true(&_1))) { - ZEPHIR_INIT_VAR(&_3$$3); - ZVAL_STRING(&_3$$3, "host"); - ZEPHIR_CALL_METHOD(&host, this_ptr, "getheader", NULL, 379, headers, &_3$$3); - zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "calculateurihostfromheader", NULL, 380, &host); - zephir_check_call_status(); - RETURN_MM(); - } - ZEPHIR_INIT_NVAR(&_0); - ZVAL_STRING(&_0, "SERVER_NAME"); - ZEPHIR_CALL_METHOD(&_4, server, "has", NULL, 0, &_0); - zephir_check_call_status(); - if (UNEXPECTED(!zephir_is_true(&_4))) { - RETURN_CTOR(&defaults); - } - ZEPHIR_INIT_NVAR(&_0); - ZVAL_STRING(&_0, "SERVER_NAME"); - ZEPHIR_CALL_METHOD(&host, server, "get", NULL, 0, &_0); - zephir_check_call_status(); - ZEPHIR_INIT_NVAR(&_0); - ZVAL_STRING(&_0, "SERVER_PORT"); - ZVAL_NULL(&_2); - ZEPHIR_CALL_METHOD(&port, server, "get", NULL, 0, &_0, &_2); - zephir_check_call_status(); - zephir_create_array(return_value, 2, 0); - zephir_array_fast_append(return_value, &host); - zephir_array_fast_append(return_value, &port); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, calculateUriHostFromHeader) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *host_param = NULL, matches, port, _0, _1, _2, _3$$3, _4$$3, _5$$3, _6$$3, _7$$3; - zval host; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&host); - ZVAL_UNDEF(&matches); - ZVAL_UNDEF(&port); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_3$$3); - ZVAL_UNDEF(&_4$$3); - ZVAL_UNDEF(&_5$$3); - ZVAL_UNDEF(&_6$$3); - ZVAL_UNDEF(&_7$$3); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR(host) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &host_param); - zephir_get_strval(&host, host_param); - - - ZEPHIR_INIT_VAR(&port); - ZVAL_NULL(&port); - ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, "|:(\\d+)$|"); - ZEPHIR_INIT_VAR(&_1); - ZEPHIR_INIT_VAR(&_2); - ZVAL_STRING(&_2, "|:(\\d+)$|"); - zephir_preg_match(&_1, &_2, &host, &matches, 0, 0 , 0 ); - if (UNEXPECTED(zephir_is_true(&_1))) { - zephir_array_fetch_long(&_3$$3, &matches, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Message/ServerRequestFactory.zep", 199); - ZVAL_LONG(&_4$$3, 0); - ZVAL_LONG(&_5$$3, (-1 * ((zephir_fast_strlen_ev(&_3$$3) + 1)))); - ZEPHIR_INIT_VAR(&_6$$3); - zephir_substr(&_6$$3, &host, 0 , zephir_get_intval(&_5$$3), 0); - zephir_get_strval(&host, &_6$$3); - ZEPHIR_OBS_VAR(&_7$$3); - zephir_array_fetch_long(&_7$$3, &matches, 1, PH_NOISY, "phalcon/Http/Message/ServerRequestFactory.zep", 200); - ZEPHIR_INIT_NVAR(&port); - ZVAL_LONG(&port, zephir_get_intval(&_7$$3)); - } - zephir_create_array(return_value, 2, 0); - zephir_array_fast_append(return_value, &host); - zephir_array_fast_append(return_value, &port); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, calculateUriPath) -{ - zend_bool _4; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *server, server_sub, iisRewrite, origPathInfo, requestUri, unencodedUrl, _0, _1, _2, _3, _5$$4, _6$$4; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&server_sub); - ZVAL_UNDEF(&iisRewrite); - ZVAL_UNDEF(&origPathInfo); - ZVAL_UNDEF(&requestUri); - ZVAL_UNDEF(&unencodedUrl); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_3); - ZVAL_UNDEF(&_5$$4); - ZVAL_UNDEF(&_6$$4); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(server, phalcon_support_collection_collectioninterface_ce) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &server); - - - ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, "IIS_WasUrlRewritten"); - ZVAL_NULL(&_1); - ZEPHIR_CALL_METHOD(&iisRewrite, server, "get", NULL, 0, &_0, &_1); - zephir_check_call_status(); - ZEPHIR_INIT_NVAR(&_0); - ZVAL_STRING(&_0, "UNENCODED_URL"); - ZEPHIR_INIT_VAR(&_2); - ZVAL_STRING(&_2, ""); - ZEPHIR_CALL_METHOD(&unencodedUrl, server, "get", NULL, 0, &_0, &_2); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_3); - ZVAL_STRING(&_3, "1"); - _4 = ZEPHIR_IS_IDENTICAL(&_3, &iisRewrite); - if (_4) { - _4 = !(ZEPHIR_IS_EMPTY(&unencodedUrl)); - } - if (UNEXPECTED(_4)) { - RETURN_CCTOR(&unencodedUrl); - } - ZEPHIR_INIT_NVAR(&_0); - ZVAL_STRING(&_0, "REQUEST_URI"); - ZVAL_NULL(&_1); - ZEPHIR_CALL_METHOD(&requestUri, server, "get", NULL, 0, &_0, &_1); - zephir_check_call_status(); - if (UNEXPECTED(Z_TYPE_P(&requestUri) != IS_NULL)) { - ZEPHIR_INIT_VAR(&_5$$4); - ZVAL_STRING(&_5$$4, "#^[^/:]+://[^/]+#"); - ZEPHIR_INIT_VAR(&_6$$4); - ZVAL_STRING(&_6$$4, ""); - ZEPHIR_RETURN_CALL_FUNCTION("preg_replace", NULL, 50, &_5$$4, &_6$$4, &requestUri); - zephir_check_call_status(); - RETURN_MM(); - } - ZEPHIR_INIT_NVAR(&_0); - ZVAL_STRING(&_0, "ORIG_PATH_INFO"); - ZVAL_NULL(&_1); - ZEPHIR_CALL_METHOD(&origPathInfo, server, "get", NULL, 0, &_0, &_1); - zephir_check_call_status(); - if (UNEXPECTED(ZEPHIR_IS_EMPTY(&origPathInfo))) { - RETURN_MM_STRING("/"); - } - RETURN_CCTOR(&origPathInfo); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, calculateUriQuery) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *server, server_sub, _0, _1, _2; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&server_sub); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(server, phalcon_support_collection_collectioninterface_ce) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &server); - - - ZEPHIR_INIT_VAR(&_1); - ZVAL_STRING(&_1, "QUERY_STRING"); - ZEPHIR_INIT_VAR(&_2); - ZVAL_STRING(&_2, ""); - ZEPHIR_CALL_METHOD(&_0, server, "get", NULL, 0, &_1, &_2); - zephir_check_call_status(); - ZEPHIR_INIT_NVAR(&_1); - ZVAL_STRING(&_1, "?"); - zephir_fast_trim(return_value, &_0, &_1, ZEPHIR_TRIM_LEFT); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, calculateUriScheme) -{ - double _7$$3; - zend_bool _9; - zval scheme, _5$$3; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *server, server_sub, *headers, headers_sub, header, isHttps, _0, _1, _8, _10, _2$$3, _3$$3, _4$$3, _6$$3; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&server_sub); - ZVAL_UNDEF(&headers_sub); - ZVAL_UNDEF(&header); - ZVAL_UNDEF(&isHttps); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_8); - ZVAL_UNDEF(&_10); - ZVAL_UNDEF(&_2$$3); - ZVAL_UNDEF(&_3$$3); - ZVAL_UNDEF(&_4$$3); - ZVAL_UNDEF(&_6$$3); - ZVAL_UNDEF(&scheme); - ZVAL_UNDEF(&_5$$3); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(server, phalcon_support_collection_collectioninterface_ce) - Z_PARAM_OBJECT_OF_CLASS(headers, phalcon_support_collection_collectioninterface_ce) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 2, 0, &server, &headers); - - - ZEPHIR_INIT_VAR(&scheme); - ZVAL_STRING(&scheme, "https"); - ZEPHIR_INIT_VAR(&isHttps); - ZVAL_BOOL(&isHttps, 1); - ZEPHIR_INIT_VAR(&_1); - ZVAL_STRING(&_1, "HTTPS"); - ZEPHIR_CALL_METHOD(&_0, server, "has", NULL, 0, &_1); - zephir_check_call_status(); - if (UNEXPECTED(zephir_is_true(&_0))) { - ZEPHIR_INIT_VAR(&_3$$3); - ZVAL_STRING(&_3$$3, "HTTPS"); - ZEPHIR_INIT_VAR(&_4$$3); - ZVAL_STRING(&_4$$3, "on"); - ZEPHIR_CALL_METHOD(&_2$$3, server, "get", NULL, 0, &_3$$3, &_4$$3); - zephir_check_call_status(); - zephir_cast_to_string(&_5$$3, &_2$$3); - ZEPHIR_CPY_WRT(&isHttps, &_5$$3); - ZEPHIR_INIT_NVAR(&_3$$3); - zephir_fast_strtolower(&_3$$3, &isHttps); - ZEPHIR_INIT_VAR(&_6$$3); - ZVAL_STRING(&_6$$3, "off"); - _7$$3 = !ZEPHIR_IS_IDENTICAL(&_6$$3, &_3$$3); - ZEPHIR_INIT_NVAR(&isHttps); - ZVAL_BOOL(&isHttps, _7$$3); - } - ZEPHIR_INIT_NVAR(&_1); - ZVAL_STRING(&_1, "x-forwarded-proto"); - ZEPHIR_INIT_VAR(&_8); - ZVAL_STRING(&_8, "https"); - ZEPHIR_CALL_METHOD(&header, this_ptr, "getheader", NULL, 379, headers, &_1, &_8); - zephir_check_call_status(); - _9 = !zephir_is_true(&isHttps); - if (!(_9)) { - ZEPHIR_INIT_VAR(&_10); - ZVAL_STRING(&_10, "https"); - _9 = !ZEPHIR_IS_IDENTICAL(&_10, &header); - } - if (UNEXPECTED(_9)) { - ZEPHIR_INIT_NVAR(&scheme); - ZVAL_STRING(&scheme, "http"); - } - RETURN_CTOR(&scheme); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, checkNullArray) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval super; - zval *source, source_sub, *super_param = NULL; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&source_sub); - ZVAL_UNDEF(&super); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_ZVAL(source) - Z_PARAM_ARRAY(super) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 2, 0, &source, &super_param); - zephir_get_arrval(&super, super_param); - - - if (UNEXPECTED(ZEPHIR_IS_EMPTY(source))) { - RETURN_CTOR(&super); - } - RETVAL_ZVAL(source, 1, 0); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, createUploadedFile) -{ - zval _3$$3; - zend_bool _0, _1; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *file_param = NULL, name, type, _4, _5, _6, _2$$3; - zval file; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&file); - ZVAL_UNDEF(&name); - ZVAL_UNDEF(&type); - ZVAL_UNDEF(&_4); - ZVAL_UNDEF(&_5); - ZVAL_UNDEF(&_6); - ZVAL_UNDEF(&_2$$3); - ZVAL_UNDEF(&_3$$3); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ARRAY(file) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &file_param); - zephir_get_arrval(&file, file_param); - - - _0 = !(zephir_array_isset_string(&file, SL("tmp_name"))); - if (!(_0)) { - _0 = !(zephir_array_isset_string(&file, SL("size"))); - } - _1 = _0; - if (!(_1)) { - _1 = !(zephir_array_isset_string(&file, SL("error"))); - } - if (UNEXPECTED(_1)) { - ZEPHIR_INIT_VAR(&_2$$3); - object_init_ex(&_2$$3, phalcon_http_message_exception_invalidargumentexception_ce); - ZEPHIR_INIT_VAR(&_3$$3); - ZEPHIR_CONCAT_SS(&_3$$3, "The file array must contain tmp_name, size and error; ", "one or more are missing"); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 40, &_3$$3); - zephir_check_call_status(); - zephir_throw_exception_debug(&_2$$3, "phalcon/Http/Message/ServerRequestFactory.zep", 318); - ZEPHIR_MM_RESTORE(); - return; - } - if (zephir_array_isset_string(&file, SL("name"))) { - ZEPHIR_OBS_VAR(&name); - zephir_array_fetch_string(&name, &file, SL("name"), PH_NOISY, "phalcon/Http/Message/ServerRequestFactory.zep", 321); - } else { - ZEPHIR_INIT_NVAR(&name); - ZVAL_NULL(&name); - } - if (zephir_array_isset_string(&file, SL("type"))) { - ZEPHIR_OBS_VAR(&type); - zephir_array_fetch_string(&type, &file, SL("type"), PH_NOISY, "phalcon/Http/Message/ServerRequestFactory.zep", 322); - } else { - ZEPHIR_INIT_NVAR(&type); - ZVAL_NULL(&type); - } - object_init_ex(return_value, phalcon_http_message_uploadedfile_ce); - zephir_array_fetch_string(&_4, &file, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Message/ServerRequestFactory.zep", 325); - zephir_array_fetch_string(&_5, &file, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Message/ServerRequestFactory.zep", 326); - zephir_array_fetch_string(&_6, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Message/ServerRequestFactory.zep", 327); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 381, &_4, &_5, &_6, &name, &type); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, getHeader) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval name; - zval *headers, headers_sub, *name_param = NULL, *defaultValue = NULL, defaultValue_sub, __$null, value, _0$$3; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&headers_sub); - ZVAL_UNDEF(&defaultValue_sub); - ZVAL_NULL(&__$null); - ZVAL_UNDEF(&value); - ZVAL_UNDEF(&_0$$3); - ZVAL_UNDEF(&name); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(2, 3) - Z_PARAM_OBJECT_OF_CLASS(headers, phalcon_support_collection_collectioninterface_ce) - Z_PARAM_STR(name) - Z_PARAM_OPTIONAL - Z_PARAM_ZVAL_OR_NULL(defaultValue) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 2, 1, &headers, &name_param, &defaultValue); - zephir_get_strval(&name, name_param); - if (!defaultValue) { - defaultValue = &defaultValue_sub; - defaultValue = &__$null; - } - - - ZEPHIR_CALL_METHOD(&value, headers, "get", NULL, 0, &name, defaultValue); - zephir_check_call_status(); - if (Z_TYPE_P(&value) == IS_ARRAY) { - ZEPHIR_INIT_VAR(&_0$$3); - zephir_fast_join_str(&_0$$3, SL(","), &value); - ZEPHIR_CPY_WRT(&value, &_0$$3); - } - RETURN_CCTOR(&value); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseCookieHeader) -{ - zval _0; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *cookieHeader_param = NULL, cookies, _1; - zval cookieHeader; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&cookieHeader); - ZVAL_UNDEF(&cookies); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_0); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR(cookieHeader) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &cookieHeader_param); - zephir_get_strval(&cookieHeader, cookieHeader_param); - - - ZEPHIR_INIT_VAR(&cookies); - array_init(&cookies); - ZEPHIR_INIT_VAR(&_0); - zephir_create_array(&_0, 3, 0); - add_assoc_stringl_ex(&_0, SL("&"), SL("%26")); - add_assoc_stringl_ex(&_0, SL("+"), SL("%2B")); - add_assoc_stringl_ex(&_0, SL(";"), SL("&")); - ZEPHIR_CALL_FUNCTION(&_1, "strtr", NULL, 5, &cookieHeader, &_0); - zephir_check_call_status(); - ZEPHIR_MAKE_REF(&cookies); - ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 382, &_1, &cookies); - ZEPHIR_UNREF(&cookies); - zephir_check_call_status(); - RETURN_CCTOR(&cookies); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseHeaders) -{ - zend_string *_3; - zend_ulong _2; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zephir_fcall_cache_entry *_10 = NULL, *_18 = NULL, *_30 = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *server, server_sub, headers, key, name, serverArray, value, *_0, _1, _4$$3, _5$$4, _6$$4, _11$$4, _12$$4, _19$$4, _20$$4, _7$$5, _8$$5, _9$$5, _13$$7, _14$$7, _15$$7, _16$$7, _17$$7, _21$$8, _22$$8, _23$$8, _24$$9, _25$$10, _26$$10, _31$$10, _32$$10, _38$$10, _39$$10, _27$$11, _28$$11, _29$$11, _33$$13, _34$$13, _35$$13, _36$$13, _37$$13, _40$$14, _41$$14, _42$$14; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&server_sub); - ZVAL_UNDEF(&headers); - ZVAL_UNDEF(&key); - ZVAL_UNDEF(&name); - ZVAL_UNDEF(&serverArray); - ZVAL_UNDEF(&value); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_4$$3); - ZVAL_UNDEF(&_5$$4); - ZVAL_UNDEF(&_6$$4); - ZVAL_UNDEF(&_11$$4); - ZVAL_UNDEF(&_12$$4); - ZVAL_UNDEF(&_19$$4); - ZVAL_UNDEF(&_20$$4); - ZVAL_UNDEF(&_7$$5); - ZVAL_UNDEF(&_8$$5); - ZVAL_UNDEF(&_9$$5); - ZVAL_UNDEF(&_13$$7); - ZVAL_UNDEF(&_14$$7); - ZVAL_UNDEF(&_15$$7); - ZVAL_UNDEF(&_16$$7); - ZVAL_UNDEF(&_17$$7); - ZVAL_UNDEF(&_21$$8); - ZVAL_UNDEF(&_22$$8); - ZVAL_UNDEF(&_23$$8); - ZVAL_UNDEF(&_24$$9); - ZVAL_UNDEF(&_25$$10); - ZVAL_UNDEF(&_26$$10); - ZVAL_UNDEF(&_31$$10); - ZVAL_UNDEF(&_32$$10); - ZVAL_UNDEF(&_38$$10); - ZVAL_UNDEF(&_39$$10); - ZVAL_UNDEF(&_27$$11); - ZVAL_UNDEF(&_28$$11); - ZVAL_UNDEF(&_29$$11); - ZVAL_UNDEF(&_33$$13); - ZVAL_UNDEF(&_34$$13); - ZVAL_UNDEF(&_35$$13); - ZVAL_UNDEF(&_36$$13); - ZVAL_UNDEF(&_37$$13); - ZVAL_UNDEF(&_40$$14); - ZVAL_UNDEF(&_41$$14); - ZVAL_UNDEF(&_42$$14); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(server, phalcon_support_collection_collectioninterface_ce) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &server); - - - ZEPHIR_INIT_VAR(&headers); - object_init_ex(&headers, phalcon_support_collection_ce); - ZEPHIR_CALL_METHOD(NULL, &headers, "__construct", NULL, 24); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&serverArray, server, "toarray", NULL, 0); - zephir_check_call_status(); - zephir_is_iterable(&serverArray, 0, "phalcon/Http/Message/ServerRequestFactory.zep", 437); - if (Z_TYPE_P(&serverArray) == IS_ARRAY) { - ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&serverArray), _2, _3, _0) - { - ZEPHIR_INIT_NVAR(&key); - if (_3 != NULL) { - ZVAL_STR_COPY(&key, _3); - } else { - ZVAL_LONG(&key, _2); - } - ZEPHIR_INIT_NVAR(&value); - ZVAL_COPY(&value, _0); - ZEPHIR_INIT_NVAR(&_4$$3); - ZVAL_STRING(&_4$$3, ""); - if (EXPECTED(!ZEPHIR_IS_IDENTICAL(&_4$$3, &value))) { - ZEPHIR_INIT_NVAR(&_5$$4); - ZVAL_STRING(&_5$$4, "REDIRECT_"); - ZEPHIR_INIT_NVAR(&_6$$4); - zephir_fast_strpos(&_6$$4, &key, &_5$$4, 0 ); - if (UNEXPECTED(ZEPHIR_IS_LONG_IDENTICAL(&_6$$4, 0))) { - ZVAL_LONG(&_7$$5, 9); - ZEPHIR_INIT_NVAR(&_8$$5); - zephir_substr(&_8$$5, &key, 9 , 0, ZEPHIR_SUBSTR_NO_LENGTH); - ZEPHIR_CPY_WRT(&key, &_8$$5); - ZEPHIR_CALL_METHOD(&_9$$5, server, "has", &_10, 0, &key); - zephir_check_call_status(); - if (UNEXPECTED(ZEPHIR_IS_TRUE_IDENTICAL(&_9$$5))) { - continue; - } - } - ZEPHIR_INIT_NVAR(&_11$$4); - ZVAL_STRING(&_11$$4, "HTTP_"); - ZEPHIR_INIT_NVAR(&_12$$4); - zephir_fast_strpos(&_12$$4, &key, &_11$$4, 0 ); - if (EXPECTED(ZEPHIR_IS_LONG_IDENTICAL(&_12$$4, 0))) { - ZEPHIR_INIT_NVAR(&_13$$7); - ZVAL_LONG(&_14$$7, 5); - ZEPHIR_INIT_NVAR(&_15$$7); - zephir_substr(&_15$$7, &key, 5 , 0, ZEPHIR_SUBSTR_NO_LENGTH); - zephir_fast_strtolower(&_13$$7, &_15$$7); - ZEPHIR_INIT_NVAR(&_16$$7); - ZVAL_STRING(&_16$$7, "_"); - ZEPHIR_INIT_NVAR(&_17$$7); - ZVAL_STRING(&_17$$7, "-"); - ZEPHIR_INIT_NVAR(&name); - zephir_fast_str_replace(&name, &_16$$7, &_17$$7, &_13$$7); - ZEPHIR_CALL_METHOD(NULL, &headers, "set", &_18, 42, &name, &value); - zephir_check_call_status(); - continue; - } - ZEPHIR_INIT_NVAR(&_19$$4); - ZVAL_STRING(&_19$$4, "CONTENT_"); - ZEPHIR_INIT_NVAR(&_20$$4); - zephir_fast_strpos(&_20$$4, &key, &_19$$4, 0 ); - if (UNEXPECTED(ZEPHIR_IS_LONG_IDENTICAL(&_20$$4, 0))) { - ZEPHIR_INIT_NVAR(&_21$$8); - ZVAL_LONG(&_22$$8, 8); - ZEPHIR_INIT_NVAR(&_23$$8); - zephir_substr(&_23$$8, &key, 8 , 0, ZEPHIR_SUBSTR_NO_LENGTH); - zephir_fast_strtolower(&_21$$8, &_23$$8); - ZEPHIR_INIT_NVAR(&name); - ZEPHIR_CONCAT_SV(&name, "content-", &_21$$8); - ZEPHIR_CALL_METHOD(NULL, &headers, "set", &_18, 42, &name, &value); - zephir_check_call_status(); - continue; - } - } - } ZEND_HASH_FOREACH_END(); - } else { - ZEPHIR_CALL_METHOD(NULL, &serverArray, "rewind", NULL, 0); - zephir_check_call_status(); - while (1) { - ZEPHIR_CALL_METHOD(&_1, &serverArray, "valid", NULL, 0); - zephir_check_call_status(); - if (!zend_is_true(&_1)) { - break; - } - ZEPHIR_CALL_METHOD(&key, &serverArray, "key", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&value, &serverArray, "current", NULL, 0); - zephir_check_call_status(); - ZEPHIR_INIT_NVAR(&_24$$9); - ZVAL_STRING(&_24$$9, ""); - if (EXPECTED(!ZEPHIR_IS_IDENTICAL(&_24$$9, &value))) { - ZEPHIR_INIT_NVAR(&_25$$10); - ZVAL_STRING(&_25$$10, "REDIRECT_"); - ZEPHIR_INIT_NVAR(&_26$$10); - zephir_fast_strpos(&_26$$10, &key, &_25$$10, 0 ); - if (UNEXPECTED(ZEPHIR_IS_LONG_IDENTICAL(&_26$$10, 0))) { - ZVAL_LONG(&_27$$11, 9); - ZEPHIR_INIT_NVAR(&_28$$11); - zephir_substr(&_28$$11, &key, 9 , 0, ZEPHIR_SUBSTR_NO_LENGTH); - ZEPHIR_CPY_WRT(&key, &_28$$11); - ZEPHIR_CALL_METHOD(&_29$$11, server, "has", &_30, 0, &key); - zephir_check_call_status(); - if (UNEXPECTED(ZEPHIR_IS_TRUE_IDENTICAL(&_29$$11))) { - continue; - } - } - ZEPHIR_INIT_NVAR(&_31$$10); - ZVAL_STRING(&_31$$10, "HTTP_"); - ZEPHIR_INIT_NVAR(&_32$$10); - zephir_fast_strpos(&_32$$10, &key, &_31$$10, 0 ); - if (EXPECTED(ZEPHIR_IS_LONG_IDENTICAL(&_32$$10, 0))) { - ZEPHIR_INIT_NVAR(&_33$$13); - ZVAL_LONG(&_34$$13, 5); - ZEPHIR_INIT_NVAR(&_35$$13); - zephir_substr(&_35$$13, &key, 5 , 0, ZEPHIR_SUBSTR_NO_LENGTH); - zephir_fast_strtolower(&_33$$13, &_35$$13); - ZEPHIR_INIT_NVAR(&_36$$13); - ZVAL_STRING(&_36$$13, "_"); - ZEPHIR_INIT_NVAR(&_37$$13); - ZVAL_STRING(&_37$$13, "-"); - ZEPHIR_INIT_NVAR(&name); - zephir_fast_str_replace(&name, &_36$$13, &_37$$13, &_33$$13); - ZEPHIR_CALL_METHOD(NULL, &headers, "set", &_18, 42, &name, &value); - zephir_check_call_status(); - continue; - } - ZEPHIR_INIT_NVAR(&_38$$10); - ZVAL_STRING(&_38$$10, "CONTENT_"); - ZEPHIR_INIT_NVAR(&_39$$10); - zephir_fast_strpos(&_39$$10, &key, &_38$$10, 0 ); - if (UNEXPECTED(ZEPHIR_IS_LONG_IDENTICAL(&_39$$10, 0))) { - ZEPHIR_INIT_NVAR(&_40$$14); - ZVAL_LONG(&_41$$14, 8); - ZEPHIR_INIT_NVAR(&_42$$14); - zephir_substr(&_42$$14, &key, 8 , 0, ZEPHIR_SUBSTR_NO_LENGTH); - zephir_fast_strtolower(&_40$$14, &_42$$14); - ZEPHIR_INIT_NVAR(&name); - ZEPHIR_CONCAT_SV(&name, "content-", &_40$$14); - ZEPHIR_CALL_METHOD(NULL, &headers, "set", &_18, 42, &name, &value); - zephir_check_call_status(); - continue; - } - } - ZEPHIR_CALL_METHOD(NULL, &serverArray, "next", NULL, 0); - zephir_check_call_status(); - } - } - ZEPHIR_INIT_NVAR(&value); - ZEPHIR_INIT_NVAR(&key); - RETURN_CCTOR(&headers); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseProtocol) -{ - zval _4; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *server, server_sub, localProtocol, protocol, protocols, _0, _1, _2, _3, _5, _6, _9, _10, _7$$4, _8$$4, _11$$5, _12$$5; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&server_sub); - ZVAL_UNDEF(&localProtocol); - ZVAL_UNDEF(&protocol); - ZVAL_UNDEF(&protocols); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_3); - ZVAL_UNDEF(&_5); - ZVAL_UNDEF(&_6); - ZVAL_UNDEF(&_9); - ZVAL_UNDEF(&_10); - ZVAL_UNDEF(&_7$$4); - ZVAL_UNDEF(&_8$$4); - ZVAL_UNDEF(&_11$$5); - ZVAL_UNDEF(&_12$$5); - ZVAL_UNDEF(&_4); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(server, phalcon_support_collection_collectioninterface_ce) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &server); - - - ZEPHIR_INIT_VAR(&_1); - ZVAL_STRING(&_1, "SERVER_PROTOCOL"); - ZEPHIR_CALL_METHOD(&_0, server, "has", NULL, 0, &_1); - zephir_check_call_status(); - if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - RETURN_MM_STRING("1.1"); - } - ZEPHIR_INIT_NVAR(&_1); - ZVAL_STRING(&_1, "SERVER_PROTOCOL"); - ZEPHIR_INIT_VAR(&_3); - ZVAL_STRING(&_3, "HTTP/1.1"); - ZEPHIR_CALL_METHOD(&_2, server, "get", NULL, 0, &_1, &_3); - zephir_check_call_status(); - zephir_cast_to_string(&_4, &_2); - ZEPHIR_CPY_WRT(&protocol, &_4); - ZEPHIR_INIT_VAR(&localProtocol); - zephir_fast_strtolower(&localProtocol, &protocol); - ZEPHIR_INIT_VAR(&protocols); - zephir_create_array(&protocols, 4, 0); - add_assoc_long_ex(&protocols, SL("1.0"), 1); - add_assoc_long_ex(&protocols, SL("1.1"), 1); - add_assoc_long_ex(&protocols, SL("2.0"), 1); - add_assoc_long_ex(&protocols, SL("3.0"), 1); - ZVAL_LONG(&_5, 0); - ZVAL_LONG(&_6, 5); - ZEPHIR_INIT_NVAR(&_1); - zephir_substr(&_1, &localProtocol, 0 , 5 , 0); - if (!ZEPHIR_IS_STRING_IDENTICAL(&_1, "http/")) { - ZEPHIR_INIT_VAR(&_7$$4); - object_init_ex(&_7$$4, phalcon_http_message_exception_invalidargumentexception_ce); - ZEPHIR_INIT_VAR(&_8$$4); - ZEPHIR_CONCAT_SV(&_8$$4, "Incorrect protocol value ", &protocol); - ZEPHIR_CALL_METHOD(NULL, &_7$$4, "__construct", NULL, 40, &_8$$4); - zephir_check_call_status(); - zephir_throw_exception_debug(&_7$$4, "phalcon/Http/Message/ServerRequestFactory.zep", 467); - ZEPHIR_MM_RESTORE(); - return; - } - ZEPHIR_INIT_NVAR(&_3); - ZEPHIR_INIT_VAR(&_9); - ZVAL_STRING(&_9, "http/"); - ZEPHIR_INIT_VAR(&_10); - ZVAL_STRING(&_10, ""); - zephir_fast_str_replace(&_3, &_9, &_10, &localProtocol); - ZEPHIR_CPY_WRT(&localProtocol, &_3); - if (UNEXPECTED(!(zephir_array_isset(&protocols, &localProtocol)))) { - ZEPHIR_INIT_VAR(&_11$$5); - object_init_ex(&_11$$5, phalcon_http_message_exception_invalidargumentexception_ce); - ZEPHIR_INIT_VAR(&_12$$5); - ZEPHIR_CONCAT_SV(&_12$$5, "Unsupported protocol ", &protocol); - ZEPHIR_CALL_METHOD(NULL, &_11$$5, "__construct", NULL, 40, &_12$$5); - zephir_check_call_status(); - zephir_throw_exception_debug(&_11$$5, "phalcon/Http/Message/ServerRequestFactory.zep", 475); - ZEPHIR_MM_RESTORE(); - return; - } - RETURN_CCTOR(&localProtocol); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseServer) -{ - zend_bool _2; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *server_param = NULL, collection, headers, headersCollection, _0, _1, _3$$3, _4$$3, _5$$4, _6$$4; - zval server; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&server); - ZVAL_UNDEF(&collection); - ZVAL_UNDEF(&headers); - ZVAL_UNDEF(&headersCollection); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_3$$3); - ZVAL_UNDEF(&_4$$3); - ZVAL_UNDEF(&_5$$4); - ZVAL_UNDEF(&_6$$4); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ARRAY(server) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &server_param); - zephir_get_arrval(&server, server_param); - - - ZEPHIR_INIT_VAR(&collection); - object_init_ex(&collection, phalcon_support_collection_ce); - ZEPHIR_CALL_METHOD(NULL, &collection, "__construct", NULL, 24, &server); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&headers, this_ptr, "getheaders", NULL, 0); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_1); - ZVAL_STRING(&_1, "HTTP_AUTHORIZATION"); - ZEPHIR_CALL_METHOD(&_0, &collection, "has", NULL, 383, &_1); - zephir_check_call_status(); - _2 = !zephir_is_true(&_0); - if (_2) { - _2 = !ZEPHIR_IS_FALSE_IDENTICAL(&headers); - } - if (UNEXPECTED(_2)) { - ZEPHIR_INIT_VAR(&headersCollection); - object_init_ex(&headersCollection, phalcon_support_collection_ce); - ZEPHIR_CALL_METHOD(NULL, &headersCollection, "__construct", NULL, 24, &headers); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_4$$3); - ZVAL_STRING(&_4$$3, "Authorization"); - ZEPHIR_CALL_METHOD(&_3$$3, &headersCollection, "has", NULL, 383, &_4$$3); - zephir_check_call_status(); - if (UNEXPECTED(zephir_is_true(&_3$$3))) { - ZEPHIR_INIT_VAR(&_6$$4); - ZVAL_STRING(&_6$$4, "Authorization"); - ZEPHIR_CALL_METHOD(&_5$$4, &headersCollection, "get", NULL, 384, &_6$$4); - zephir_check_call_status(); - ZEPHIR_INIT_NVAR(&_6$$4); - ZVAL_STRING(&_6$$4, "HTTP_AUTHORIZATION"); - ZEPHIR_CALL_METHOD(NULL, &collection, "set", NULL, 42, &_6$$4, &_5$$4); - zephir_check_call_status(); - } - } - RETURN_CCTOR(&collection); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseUploadedFiles) -{ - zend_bool _5$$3, _7$$3, _13$$7, _14$$7; - zval _4$$3, _12$$7; - zend_string *_3; - zend_ulong _2; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zephir_fcall_cache_entry *_6 = NULL, *_9 = NULL, *_10 = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *files_param = NULL, collection, data, key, file, *_0, _1, _8$$5, _11$$6, _15$$9, _16$$10; - zval files; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&files); - ZVAL_UNDEF(&collection); - ZVAL_UNDEF(&data); - ZVAL_UNDEF(&key); - ZVAL_UNDEF(&file); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_8$$5); - ZVAL_UNDEF(&_11$$6); - ZVAL_UNDEF(&_15$$9); - ZVAL_UNDEF(&_16$$10); - ZVAL_UNDEF(&_4$$3); - ZVAL_UNDEF(&_12$$7); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ARRAY(files) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &files_param); - zephir_get_arrval(&files, files_param); - - - ZEPHIR_INIT_VAR(&collection); - object_init_ex(&collection, phalcon_support_collection_ce); - ZEPHIR_CALL_METHOD(NULL, &collection, "__construct", NULL, 24); - zephir_check_call_status(); - zephir_is_iterable(&files, 0, "phalcon/Http/Message/ServerRequestFactory.zep", 558); - if (Z_TYPE_P(&files) == IS_ARRAY) { - ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&files), _2, _3, _0) - { - ZEPHIR_INIT_NVAR(&key); - if (_3 != NULL) { - ZVAL_STR_COPY(&key, _3); - } else { - ZVAL_LONG(&key, _2); - } - ZEPHIR_INIT_NVAR(&file); - ZVAL_COPY(&file, _0); - zephir_cast_to_string(&_4$$3, &key); - ZEPHIR_CPY_WRT(&key, &_4$$3); - _5$$3 = Z_TYPE_P(&file) == IS_OBJECT; - if (_5$$3) { - _5$$3 = zephir_is_instance_of(&file, SL("Psr\\Http\\Message\\UploadedFileInterface")); - } - if (UNEXPECTED(_5$$3)) { - ZEPHIR_CALL_METHOD(NULL, &collection, "set", &_6, 42, &key, &file); - zephir_check_call_status(); - continue; - } - _7$$3 = Z_TYPE_P(&file) == IS_ARRAY; - if (_7$$3) { - _7$$3 = zephir_array_isset_string(&file, SL("tmp_name")); - } - if (EXPECTED(_7$$3)) { - ZEPHIR_CALL_METHOD(&_8$$5, this_ptr, "createuploadedfile", &_9, 385, &file); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &collection, "set", &_6, 42, &key, &_8$$5); - zephir_check_call_status(); - continue; - } - if (UNEXPECTED(Z_TYPE_P(&file) == IS_ARRAY)) { - ZEPHIR_CALL_METHOD(&data, this_ptr, "parseuploadedfiles", &_10, 375, &file); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_11$$6, &data, "toarray", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &collection, "set", &_6, 42, &key, &_11$$6); - zephir_check_call_status(); - continue; - } - } ZEND_HASH_FOREACH_END(); - } else { - ZEPHIR_CALL_METHOD(NULL, &files, "rewind", NULL, 0); - zephir_check_call_status(); - while (1) { - ZEPHIR_CALL_METHOD(&_1, &files, "valid", NULL, 0); - zephir_check_call_status(); - if (!zend_is_true(&_1)) { - break; - } - ZEPHIR_CALL_METHOD(&key, &files, "key", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&file, &files, "current", NULL, 0); - zephir_check_call_status(); - zephir_cast_to_string(&_12$$7, &key); - ZEPHIR_CPY_WRT(&key, &_12$$7); - _13$$7 = Z_TYPE_P(&file) == IS_OBJECT; - if (_13$$7) { - _13$$7 = zephir_is_instance_of(&file, SL("Psr\\Http\\Message\\UploadedFileInterface")); - } - if (UNEXPECTED(_13$$7)) { - ZEPHIR_CALL_METHOD(NULL, &collection, "set", &_6, 42, &key, &file); - zephir_check_call_status(); - continue; - } - _14$$7 = Z_TYPE_P(&file) == IS_ARRAY; - if (_14$$7) { - _14$$7 = zephir_array_isset_string(&file, SL("tmp_name")); - } - if (EXPECTED(_14$$7)) { - ZEPHIR_CALL_METHOD(&_15$$9, this_ptr, "createuploadedfile", &_9, 385, &file); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &collection, "set", &_6, 42, &key, &_15$$9); - zephir_check_call_status(); - continue; - } - if (UNEXPECTED(Z_TYPE_P(&file) == IS_ARRAY)) { - ZEPHIR_CALL_METHOD(&data, this_ptr, "parseuploadedfiles", &_10, 375, &file); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_16$$10, &data, "toarray", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &collection, "set", &_6, 42, &key, &_16$$10); - zephir_check_call_status(); - continue; - } - ZEPHIR_CALL_METHOD(NULL, &files, "next", NULL, 0); - zephir_check_call_status(); - } - } - ZEPHIR_INIT_NVAR(&file); - ZEPHIR_INIT_NVAR(&key); - RETURN_CCTOR(&collection); -} - -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseUri) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *server, server_sub, *headers, headers_sub, path, query, scheme, split, uri, _0, _1, _7, _8, _2$$3, _3$$3, _4$$3, _5$$4, _6$$4, _9$$5, _10$$5; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&server_sub); - ZVAL_UNDEF(&headers_sub); - ZVAL_UNDEF(&path); - ZVAL_UNDEF(&query); - ZVAL_UNDEF(&scheme); - ZVAL_UNDEF(&split); - ZVAL_UNDEF(&uri); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_7); - ZVAL_UNDEF(&_8); - ZVAL_UNDEF(&_2$$3); - ZVAL_UNDEF(&_3$$3); - ZVAL_UNDEF(&_4$$3); - ZVAL_UNDEF(&_5$$4); - ZVAL_UNDEF(&_6$$4); - ZVAL_UNDEF(&_9$$5); - ZVAL_UNDEF(&_10$$5); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(server, phalcon_support_collection_collectioninterface_ce) - Z_PARAM_OBJECT_OF_CLASS(headers, phalcon_support_collection_collectioninterface_ce) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 2, 0, &server, &headers); - - - ZEPHIR_INIT_VAR(&uri); - object_init_ex(&uri, phalcon_http_message_uri_ce); - ZEPHIR_CALL_METHOD(NULL, &uri, "__construct", NULL, 116); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&scheme, this_ptr, "calculateurischeme", NULL, 386, server, headers); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_0, &uri, "withscheme", NULL, 387, &scheme); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(&uri, &_0); - ZEPHIR_CALL_METHOD(&split, this_ptr, "calculateurihost", NULL, 388, server, headers); - zephir_check_call_status(); - ZEPHIR_OBS_VAR(&_1); - zephir_array_fetch_long(&_1, &split, 0, PH_NOISY, "phalcon/Http/Message/ServerRequestFactory.zep", 585); - if (EXPECTED(!(ZEPHIR_IS_EMPTY(&_1)))) { - zephir_array_fetch_long(&_3$$3, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Message/ServerRequestFactory.zep", 586); - ZEPHIR_CALL_METHOD(&_2$$3, &uri, "withhost", NULL, 389, &_3$$3); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(&uri, &_2$$3); - ZEPHIR_OBS_VAR(&_4$$3); - zephir_array_fetch_long(&_4$$3, &split, 1, PH_NOISY, "phalcon/Http/Message/ServerRequestFactory.zep", 587); - if (UNEXPECTED(!(ZEPHIR_IS_EMPTY(&_4$$3)))) { - zephir_array_fetch_long(&_6$$4, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Message/ServerRequestFactory.zep", 588); - ZEPHIR_CALL_METHOD(&_5$$4, &uri, "withport", NULL, 390, &_6$$4); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(&uri, &_5$$4); - } - } - ZEPHIR_CALL_METHOD(&path, this_ptr, "calculateuripath", NULL, 391, server); - zephir_check_call_status(); - ZEPHIR_INIT_NVAR(&split); - zephir_fast_explode_str(&split, SL("#"), &path, LONG_MAX); - zephir_array_fetch_long(&_7, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Message/ServerRequestFactory.zep", 597); - ZEPHIR_INIT_NVAR(&path); - zephir_fast_explode_str(&path, SL("?"), &_7, LONG_MAX); - zephir_array_fetch_long(&_8, &path, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Message/ServerRequestFactory.zep", 598); - ZEPHIR_CALL_METHOD(&_0, &uri, "withpath", NULL, 392, &_8); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(&uri, &_0); - if (UNEXPECTED(zephir_fast_count_int(&split) > 1)) { - zephir_array_fetch_long(&_10$$5, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Message/ServerRequestFactory.zep", 601); - ZEPHIR_CALL_METHOD(&_9$$5, &uri, "withfragment", NULL, 393, &_10$$5); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(&uri, &_9$$5); - } - ZEPHIR_CALL_METHOD(&query, this_ptr, "calculateuriquery", NULL, 394, server); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_0, &uri, "withquery", NULL, 395, &query); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(&uri, &_0); - RETURN_CCTOR(&uri); -} - - - - -#ifdef HAVE_CONFIG_H -#endif - - - - - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_Stream) -{ - ZEPHIR_REGISTER_CLASS(Phalcon\\Http\\Message, Stream, phalcon, http_message_stream, phalcon_http_message_stream_method_entry, 0); - - zend_declare_property_null(phalcon_http_message_stream_ce, SL("handle"), ZEND_ACC_PROTECTED); - zend_declare_property_null(phalcon_http_message_stream_ce, SL("stream"), ZEND_ACC_PROTECTED); - zend_class_implements(phalcon_http_message_stream_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\message\\streaminterface"))); - return SUCCESS; -} - -static PHP_METHOD(Phalcon_Http_Message_Stream, __construct) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval mode; - zval *stream, stream_sub, *mode_param = NULL; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&stream_sub); - ZVAL_UNDEF(&mode); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_ZVAL(stream) - Z_PARAM_OPTIONAL - Z_PARAM_STR(mode) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 1, &stream, &mode_param); - if (!mode_param) { - ZEPHIR_INIT_VAR(&mode); - ZVAL_STRING(&mode, "rb"); - } else { - if (UNEXPECTED(Z_TYPE_P(mode_param) != IS_STRING && Z_TYPE_P(mode_param) != IS_NULL)) { - zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'mode' must be of the type string")); - RETURN_MM_NULL(); - } - if (EXPECTED(Z_TYPE_P(mode_param) == IS_STRING)) { - zephir_get_strval(&mode, mode_param); - } else { - ZEPHIR_INIT_VAR(&mode); - } - } - - - ZEPHIR_CALL_METHOD(NULL, this_ptr, "setstream", NULL, 0, stream, &mode); - zephir_check_call_status(); - ZEPHIR_MM_RESTORE(); -} - -static PHP_METHOD(Phalcon_Http_Message_Stream, __destruct) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *this_ptr = getThis(); - - - - ZEPHIR_MM_GROW(); - - ZEPHIR_CALL_METHOD(NULL, this_ptr, "close", NULL, 0); - zephir_check_call_status(); - ZEPHIR_MM_RESTORE(); -} - -static PHP_METHOD(Phalcon_Http_Message_Stream, __toString) -{ - zval _0$$3, _1$$4; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&_0$$3); - ZVAL_UNDEF(&_1$$4); - - - ZEPHIR_MM_GROW(); - - - /* try_start_1: */ - - ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "isreadable", NULL, 0); - zephir_check_call_status_or_jump(try_end_1); - if (UNEXPECTED(zephir_is_true(&_0$$3))) { - ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "isseekable", NULL, 0); - zephir_check_call_status_or_jump(try_end_1); - if (UNEXPECTED(zephir_is_true(&_1$$4))) { - ZEPHIR_CALL_METHOD(NULL, this_ptr, "rewind", NULL, 0); - zephir_check_call_status_or_jump(try_end_1); - } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getcontents", NULL, 0); - zephir_check_call_status_or_jump(try_end_1); - RETURN_MM(); - } - - try_end_1: - - zend_clear_exception(); - RETURN_MM_STRING(""); -} - -static PHP_METHOD(Phalcon_Http_Message_Stream, close) -{ - zval handle, _0; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&handle); - ZVAL_UNDEF(&_0); - - - ZEPHIR_MM_GROW(); - - zephir_read_property(&_0, this_ptr, ZEND_STRL("handle"), PH_NOISY_CC | PH_READONLY); - if (EXPECTED(Z_TYPE_P(&_0) != IS_NULL)) { - ZEPHIR_CALL_METHOD(&handle, this_ptr, "detach", NULL, 0); - zephir_check_call_status(); - zephir_fclose(&handle); - } - ZEPHIR_MM_RESTORE(); -} - -static PHP_METHOD(Phalcon_Http_Message_Stream, detach) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval __$null, handle, _0; - zval *this_ptr = getThis(); - - ZVAL_NULL(&__$null); - ZVAL_UNDEF(&handle); - ZVAL_UNDEF(&_0); - - - ZEPHIR_MM_GROW(); - - zephir_read_property(&_0, this_ptr, ZEND_STRL("handle"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CPY_WRT(&handle, &_0); - zephir_update_property_zval(this_ptr, ZEND_STRL("handle"), &__$null); - RETURN_CCTOR(&handle); -} - -static PHP_METHOD(Phalcon_Http_Message_Stream, eof) -{ - zval _0, _1$$3; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1$$3); - - - - zephir_read_property(&_0, this_ptr, ZEND_STRL("handle"), PH_NOISY_CC | PH_READONLY); - if (UNEXPECTED(zephir_is_true(&_0))) { - zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("handle"), PH_NOISY_CC | PH_READONLY); - RETURN_BOOL(zephir_feof(&_1$$3)); - } - RETURN_BOOL(1); -} - -static PHP_METHOD(Phalcon_Http_Message_Stream, getContents) -{ - zval data, _0; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&data); - ZVAL_UNDEF(&_0); - - - ZEPHIR_MM_GROW(); - - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkhandle", NULL, 77); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkreadable", NULL, 78); - zephir_check_call_status(); - zephir_read_property(&_0, this_ptr, ZEND_STRL("handle"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&data, "stream_get_contents", NULL, 79, &_0); - zephir_check_call_status(); - if (UNEXPECTED(ZEPHIR_IS_FALSE_IDENTICAL(&data))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_RuntimeException, "Could not read from the file/stream", "phalcon/Http/Message/Stream.zep", 139); - return; - } - RETURN_CCTOR(&data); -} - -static PHP_METHOD(Phalcon_Http_Message_Stream, getMetadata) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *key = NULL, key_sub, __$null, metadata, _0, _1, _2; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&key_sub); - ZVAL_NULL(&__$null); - ZVAL_UNDEF(&metadata); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(0, 1) - Z_PARAM_OPTIONAL - Z_PARAM_ZVAL_OR_NULL(key) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 0, 1, &key); - if (!key) { - key = &key_sub; - key = &__$null; - } - - - zephir_read_property(&_0, this_ptr, ZEND_STRL("handle"), PH_NOISY_CC | PH_READONLY); - if (UNEXPECTED(Z_TYPE_P(&_0) == IS_NULL)) { - RETURN_MM_NULL(); - } - zephir_read_property(&_1, this_ptr, ZEND_STRL("handle"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&metadata, "stream_get_meta_data", NULL, 80, &_1); - zephir_check_call_status(); - if (UNEXPECTED(Z_TYPE_P(key) == IS_NULL)) { - RETURN_CCTOR(&metadata); - } - ZEPHIR_INIT_VAR(&_2); - array_init(&_2); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getarrval", NULL, 81, &metadata, key, &_2); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_Stream, getSize) -{ - zval stats, _0, _1$$3, _2$$4, _3$$4; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&stats); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1$$3); - ZVAL_UNDEF(&_2$$4); - ZVAL_UNDEF(&_3$$4); - - - ZEPHIR_MM_GROW(); - - zephir_read_property(&_0, this_ptr, ZEND_STRL("handle"), PH_NOISY_CC | PH_READONLY); - if (EXPECTED(Z_TYPE_P(&_0) != IS_NULL)) { - zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("handle"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&stats, "fstat", NULL, 82, &_1$$3); - zephir_check_call_status(); - if (EXPECTED(!ZEPHIR_IS_FALSE_IDENTICAL(&stats))) { - ZEPHIR_INIT_VAR(&_2$$4); - ZVAL_STRING(&_2$$4, "size"); - ZVAL_NULL(&_3$$4); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getarrval", NULL, 81, &stats, &_2$$4, &_3$$4); - zephir_check_call_status(); - RETURN_MM(); - } - } - RETURN_MM_NULL(); -} - -static PHP_METHOD(Phalcon_Http_Message_Stream, isReadable) -{ - zval _2; - zval mode, _0, _1, _3; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&mode); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_3); - ZVAL_UNDEF(&_2); - - - ZEPHIR_MM_GROW(); - - ZEPHIR_INIT_VAR(&_1); - ZVAL_STRING(&_1, "mode"); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmetadata", NULL, 0, &_1); - zephir_check_call_status(); - zephir_cast_to_string(&_2, &_0); - ZEPHIR_CPY_WRT(&mode, &_2); - ZEPHIR_INIT_NVAR(&_1); - ZVAL_STRING(&_1, "r+"); - ZEPHIR_CALL_FUNCTION(&_3, "strpbrk", NULL, 83, &mode, &_1); - zephir_check_call_status(); - RETURN_MM_BOOL(!ZEPHIR_IS_FALSE_IDENTICAL(&_3)); -} - -static PHP_METHOD(Phalcon_Http_Message_Stream, isSeekable) -{ - zval _0, _1; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - - - ZEPHIR_MM_GROW(); - - ZEPHIR_INIT_VAR(&_1); - ZVAL_STRING(&_1, "seekable"); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmetadata", NULL, 0, &_1); - zephir_check_call_status(); - RETURN_MM_BOOL(zephir_get_boolval(&_0)); -} - -static PHP_METHOD(Phalcon_Http_Message_Stream, isWritable) -{ - zval _2; - zval mode, _0, _1, _3; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&mode); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_3); - ZVAL_UNDEF(&_2); - - - ZEPHIR_MM_GROW(); - - ZEPHIR_INIT_VAR(&_1); - ZVAL_STRING(&_1, "mode"); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmetadata", NULL, 0, &_1); - zephir_check_call_status(); - zephir_cast_to_string(&_2, &_0); - ZEPHIR_CPY_WRT(&mode, &_2); - ZEPHIR_INIT_NVAR(&_1); - ZVAL_STRING(&_1, "xwca+"); - ZEPHIR_CALL_FUNCTION(&_3, "strpbrk", NULL, 83, &mode, &_1); - zephir_check_call_status(); - RETURN_MM_BOOL(!ZEPHIR_IS_FALSE_IDENTICAL(&_3)); -} - -static PHP_METHOD(Phalcon_Http_Message_Stream, read) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *length, length_sub, data, _0; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&length_sub); - ZVAL_UNDEF(&data); - ZVAL_UNDEF(&_0); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(length) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &length); - - - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkhandle", NULL, 77); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkreadable", NULL, 78); - zephir_check_call_status(); - zephir_read_property(&_0, this_ptr, ZEND_STRL("handle"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&data, "fread", NULL, 84, &_0, length); - zephir_check_call_status(); - if (UNEXPECTED(ZEPHIR_IS_FALSE_IDENTICAL(&data))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_RuntimeException, "Could not read from the file/stream", "phalcon/Http/Message/Stream.zep", 239); - return; - } - RETURN_CCTOR(&data); -} - -static PHP_METHOD(Phalcon_Http_Message_Stream, rewind) -{ - zval _0; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&_0); - - - ZEPHIR_MM_GROW(); - - ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "seek", NULL, 0, &_0); - zephir_check_call_status(); - ZEPHIR_MM_RESTORE(); -} - -static PHP_METHOD(Phalcon_Http_Message_Stream, seek) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *offset, offset_sub, *whence = NULL, whence_sub, seeker, _0; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&offset_sub); - ZVAL_UNDEF(&whence_sub); - ZVAL_UNDEF(&seeker); - ZVAL_UNDEF(&_0); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_ZVAL(offset) - Z_PARAM_OPTIONAL - Z_PARAM_ZVAL(whence) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 1, &offset, &whence); - if (!whence) { - whence = &whence_sub; - ZEPHIR_INIT_VAR(whence); - ZVAL_LONG(whence, 0); - } - - - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkhandle", NULL, 77); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkseekable", NULL, 85); - zephir_check_call_status(); - zephir_read_property(&_0, this_ptr, ZEND_STRL("handle"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&seeker, "fseek", NULL, 86, &_0, offset, whence); - zephir_check_call_status(); - if (UNEXPECTED(!ZEPHIR_IS_LONG_IDENTICAL(&seeker, 0))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_RuntimeException, "Could not seek on the file pointer", "phalcon/Http/Message/Stream.zep", 272); - return; - } - ZEPHIR_MM_RESTORE(); -} - -static PHP_METHOD(Phalcon_Http_Message_Stream, setStream) -{ - zend_bool _7, _8; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval mode; - zval *stream, stream_sub, *mode_param = NULL, __$false, handle, version, _9, _10, _0$$3, _1$$3, _2$$3, _3$$4, _4$$4, _5$$5, _6$$5; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&stream_sub); - ZVAL_BOOL(&__$false, 0); - ZVAL_UNDEF(&handle); - ZVAL_UNDEF(&version); - ZVAL_UNDEF(&_9); - ZVAL_UNDEF(&_10); - ZVAL_UNDEF(&_0$$3); - ZVAL_UNDEF(&_1$$3); - ZVAL_UNDEF(&_2$$3); - ZVAL_UNDEF(&_3$$4); - ZVAL_UNDEF(&_4$$4); - ZVAL_UNDEF(&_5$$5); - ZVAL_UNDEF(&_6$$5); - ZVAL_UNDEF(&mode); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_ZVAL(stream) - Z_PARAM_OPTIONAL - Z_PARAM_STR(mode) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 1, &stream, &mode_param); - if (!mode_param) { - ZEPHIR_INIT_VAR(&mode); - ZVAL_STRING(&mode, "rb"); - } else { - if (UNEXPECTED(Z_TYPE_P(mode_param) != IS_STRING && Z_TYPE_P(mode_param) != IS_NULL)) { - zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'mode' must be of the type string")); - RETURN_MM_NULL(); - } - if (EXPECTED(Z_TYPE_P(mode_param) == IS_STRING)) { - zephir_get_strval(&mode, mode_param); - } else { - ZEPHIR_INIT_VAR(&mode); - } - } - - - ZEPHIR_CPY_WRT(&handle, stream); - ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 87); - zephir_check_call_status(); - ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$false); - if (EXPECTED(Z_TYPE_P(stream) == IS_STRING)) { - ZEPHIR_INIT_VAR(&_0$$3); - ZVAL_STRING(&_0$$3, "8.0"); - ZEPHIR_INIT_VAR(&_1$$3); - ZVAL_STRING(&_1$$3, ">="); - ZEPHIR_CALL_FUNCTION(&_2$$3, "version_compare", NULL, 88, &version, &_0$$3, &_1$$3); - zephir_check_call_status(); - if (zephir_is_true(&_2$$3)) { - ZEPHIR_INIT_VAR(&_3$$4); - ZEPHIR_INIT_NVAR(&_3$$4); - zephir_create_closure_ex(&_3$$4, NULL, phalcon_0__closure_ce, SL("__invoke")); - ZVAL_LONG(&_4$$4, 2); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 89, &_3$$4, &_4$$4); - zephir_check_call_status(); - } else { - ZEPHIR_INIT_VAR(&_5$$5); - ZEPHIR_INIT_NVAR(&_5$$5); - zephir_create_closure_ex(&_5$$5, NULL, phalcon_1__closure_ce, SL("__invoke")); - ZVAL_LONG(&_6$$5, 2); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 89, &_5$$5, &_6$$5); - zephir_check_call_status(); - } - ZEPHIR_CALL_FUNCTION(&handle, "fopen", NULL, 90, stream, &mode); - zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 91); - zephir_check_call_status(); - } - _7 = ZEPHIR_GLOBAL(warning).enable; - if (!(_7)) { - _7 = Z_TYPE_P(&handle) != IS_RESOURCE; - } - _8 = _7; - if (!(_8)) { - ZEPHIR_CALL_FUNCTION(&_9, "get_resource_type", NULL, 92, &handle); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_10); - ZVAL_STRING(&_10, "stream"); - _8 = !ZEPHIR_IS_IDENTICAL(&_10, &_9); - } - if (UNEXPECTED(_8)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_RuntimeException, "The stream provided is not valid (string/resource) or could not be opened.", "phalcon/Http/Message/Stream.zep", 320); - return; - } - zephir_update_property_zval(this_ptr, ZEND_STRL("handle"), &handle); - zephir_update_property_zval(this_ptr, ZEND_STRL("stream"), stream); - ZEPHIR_MM_RESTORE(); -} - -static PHP_METHOD(Phalcon_Http_Message_Stream, tell) -{ - zval position, _0; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&position); - ZVAL_UNDEF(&_0); - - - ZEPHIR_MM_GROW(); - - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkhandle", NULL, 77); - zephir_check_call_status(); - zephir_read_property(&_0, this_ptr, ZEND_STRL("handle"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&position, "ftell", NULL, 93, &_0); - zephir_check_call_status(); - if (UNEXPECTED(Z_TYPE_P(&position) != IS_LONG)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(zend_ce_exception, "Could not retrieve the pointer position", "phalcon/Http/Message/Stream.zep", 341); - return; - } - RETURN_CCTOR(&position); -} - -static PHP_METHOD(Phalcon_Http_Message_Stream, write) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *data, data_sub, bytes, _0; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&data_sub); - ZVAL_UNDEF(&bytes); - ZVAL_UNDEF(&_0); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(data) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &data); - - - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkhandle", NULL, 77); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkwritable", NULL, 94); - zephir_check_call_status(); - zephir_read_property(&_0, this_ptr, ZEND_STRL("handle"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_INIT_VAR(&bytes); - zephir_fwrite(&bytes, &_0, data); - if (UNEXPECTED(ZEPHIR_IS_FALSE_IDENTICAL(&bytes))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_RuntimeException, "Could not write to the file/stream", "phalcon/Http/Message/Stream.zep", 364); - return; - } - RETURN_CCTOR(&bytes); -} - -static PHP_METHOD(Phalcon_Http_Message_Stream, checkHandle) -{ - zval _0; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&_0); - - - - zephir_read_property(&_0, this_ptr, ZEND_STRL("handle"), PH_NOISY_CC | PH_READONLY); - if (UNEXPECTED(Z_TYPE_P(&_0) == IS_NULL)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(spl_ce_RuntimeException, "A valid resource is required.", "phalcon/Http/Message/Stream.zep", 376); - return; - } -} - -static PHP_METHOD(Phalcon_Http_Message_Stream, checkReadable) -{ - zval _0; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&_0); - - - ZEPHIR_MM_GROW(); - - ZEPHIR_CALL_METHOD(&_0, this_ptr, "isreadable", NULL, 0); - zephir_check_call_status(); - if (UNEXPECTED(!ZEPHIR_IS_TRUE_IDENTICAL(&_0))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_RuntimeException, "The resource is not readable.", "phalcon/Http/Message/Stream.zep", 386); - return; - } - ZEPHIR_MM_RESTORE(); -} - -static PHP_METHOD(Phalcon_Http_Message_Stream, checkSeekable) -{ - zval _0; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&_0); - - - ZEPHIR_MM_GROW(); - - ZEPHIR_CALL_METHOD(&_0, this_ptr, "isseekable", NULL, 0); - zephir_check_call_status(); - if (UNEXPECTED(!ZEPHIR_IS_TRUE_IDENTICAL(&_0))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_RuntimeException, "The resource is not seekable.", "phalcon/Http/Message/Stream.zep", 396); - return; - } - ZEPHIR_MM_RESTORE(); -} - -static PHP_METHOD(Phalcon_Http_Message_Stream, checkWritable) -{ - zval _0; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&_0); - - - ZEPHIR_MM_GROW(); - - ZEPHIR_CALL_METHOD(&_0, this_ptr, "iswritable", NULL, 0); - zephir_check_call_status(); - if (UNEXPECTED(!ZEPHIR_IS_TRUE_IDENTICAL(&_0))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_RuntimeException, "The resource is not writable.", "phalcon/Http/Message/Stream.zep", 406); - return; - } - ZEPHIR_MM_RESTORE(); -} - -static PHP_METHOD(Phalcon_Http_Message_Stream, getArrVal) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *collection_param = NULL, *index, index_sub, *defaultValue = NULL, defaultValue_sub, __$null, value; - zval collection; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&collection); - ZVAL_UNDEF(&index_sub); - ZVAL_UNDEF(&defaultValue_sub); - ZVAL_NULL(&__$null); - ZVAL_UNDEF(&value); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(2, 3) - Z_PARAM_ARRAY(collection) - Z_PARAM_ZVAL(index) - Z_PARAM_OPTIONAL - Z_PARAM_ZVAL_OR_NULL(defaultValue) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 2, 1, &collection_param, &index, &defaultValue); - ZEPHIR_OBS_COPY_OR_DUP(&collection, collection_param); - if (!defaultValue) { - defaultValue = &defaultValue_sub; - defaultValue = &__$null; - } - - - if (UNEXPECTED(!(zephir_array_isset_fetch(&value, &collection, index, 1)))) { - RETVAL_ZVAL(defaultValue, 1, 0); - RETURN_MM(); - } - RETURN_CTOR(&value); -} - - - - -#ifdef HAVE_CONFIG_H -#endif - - - - - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_StreamFactory) -{ - ZEPHIR_REGISTER_CLASS(Phalcon\\Http\\Message, StreamFactory, phalcon, http_message_streamfactory, phalcon_http_message_streamfactory_method_entry, ZEND_ACC_FINAL_CLASS); - - zend_class_implements(phalcon_http_message_streamfactory_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\message\\streamfactoryinterface"))); - return SUCCESS; -} - -static PHP_METHOD(Phalcon_Http_Message_StreamFactory, createStream) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *content_param = NULL, handle, _0, _1; - zval content; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&content); - ZVAL_UNDEF(&handle); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(0, 1) - Z_PARAM_OPTIONAL - Z_PARAM_STR(content) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 0, 1, &content_param); - if (!content_param) { - ZEPHIR_INIT_VAR(&content); - ZVAL_STRING(&content, ""); - } else { - if (UNEXPECTED(Z_TYPE_P(content_param) != IS_STRING && Z_TYPE_P(content_param) != IS_NULL)) { - zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'content' must be of the type string")); - RETURN_MM_NULL(); - } - if (EXPECTED(Z_TYPE_P(content_param) == IS_STRING)) { - zephir_get_strval(&content, content_param); - } else { - ZEPHIR_INIT_VAR(&content); - } - } - - - ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, "php://temp"); - ZEPHIR_INIT_VAR(&_1); - ZVAL_STRING(&_1, "r+b"); - ZEPHIR_CALL_FUNCTION(&handle, "fopen", NULL, 90, &_0, &_1); - zephir_check_call_status(); - if (UNEXPECTED(ZEPHIR_IS_FALSE_IDENTICAL(&handle))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Cannot write to file.", "phalcon/Http/Message/StreamFactory.zep", 41); - return; - } - zephir_fwrite(NULL, &handle, &content); - ZEPHIR_CALL_FUNCTION(NULL, "rewind", NULL, 396, &handle); - zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "createstreamfromresource", NULL, 397, &handle); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_StreamFactory, createStreamFromFile) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *filename_param = NULL, *mode_param = NULL; - zval filename, mode; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&filename); - ZVAL_UNDEF(&mode); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_STR(filename) - Z_PARAM_OPTIONAL - Z_PARAM_STR(mode) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 1, &filename_param, &mode_param); - if (UNEXPECTED(Z_TYPE_P(filename_param) != IS_STRING && Z_TYPE_P(filename_param) != IS_NULL)) { - zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'filename' must be of the type string")); - RETURN_MM_NULL(); - } - if (EXPECTED(Z_TYPE_P(filename_param) == IS_STRING)) { - zephir_get_strval(&filename, filename_param); - } else { - ZEPHIR_INIT_VAR(&filename); - } - if (!mode_param) { - ZEPHIR_INIT_VAR(&mode); - ZVAL_STRING(&mode, "r+b"); - } else { - if (UNEXPECTED(Z_TYPE_P(mode_param) != IS_STRING && Z_TYPE_P(mode_param) != IS_NULL)) { - zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'mode' must be of the type string")); - RETURN_MM_NULL(); - } - if (EXPECTED(Z_TYPE_P(mode_param) == IS_STRING)) { - zephir_get_strval(&mode, mode_param); - } else { - ZEPHIR_INIT_VAR(&mode); - } - } - - - object_init_ex(return_value, phalcon_http_message_stream_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 43, &filename, &mode); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_StreamFactory, createStreamFromResource) -{ - zend_bool _0; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *phpResource, phpResource_sub, _1, _2; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&phpResource_sub); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(phpResource) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &phpResource); - - - _0 = Z_TYPE_P(phpResource) != IS_RESOURCE; - if (!(_0)) { - ZEPHIR_CALL_FUNCTION(&_1, "get_resource_type", NULL, 92, phpResource); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_2); - ZVAL_STRING(&_2, "stream"); - _0 = !ZEPHIR_IS_IDENTICAL(&_2, &_1); - } - if (UNEXPECTED(_0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Invalid stream provided", "phalcon/Http/Message/StreamFactory.zep", 79); - return; - } - object_init_ex(return_value, phalcon_http_message_stream_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 43, phpResource); - zephir_check_call_status(); - RETURN_MM(); -} - - - - -#ifdef HAVE_CONFIG_H -#endif - - - - - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_UploadedFile) -{ - ZEPHIR_REGISTER_CLASS(Phalcon\\Http\\Message, UploadedFile, phalcon, http_message_uploadedfile, phalcon_http_message_uploadedfile_method_entry, ZEND_ACC_FINAL_CLASS); - - zend_declare_property_bool(phalcon_http_message_uploadedfile_ce, SL("alreadyMoved"), 0, ZEND_ACC_PRIVATE); - zend_declare_property_null(phalcon_http_message_uploadedfile_ce, SL("clientFilename"), ZEND_ACC_PRIVATE); - zend_declare_property_null(phalcon_http_message_uploadedfile_ce, SL("clientMediaType"), ZEND_ACC_PRIVATE); - zend_declare_property_long(phalcon_http_message_uploadedfile_ce, SL("error"), 0, ZEND_ACC_PRIVATE); - zend_declare_property_string(phalcon_http_message_uploadedfile_ce, SL("fileName"), "", ZEND_ACC_PRIVATE); - zend_declare_property_null(phalcon_http_message_uploadedfile_ce, SL("size"), ZEND_ACC_PRIVATE); - zend_declare_property_null(phalcon_http_message_uploadedfile_ce, SL("stream"), ZEND_ACC_PRIVATE); - zend_class_implements(phalcon_http_message_uploadedfile_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\message\\uploadedfileinterface"))); - return SUCCESS; -} - -static PHP_METHOD(Phalcon_Http_Message_UploadedFile, getClientFilename) -{ - zval *this_ptr = getThis(); - - - - RETURN_MEMBER(getThis(), "clientFilename"); -} - -static PHP_METHOD(Phalcon_Http_Message_UploadedFile, getClientMediaType) -{ - zval *this_ptr = getThis(); - - - - RETURN_MEMBER(getThis(), "clientMediaType"); -} - -static PHP_METHOD(Phalcon_Http_Message_UploadedFile, getError) -{ - zval *this_ptr = getThis(); - - - - RETURN_MEMBER(getThis(), "error"); -} - -static PHP_METHOD(Phalcon_Http_Message_UploadedFile, getSize) -{ - zval *this_ptr = getThis(); - - - - RETURN_MEMBER(getThis(), "size"); -} - -static PHP_METHOD(Phalcon_Http_Message_UploadedFile, __construct) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval clientFilename, clientMediaType; - zend_long size, error, ZEPHIR_LAST_CALL_STATUS; - zval *stream, stream_sub, *size_param = NULL, *error_param = NULL, *clientFilename_param = NULL, *clientMediaType_param = NULL, _0; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&stream_sub); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&clientFilename); - ZVAL_UNDEF(&clientMediaType); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 5) - Z_PARAM_ZVAL(stream) - Z_PARAM_OPTIONAL - Z_PARAM_LONG_OR_NULL(size, is_null_true) - Z_PARAM_LONG(error) - Z_PARAM_STR_OR_NULL(clientFilename) - Z_PARAM_STR_OR_NULL(clientMediaType) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 4, &stream, &size_param, &error_param, &clientFilename_param, &clientMediaType_param); - if (!size_param) { - size = 0; - } else { - size = zephir_get_intval(size_param); - } - if (!error_param) { - error = 0; - } else { - error = zephir_get_intval(error_param); - } - if (!clientFilename_param) { - ZEPHIR_INIT_VAR(&clientFilename); - } else { - zephir_get_strval(&clientFilename, clientFilename_param); - } - if (!clientMediaType_param) { - ZEPHIR_INIT_VAR(&clientMediaType); - } else { - zephir_get_strval(&clientMediaType, clientMediaType_param); - } - - - ZVAL_LONG(&_0, error); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkstream", NULL, 398, stream, &_0); - zephir_check_call_status(); - ZVAL_LONG(&_0, error); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkerror", NULL, 399, &_0); - zephir_check_call_status(); - ZEPHIR_INIT_ZVAL_NREF(_0); - ZVAL_LONG(&_0, size); - zephir_update_property_zval(this_ptr, ZEND_STRL("size"), &_0); - zephir_update_property_zval(this_ptr, ZEND_STRL("clientFilename"), &clientFilename); - zephir_update_property_zval(this_ptr, ZEND_STRL("clientMediaType"), &clientMediaType); - ZEPHIR_MM_RESTORE(); -} - -static PHP_METHOD(Phalcon_Http_Message_UploadedFile, getStream) -{ - zval _0, _4, _5, _1$$3, _2$$3, _3$$3, _6$$5, _7$$5; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_4); - ZVAL_UNDEF(&_5); - ZVAL_UNDEF(&_1$$3); - ZVAL_UNDEF(&_2$$3); - ZVAL_UNDEF(&_3$$3); - ZVAL_UNDEF(&_6$$5); - ZVAL_UNDEF(&_7$$5); - - - ZEPHIR_MM_GROW(); - - zephir_read_property(&_0, this_ptr, ZEND_STRL("error"), PH_NOISY_CC | PH_READONLY); - if (UNEXPECTED(!ZEPHIR_IS_LONG_IDENTICAL(&_0, 0))) { - ZEPHIR_INIT_VAR(&_1$$3); - object_init_ex(&_1$$3, phalcon_http_message_exception_invalidargumentexception_ce); - zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("error"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "geterrordescription", NULL, 400, &_3$$3); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 40, &_2$$3); - zephir_check_call_status(); - zephir_throw_exception_debug(&_1$$3, "phalcon/Http/Message/UploadedFile.zep", 156); - ZEPHIR_MM_RESTORE(); - return; - } - zephir_read_property(&_4, this_ptr, ZEND_STRL("alreadyMoved"), PH_NOISY_CC | PH_READONLY); - if (UNEXPECTED(zephir_is_true(&_4))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "The file has already been moved to the target location", "phalcon/Http/Message/UploadedFile.zep", 162); - return; - } - ZEPHIR_OBS_VAR(&_5); - zephir_read_property(&_5, this_ptr, ZEND_STRL("stream"), PH_NOISY_CC); - if (UNEXPECTED(!(zephir_is_instance_of(&_5, SL("Psr\\Http\\Message\\StreamInterface"))))) { - ZEPHIR_INIT_VAR(&_6$$5); - object_init_ex(&_6$$5, phalcon_http_message_stream_ce); - zephir_read_property(&_7$$5, this_ptr, ZEND_STRL("fileName"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, &_6$$5, "__construct", NULL, 43, &_7$$5); - zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("stream"), &_6$$5); - } - RETURN_MM_MEMBER(getThis(), "stream"); -} - -static PHP_METHOD(Phalcon_Http_Message_UploadedFile, moveTo) -{ - zend_bool _5, _6, _9, _13, _15, _16; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *targetPath, targetPath_sub, __$true, __$false, sapi, _0, _1, _7, _8, _10, _11, _12, _14, _2$$4, _3$$4, _4$$4, _17$$7, _18$$7; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&targetPath_sub); - ZVAL_BOOL(&__$true, 1); - ZVAL_BOOL(&__$false, 0); - ZVAL_UNDEF(&sapi); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_7); - ZVAL_UNDEF(&_8); - ZVAL_UNDEF(&_10); - ZVAL_UNDEF(&_11); - ZVAL_UNDEF(&_12); - ZVAL_UNDEF(&_14); - ZVAL_UNDEF(&_2$$4); - ZVAL_UNDEF(&_3$$4); - ZVAL_UNDEF(&_4$$4); - ZVAL_UNDEF(&_17$$7); - ZVAL_UNDEF(&_18$$7); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(targetPath) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &targetPath); - - - zephir_read_property(&_0, this_ptr, ZEND_STRL("alreadyMoved"), PH_NOISY_CC | PH_READONLY); - if (UNEXPECTED(zephir_is_true(&_0))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "File has already been moved", "phalcon/Http/Message/UploadedFile.zep", 211); - return; - } - zephir_read_property(&_1, this_ptr, ZEND_STRL("error"), PH_NOISY_CC | PH_READONLY); - if (UNEXPECTED(!ZEPHIR_IS_LONG_IDENTICAL(&_1, 0))) { - ZEPHIR_INIT_VAR(&_2$$4); - object_init_ex(&_2$$4, phalcon_http_message_exception_invalidargumentexception_ce); - zephir_read_property(&_4$$4, this_ptr, ZEND_STRL("error"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "geterrordescription", NULL, 400, &_4$$4); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 40, &_3$$4); - zephir_check_call_status(); - zephir_throw_exception_debug(&_2$$4, "phalcon/Http/Message/UploadedFile.zep", 217); - ZEPHIR_MM_RESTORE(); - return; - } - _5 = Z_TYPE_P(targetPath) == IS_STRING; - if (_5) { - _5 = !(ZEPHIR_IS_EMPTY(targetPath)); - } - _6 = _5; - if (_6) { - ZEPHIR_CALL_FUNCTION(&_7, "dirname", NULL, 401, targetPath); - zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_8, "is_dir", NULL, 160, &_7); - zephir_check_call_status(); - _6 = zephir_is_true(&_8); - } - _9 = _6; - if (_9) { - ZEPHIR_CALL_FUNCTION(&_10, "dirname", NULL, 401, targetPath); - zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_11, "is_writable", NULL, 402, &_10); - zephir_check_call_status(); - _9 = zephir_is_true(&_11); - } - if (UNEXPECTED(!(_9))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Target folder is empty string, not a folder or not writable", "phalcon/Http/Message/UploadedFile.zep", 229); - return; - } - ZEPHIR_INIT_VAR(&_12); - ZVAL_STRING(&_12, "PHP_SAPI"); - ZEPHIR_CALL_FUNCTION(&sapi, "constant", NULL, 147, &_12); - zephir_check_call_status(); - _13 = ZEPHIR_IS_EMPTY(&sapi); - if (!(_13)) { - ZEPHIR_OBS_VAR(&_14); - zephir_read_property(&_14, this_ptr, ZEND_STRL("fileName"), PH_NOISY_CC); - _13 = !(ZEPHIR_IS_EMPTY(&_14)); - } - _15 = _13; - if (!(_15)) { - _15 = zephir_start_with_str(&sapi, SL("cli")); - } - _16 = _15; - if (!(_16)) { - _16 = zephir_start_with_str(&sapi, SL("phpdbg")); - } - if (UNEXPECTED(_16)) { - ZEPHIR_CALL_METHOD(NULL, this_ptr, "storefile", NULL, 403, targetPath); - zephir_check_call_status(); - } else { - zephir_read_property(&_17$$7, this_ptr, ZEND_STRL("fileName"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_18$$7, "move_uploaded_file", NULL, 404, &_17$$7, targetPath); - zephir_check_call_status(); - if (!ZEPHIR_IS_TRUE_IDENTICAL(&_18$$7)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "The file cannot be moved to the target folder", "phalcon/Http/Message/UploadedFile.zep", 243); - return; - } - } - if (1) { - zephir_update_property_zval(this_ptr, ZEND_STRL("alreadyMoved"), &__$true); - } else { - zephir_update_property_zval(this_ptr, ZEND_STRL("alreadyMoved"), &__$false); - } - ZEPHIR_MM_RESTORE(); -} - -static PHP_METHOD(Phalcon_Http_Message_UploadedFile, checkError) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *error_param = NULL, _0, _1, _2, _3; - zend_long error, ZEPHIR_LAST_CALL_STATUS; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_3); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_LONG(error) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &error_param); - error = zephir_get_intval(error_param); - - - ZVAL_LONG(&_1, error); - ZVAL_LONG(&_2, 0); - ZVAL_LONG(&_3, 8); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "isbetween", NULL, 405, &_1, &_2, &_3); - zephir_check_call_status(); - if (UNEXPECTED(!ZEPHIR_IS_TRUE_IDENTICAL(&_0))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Invalid error. Must be one of the UPLOAD_ERR_* constants", "phalcon/Http/Message/UploadedFile.zep", 260); - return; - } - ZEPHIR_INIT_ZVAL_NREF(_1); - ZVAL_LONG(&_1, error); - zephir_update_property_zval(this_ptr, ZEND_STRL("error"), &_1); - ZEPHIR_MM_RESTORE(); -} - -static PHP_METHOD(Phalcon_Http_Message_UploadedFile, checkStream) -{ - zend_bool _0$$3; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long error, ZEPHIR_LAST_CALL_STATUS; - zval *stream, stream_sub, *error_param = NULL, _1$$5; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&stream_sub); - ZVAL_UNDEF(&_1$$5); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_ZVAL(stream) - Z_PARAM_LONG(error) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 2, 0, &stream, &error_param); - error = zephir_get_intval(error_param); - - - if (UNEXPECTED(0 == error)) { - do { - _0$$3 = 1; - if (_0$$3 == (Z_TYPE_P(stream) == IS_STRING)) { - zephir_update_property_zval(this_ptr, ZEND_STRL("fileName"), stream); - break; - } - if (_0$$3 == (Z_TYPE_P(stream) == IS_RESOURCE)) { - ZEPHIR_INIT_VAR(&_1$$5); - object_init_ex(&_1$$5, phalcon_http_message_stream_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$5, "__construct", NULL, 43, stream); - zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("stream"), &_1$$5); - break; - } - if (_0$$3 == (zephir_is_instance_of(stream, SL("Psr\\Http\\Message\\StreamInterface")))) { - zephir_update_property_zval(this_ptr, ZEND_STRL("stream"), stream); - break; - } - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Invalid stream or file passed", "phalcon/Http/Message/UploadedFile.zep", 286); - return; - } while(0); - - } - ZEPHIR_MM_RESTORE(); -} - -static PHP_METHOD(Phalcon_Http_Message_UploadedFile, getErrorDescription) -{ - zval errors; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *error_param = NULL, _0$$3; - zend_long error; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&_0$$3); - ZVAL_UNDEF(&errors); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_LONG(error) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &error_param); - error = zephir_get_intval(error_param); - - - ZEPHIR_INIT_VAR(&errors); - zephir_create_array(&errors, 8, 0); - add_index_stringl(&errors, 0, SL("There is no error, the file uploaded with success.")); - add_index_stringl(&errors, 1, SL("The uploaded file exceeds the upload_max_filesize directive in php.ini.")); - add_index_stringl(&errors, 2, SL("The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.")); - add_index_stringl(&errors, 3, SL("The uploaded file was only partially uploaded.")); - add_index_stringl(&errors, 4, SL("No file was uploaded.")); - add_index_stringl(&errors, 6, SL("Missing a temporary folder.")); - add_index_stringl(&errors, 7, SL("Failed to write file to disk.")); - add_index_stringl(&errors, 8, SL("A PHP extension stopped the file upload.")); - if (EXPECTED((1 == zephir_array_isset_long(&errors, error)))) { - zephir_array_fetch_long(&_0$$3, &errors, error, PH_NOISY | PH_READONLY, "phalcon/Http/Message/UploadedFile.zep", 314); - RETURN_CTOR(&_0$$3); - } - RETURN_MM_STRING("Unknown upload error"); -} - -static PHP_METHOD(Phalcon_Http_Message_UploadedFile, storeFile) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zephir_fcall_cache_entry *_3 = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *targetPath_param = NULL, data, handle, stream, _0, _1, _2$$4; - zval targetPath; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&targetPath); - ZVAL_UNDEF(&data); - ZVAL_UNDEF(&handle); - ZVAL_UNDEF(&stream); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2$$4); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR(targetPath) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &targetPath_param); - zephir_get_strval(&targetPath, targetPath_param); - - - ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, "w+b"); - ZEPHIR_CALL_FUNCTION(&handle, "fopen", NULL, 90, &targetPath, &_0); - zephir_check_call_status(); - if (UNEXPECTED(ZEPHIR_IS_FALSE_IDENTICAL(&handle))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Cannot write to file.", "phalcon/Http/Message/UploadedFile.zep", 331); - return; - } - ZEPHIR_CALL_METHOD(&stream, this_ptr, "getstream", NULL, 406); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &stream, "rewind", NULL, 0); - zephir_check_call_status(); - while (1) { - ZEPHIR_CALL_METHOD(&_1, &stream, "eof", NULL, 0); - zephir_check_call_status(); - if (!(!ZEPHIR_IS_TRUE_IDENTICAL(&_1))) { - break; - } - ZVAL_LONG(&_2$$4, 2048); - ZEPHIR_CALL_METHOD(&data, &stream, "read", &_3, 0, &_2$$4); - zephir_check_call_status(); - zephir_fwrite(NULL, &handle, &data); - } - zephir_fclose(&handle); - ZEPHIR_MM_RESTORE(); -} - -static PHP_METHOD(Phalcon_Http_Message_UploadedFile, isBetween) -{ - zend_bool _0; - zval *value_param = NULL, *from_param = NULL, *to_param = NULL; - zend_long value, from, to; - zval *this_ptr = getThis(); - -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(3, 3) - Z_PARAM_LONG(value) - Z_PARAM_LONG(from) - Z_PARAM_LONG(to) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - zephir_fetch_params_without_memory_grow(3, 0, &value_param, &from_param, &to_param); - value = zephir_get_intval(value_param); - from = zephir_get_intval(from_param); - to = zephir_get_intval(to_param); - - - _0 = value >= from; - if (_0) { - _0 = value <= to; - } - RETURN_BOOL(_0); -} - - - - -#ifdef HAVE_CONFIG_H -#endif - - - - - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_UploadedFileFactory) -{ - ZEPHIR_REGISTER_CLASS(Phalcon\\Http\\Message, UploadedFileFactory, phalcon, http_message_uploadedfilefactory, phalcon_http_message_uploadedfilefactory_method_entry, ZEND_ACC_FINAL_CLASS); - - zend_class_implements(phalcon_http_message_uploadedfilefactory_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\message\\uploadedfilefactoryinterface"))); - return SUCCESS; -} - -static PHP_METHOD(Phalcon_Http_Message_UploadedFileFactory, createUploadedFile) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval clientFilename, clientMediaType; - zend_long size, error, ZEPHIR_LAST_CALL_STATUS; - zval *stream, stream_sub, *size_param = NULL, *error_param = NULL, *clientFilename_param = NULL, *clientMediaType_param = NULL, _0, _1; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&stream_sub); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&clientFilename); - ZVAL_UNDEF(&clientMediaType); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 5) - Z_PARAM_OBJECT_OF_CLASS(stream, zephir_get_internal_ce(SL("psr\\http\\message\\streaminterface"))) - Z_PARAM_OPTIONAL - Z_PARAM_LONG_OR_NULL(size, is_null_true) - Z_PARAM_LONG(error) - Z_PARAM_STR_OR_NULL(clientFilename) - Z_PARAM_STR_OR_NULL(clientMediaType) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 4, &stream, &size_param, &error_param, &clientFilename_param, &clientMediaType_param); - if (!size_param) { - size = 0; - } else { - size = zephir_get_intval(size_param); - } - if (!error_param) { - error = 0; - } else { - error = zephir_get_intval(error_param); - } - if (!clientFilename_param) { - ZEPHIR_INIT_VAR(&clientFilename); - } else { - zephir_get_strval(&clientFilename, clientFilename_param); - } - if (!clientMediaType_param) { - ZEPHIR_INIT_VAR(&clientMediaType); - } else { - zephir_get_strval(&clientMediaType, clientMediaType_param); - } - - - object_init_ex(return_value, phalcon_http_message_uploadedfile_ce); - ZVAL_LONG(&_0, size); - ZVAL_LONG(&_1, error); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 381, stream, &_0, &_1, &clientFilename, &clientMediaType); - zephir_check_call_status(); - RETURN_MM(); -} - - - - -#ifdef HAVE_CONFIG_H -#endif - - - - - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_Uri) -{ - ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Http\\Message, Uri, phalcon, http_message_uri, phalcon_http_message_abstractcommon_ce, phalcon_http_message_uri_method_entry, ZEND_ACC_FINAL_CLASS); - - zend_declare_property_string(phalcon_http_message_uri_ce, SL("fragment"), "", ZEND_ACC_PROTECTED); - zend_declare_property_string(phalcon_http_message_uri_ce, SL("host"), "", ZEND_ACC_PROTECTED); - zend_declare_property_string(phalcon_http_message_uri_ce, SL("pass"), "", ZEND_ACC_PROTECTED); - zend_declare_property_string(phalcon_http_message_uri_ce, SL("path"), "", ZEND_ACC_PROTECTED); - zend_declare_property_null(phalcon_http_message_uri_ce, SL("port"), ZEND_ACC_PROTECTED); - zend_declare_property_string(phalcon_http_message_uri_ce, SL("query"), "", ZEND_ACC_PROTECTED); - zend_declare_property_string(phalcon_http_message_uri_ce, SL("scheme"), "https", ZEND_ACC_PROTECTED); - zend_declare_property_string(phalcon_http_message_uri_ce, SL("user"), "", ZEND_ACC_PROTECTED); - zend_class_implements(phalcon_http_message_uri_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\message\\uriinterface"))); - return SUCCESS; -} - -static PHP_METHOD(Phalcon_Http_Message_Uri, getFragment) -{ - zval *this_ptr = getThis(); - - - - RETURN_MEMBER(getThis(), "fragment"); -} - -static PHP_METHOD(Phalcon_Http_Message_Uri, getHost) -{ - zval *this_ptr = getThis(); - - - - RETURN_MEMBER(getThis(), "host"); -} - -static PHP_METHOD(Phalcon_Http_Message_Uri, getPath) -{ - zval *this_ptr = getThis(); - - - - RETURN_MEMBER(getThis(), "path"); -} - -static PHP_METHOD(Phalcon_Http_Message_Uri, getPort) -{ - zval *this_ptr = getThis(); - - - - RETURN_MEMBER(getThis(), "port"); -} - -static PHP_METHOD(Phalcon_Http_Message_Uri, getQuery) -{ - zval *this_ptr = getThis(); - - - - RETURN_MEMBER(getThis(), "query"); -} - -static PHP_METHOD(Phalcon_Http_Message_Uri, getScheme) -{ - zval *this_ptr = getThis(); - - - - RETURN_MEMBER(getThis(), "scheme"); -} - -static PHP_METHOD(Phalcon_Http_Message_Uri, __construct) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *uri_param = NULL, urlParts, _0, _1$$3, _2$$3, _3$$3, _4$$3, _5$$3, _6$$3, _7$$3, _8$$3, _9$$3, _10$$3, _11$$3, _12$$3, _13$$3, _14$$3, _15$$3, _16$$3, _17$$3, _18$$3, _19$$3; - zval uri; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&uri); - ZVAL_UNDEF(&urlParts); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1$$3); - ZVAL_UNDEF(&_2$$3); - ZVAL_UNDEF(&_3$$3); - ZVAL_UNDEF(&_4$$3); - ZVAL_UNDEF(&_5$$3); - ZVAL_UNDEF(&_6$$3); - ZVAL_UNDEF(&_7$$3); - ZVAL_UNDEF(&_8$$3); - ZVAL_UNDEF(&_9$$3); - ZVAL_UNDEF(&_10$$3); - ZVAL_UNDEF(&_11$$3); - ZVAL_UNDEF(&_12$$3); - ZVAL_UNDEF(&_13$$3); - ZVAL_UNDEF(&_14$$3); - ZVAL_UNDEF(&_15$$3); - ZVAL_UNDEF(&_16$$3); - ZVAL_UNDEF(&_17$$3); - ZVAL_UNDEF(&_18$$3); - ZVAL_UNDEF(&_19$$3); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(0, 1) - Z_PARAM_OPTIONAL - Z_PARAM_STR(uri) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 0, 1, &uri_param); - if (!uri_param) { - ZEPHIR_INIT_VAR(&uri); - ZVAL_STRING(&uri, ""); - } else { - if (UNEXPECTED(Z_TYPE_P(uri_param) != IS_STRING && Z_TYPE_P(uri_param) != IS_NULL)) { - zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'uri' must be of the type string")); - RETURN_MM_NULL(); - } - if (EXPECTED(Z_TYPE_P(uri_param) == IS_STRING)) { - zephir_get_strval(&uri, uri_param); - } else { - ZEPHIR_INIT_VAR(&uri); - } - } - - - ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, ""); - if (UNEXPECTED(!ZEPHIR_IS_IDENTICAL(&_0, &uri))) { - ZEPHIR_CALL_FUNCTION(&urlParts, "parse_url", NULL, 130, &uri); - zephir_check_call_status(); - if (UNEXPECTED(ZEPHIR_IS_FALSE_IDENTICAL(&urlParts))) { - ZEPHIR_INIT_NVAR(&urlParts); - array_init(&urlParts); - } - ZEPHIR_INIT_VAR(&_3$$3); - ZVAL_STRING(&_3$$3, "fragment"); - ZEPHIR_INIT_VAR(&_4$$3); - ZVAL_STRING(&_4$$3, ""); - ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getarrval", NULL, 407, &urlParts, &_3$$3, &_4$$3); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "filterfragment", NULL, 408, &_2$$3); - zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("fragment"), &_1$$3); - ZEPHIR_INIT_NVAR(&_3$$3); - ZEPHIR_INIT_NVAR(&_4$$3); - ZVAL_STRING(&_4$$3, "host"); - ZEPHIR_INIT_VAR(&_6$$3); - ZVAL_STRING(&_6$$3, ""); - ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "getarrval", NULL, 407, &urlParts, &_4$$3, &_6$$3); - zephir_check_call_status(); - zephir_fast_strtolower(&_3$$3, &_5$$3); - zephir_update_property_zval(this_ptr, ZEND_STRL("host"), &_3$$3); - ZEPHIR_INIT_NVAR(&_4$$3); - ZVAL_STRING(&_4$$3, "pass"); - ZEPHIR_INIT_NVAR(&_6$$3); - ZVAL_STRING(&_6$$3, ""); - ZEPHIR_CALL_METHOD(&_7$$3, this_ptr, "getarrval", NULL, 407, &urlParts, &_4$$3, &_6$$3); - zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_8$$3, "rawurlencode", NULL, 352, &_7$$3); - zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("pass"), &_8$$3); - ZEPHIR_INIT_NVAR(&_4$$3); - ZVAL_STRING(&_4$$3, "path"); - ZEPHIR_INIT_NVAR(&_6$$3); - ZVAL_STRING(&_6$$3, ""); - ZEPHIR_CALL_METHOD(&_10$$3, this_ptr, "getarrval", NULL, 407, &urlParts, &_4$$3, &_6$$3); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_9$$3, this_ptr, "filterpath", NULL, 409, &_10$$3); - zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("path"), &_9$$3); - ZEPHIR_INIT_NVAR(&_4$$3); - ZVAL_STRING(&_4$$3, "port"); - ZVAL_NULL(&_13$$3); - ZEPHIR_CALL_METHOD(&_12$$3, this_ptr, "getarrval", NULL, 407, &urlParts, &_4$$3, &_13$$3); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_11$$3, this_ptr, "filterport", NULL, 410, &_12$$3); - zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("port"), &_11$$3); - ZEPHIR_INIT_NVAR(&_4$$3); - ZVAL_STRING(&_4$$3, "query"); - ZEPHIR_INIT_NVAR(&_6$$3); - ZVAL_STRING(&_6$$3, ""); - ZEPHIR_CALL_METHOD(&_15$$3, this_ptr, "getarrval", NULL, 407, &urlParts, &_4$$3, &_6$$3); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_14$$3, this_ptr, "filterquery", NULL, 411, &_15$$3); - zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("query"), &_14$$3); - ZEPHIR_INIT_NVAR(&_4$$3); - ZVAL_STRING(&_4$$3, "scheme"); - ZEPHIR_INIT_NVAR(&_6$$3); - ZVAL_STRING(&_6$$3, ""); - ZEPHIR_CALL_METHOD(&_17$$3, this_ptr, "getarrval", NULL, 407, &urlParts, &_4$$3, &_6$$3); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_16$$3, this_ptr, "filterscheme", NULL, 412, &_17$$3); - zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("scheme"), &_16$$3); - ZEPHIR_INIT_NVAR(&_4$$3); - ZVAL_STRING(&_4$$3, "user"); - ZEPHIR_INIT_NVAR(&_6$$3); - ZVAL_STRING(&_6$$3, ""); - ZEPHIR_CALL_METHOD(&_18$$3, this_ptr, "getarrval", NULL, 407, &urlParts, &_4$$3, &_6$$3); - zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_19$$3, "rawurlencode", NULL, 352, &_18$$3); - zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("user"), &_19$$3); - } - ZEPHIR_MM_RESTORE(); -} - -static PHP_METHOD(Phalcon_Http_Message_Uri, __toString) -{ - zend_bool _2, _3; - zval authority, path, uri, _0, _1, _4, _6, _7, _8, _9, _10, _11, _12, _13, _5$$3; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&authority); - ZVAL_UNDEF(&path); - ZVAL_UNDEF(&uri); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_4); - ZVAL_UNDEF(&_6); - ZVAL_UNDEF(&_7); - ZVAL_UNDEF(&_8); - ZVAL_UNDEF(&_9); - ZVAL_UNDEF(&_10); - ZVAL_UNDEF(&_11); - ZVAL_UNDEF(&_12); - ZVAL_UNDEF(&_13); - ZVAL_UNDEF(&_5$$3); - - - ZEPHIR_MM_GROW(); - - ZEPHIR_CALL_METHOD(&authority, this_ptr, "getauthority", NULL, 413); - zephir_check_call_status(); - zephir_read_property(&_0, this_ptr, ZEND_STRL("path"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CPY_WRT(&path, &_0); - ZEPHIR_INIT_VAR(&_1); - ZVAL_STRING(&_1, ""); - _2 = !ZEPHIR_IS_IDENTICAL(&_1, &path); - if (_2) { - _2 = 1 != zephir_start_with_str(&path, SL("/")); - } - _3 = _2; - if (_3) { - ZEPHIR_INIT_VAR(&_4); - ZVAL_STRING(&_4, ""); - _3 = !ZEPHIR_IS_IDENTICAL(&_4, &authority); - } - if (UNEXPECTED(_3)) { - ZEPHIR_INIT_VAR(&_5$$3); - ZEPHIR_CONCAT_SV(&_5$$3, "/", &path); - ZEPHIR_CPY_WRT(&path, &_5$$3); - } - zephir_read_property(&_0, this_ptr, ZEND_STRL("scheme"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_INIT_VAR(&_7); - ZVAL_STRING(&_7, ""); - ZEPHIR_INIT_VAR(&_8); - ZVAL_STRING(&_8, ":"); - ZEPHIR_CALL_METHOD(&_6, this_ptr, "checkvalue", NULL, 414, &_0, &_7, &_8); - zephir_check_call_status(); - ZEPHIR_INIT_NVAR(&_7); - ZVAL_STRING(&_7, "//"); - ZEPHIR_CALL_METHOD(&_9, this_ptr, "checkvalue", NULL, 414, &authority, &_7); - zephir_check_call_status(); - zephir_read_property(&_11, this_ptr, ZEND_STRL("query"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_INIT_NVAR(&_7); - ZVAL_STRING(&_7, "?"); - ZEPHIR_CALL_METHOD(&_10, this_ptr, "checkvalue", NULL, 414, &_11, &_7); - zephir_check_call_status(); - zephir_read_property(&_13, this_ptr, ZEND_STRL("fragment"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_INIT_NVAR(&_7); - ZVAL_STRING(&_7, "#"); - ZEPHIR_CALL_METHOD(&_12, this_ptr, "checkvalue", NULL, 414, &_13, &_7); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&uri); - ZEPHIR_CONCAT_VVVVV(&uri, &_6, &_9, &path, &_10, &_12); - RETURN_CCTOR(&uri); -} - -static PHP_METHOD(Phalcon_Http_Message_Uri, getAuthority) -{ - zval authority, userInfo, _0, _1, _2, _4, _3$$4, _5$$5, _6$$5; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&authority); - ZVAL_UNDEF(&userInfo); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_4); - ZVAL_UNDEF(&_3$$4); - ZVAL_UNDEF(&_5$$5); - ZVAL_UNDEF(&_6$$5); - - - ZEPHIR_MM_GROW(); - - zephir_read_property(&_0, this_ptr, ZEND_STRL("host"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_INIT_VAR(&_1); - ZVAL_STRING(&_1, ""); - if (UNEXPECTED(ZEPHIR_IS_IDENTICAL(&_1, &_0))) { - RETURN_MM_STRING(""); - } - ZEPHIR_OBS_VAR(&authority); - zephir_read_property(&authority, this_ptr, ZEND_STRL("host"), PH_NOISY_CC); - ZEPHIR_CALL_METHOD(&userInfo, this_ptr, "getuserinfo", NULL, 415); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_2); - ZVAL_STRING(&_2, ""); - if (UNEXPECTED(!ZEPHIR_IS_IDENTICAL(&_2, &userInfo))) { - ZEPHIR_INIT_VAR(&_3$$4); - ZEPHIR_CONCAT_VSV(&_3$$4, &userInfo, "@", &authority); - ZEPHIR_CPY_WRT(&authority, &_3$$4); - } - zephir_read_property(&_4, this_ptr, ZEND_STRL("port"), PH_NOISY_CC | PH_READONLY); - if (UNEXPECTED(Z_TYPE_P(&_4) != IS_NULL)) { - zephir_read_property(&_5$$5, this_ptr, ZEND_STRL("port"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_INIT_VAR(&_6$$5); - ZEPHIR_CONCAT_SV(&_6$$5, ":", &_5$$5); - zephir_concat_self(&authority, &_6$$5); - } - RETURN_CCTOR(&authority); -} - -static PHP_METHOD(Phalcon_Http_Message_Uri, getUserInfo) -{ - zval _0, _1$$3, _2$$3; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1$$3); - ZVAL_UNDEF(&_2$$3); - - - ZEPHIR_MM_GROW(); - - ZEPHIR_OBS_VAR(&_0); - zephir_read_property(&_0, this_ptr, ZEND_STRL("pass"), PH_NOISY_CC); - if (UNEXPECTED(1 != ZEPHIR_IS_EMPTY(&_0))) { - zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("user"), PH_NOISY_CC | PH_READONLY); - zephir_read_property(&_2$$3, this_ptr, ZEND_STRL("pass"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CONCAT_VSV(return_value, &_1$$3, ":", &_2$$3); - RETURN_MM(); - } - RETURN_MM_MEMBER(getThis(), "user"); -} - -static PHP_METHOD(Phalcon_Http_Message_Uri, withFragment) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *fragment = NULL, fragment_sub, _0, _1; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&fragment_sub); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(fragment) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &fragment); - ZEPHIR_SEPARATE_PARAM(fragment); - - - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkstringparameter", NULL, 20, fragment); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "filterfragment", NULL, 408, fragment); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(fragment, &_0); - ZEPHIR_INIT_VAR(&_1); - ZVAL_STRING(&_1, "fragment"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "cloneinstance", NULL, 21, fragment, &_1); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_Uri, withPath) -{ - zend_bool _2; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *path = NULL, path_sub, _0, _1, _3, _4, _5, _6; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&path_sub); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_3); - ZVAL_UNDEF(&_4); - ZVAL_UNDEF(&_5); - ZVAL_UNDEF(&_6); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(path) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &path); - ZEPHIR_SEPARATE_PARAM(path); - - - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkstringparameter", NULL, 20, path); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, "?"); - ZEPHIR_INIT_VAR(&_1); - zephir_fast_strpos(&_1, path, &_0, 0 ); - _2 = !ZEPHIR_IS_FALSE_IDENTICAL(&_1); - if (!(_2)) { - ZEPHIR_INIT_VAR(&_3); - ZVAL_STRING(&_3, "#"); - ZEPHIR_INIT_VAR(&_4); - zephir_fast_strpos(&_4, path, &_3, 0 ); - _2 = !ZEPHIR_IS_FALSE_IDENTICAL(&_4); - } - if (UNEXPECTED(_2)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Path cannot contain a query string or fragment", "phalcon/Http/Message/Uri.zep", 288); - return; - } - ZEPHIR_CALL_METHOD(&_5, this_ptr, "filterpath", NULL, 409, path); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(path, &_5); - ZEPHIR_INIT_VAR(&_6); - ZVAL_STRING(&_6, "path"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "cloneinstance", NULL, 21, path, &_6); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_Uri, withPort) -{ - zend_bool _1$$3, _2$$3; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *port = NULL, port_sub, _0$$3, _3; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&port_sub); - ZVAL_UNDEF(&_0$$3); - ZVAL_UNDEF(&_3); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(port) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &port); - ZEPHIR_SEPARATE_PARAM(port); - - - if (UNEXPECTED(Z_TYPE_P(port) != IS_NULL)) { - ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "filterport", NULL, 410, port); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(port, &_0$$3); - _1$$3 = Z_TYPE_P(port) != IS_NULL; - if (_1$$3) { - _2$$3 = ZEPHIR_LT_LONG(port, 1); - if (!(_2$$3)) { - _2$$3 = ZEPHIR_GT_LONG(port, 65535); - } - _1$$3 = _2$$3; - } - if (UNEXPECTED(_1$$3)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Method expects valid port (1-65535)", "phalcon/Http/Message/Uri.zep", 321); - return; - } - } - ZEPHIR_INIT_VAR(&_3); - ZVAL_STRING(&_3, "port"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "cloneinstance", NULL, 21, port, &_3); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_Uri, withQuery) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *query = NULL, query_sub, _0, _1, _2, _3; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&query_sub); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_3); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(query) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &query); - ZEPHIR_SEPARATE_PARAM(query); - - - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkstringparameter", NULL, 20, query); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, "#"); - ZEPHIR_INIT_VAR(&_1); - zephir_fast_strpos(&_1, query, &_0, 0 ); - if (UNEXPECTED(!ZEPHIR_IS_FALSE_IDENTICAL(&_1))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Query cannot contain a query fragment", "phalcon/Http/Message/Uri.zep", 351); - return; - } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "filterquery", NULL, 411, query); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(query, &_2); - ZEPHIR_INIT_VAR(&_3); - ZVAL_STRING(&_3, "query"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "cloneinstance", NULL, 21, query, &_3); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_Uri, withScheme) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *scheme = NULL, scheme_sub, _0, _1; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&scheme_sub); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(scheme) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &scheme); - ZEPHIR_SEPARATE_PARAM(scheme); - - - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkstringparameter", NULL, 20, scheme); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "filterscheme", NULL, 412, scheme); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(scheme, &_0); - ZEPHIR_INIT_VAR(&_1); - ZVAL_STRING(&_1, "scheme"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processwith", NULL, 416, scheme, &_1); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_Uri, withUserInfo) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *user = NULL, user_sub, *password = NULL, password_sub, __$null, newInstance, _0, _2, _1$$4; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&user_sub); - ZVAL_UNDEF(&password_sub); - ZVAL_NULL(&__$null); - ZVAL_UNDEF(&newInstance); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_1$$4); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_ZVAL(user) - Z_PARAM_OPTIONAL - Z_PARAM_ZVAL_OR_NULL(password) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 1, &user, &password); - ZEPHIR_SEPARATE_PARAM(user); - if (!password) { - password = &password_sub; - ZEPHIR_CPY_WRT(password, &__$null); - } else { - ZEPHIR_SEPARATE_PARAM(password); - } - - - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkstringparameter", NULL, 20, user); - zephir_check_call_status(); - if (UNEXPECTED(Z_TYPE_P(password) != IS_NULL)) { - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkstringparameter", NULL, 20, user); - zephir_check_call_status(); - } - ZEPHIR_CALL_FUNCTION(&_0, "rawurlencode", NULL, 352, user); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(user, &_0); - if (UNEXPECTED(Z_TYPE_P(password) != IS_NULL)) { - ZEPHIR_CALL_FUNCTION(&_1$$4, "rawurlencode", NULL, 352, password); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(password, &_1$$4); - } - ZEPHIR_INIT_VAR(&_2); - ZVAL_STRING(&_2, "user"); - ZEPHIR_CALL_METHOD(&newInstance, this_ptr, "cloneinstance", NULL, 21, user, &_2); - zephir_check_call_status(); - zephir_update_property_zval(&newInstance, ZEND_STRL("pass"), password); - RETURN_CCTOR(&newInstance); -} - -static PHP_METHOD(Phalcon_Http_Message_Uri, withHost) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *host, host_sub, _0; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&host_sub); - ZVAL_UNDEF(&_0); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(host) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &host); - - - ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, "host"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processwith", NULL, 416, host, &_0); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_Uri, checkValue) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *value_param = NULL, *prefix_param = NULL, *suffix_param = NULL, _0; - zval value, prefix, suffix, _1$$3; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&value); - ZVAL_UNDEF(&prefix); - ZVAL_UNDEF(&suffix); - ZVAL_UNDEF(&_1$$3); - ZVAL_UNDEF(&_0); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 3) - Z_PARAM_STR(value) - Z_PARAM_OPTIONAL - Z_PARAM_STR(prefix) - Z_PARAM_STR(suffix) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 2, &value_param, &prefix_param, &suffix_param); - if (UNEXPECTED(Z_TYPE_P(value_param) != IS_STRING && Z_TYPE_P(value_param) != IS_NULL)) { - zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'value' must be of the type string")); - RETURN_MM_NULL(); - } - if (EXPECTED(Z_TYPE_P(value_param) == IS_STRING)) { - zephir_get_strval(&value, value_param); - } else { - ZEPHIR_INIT_VAR(&value); - } - if (!prefix_param) { - ZEPHIR_INIT_VAR(&prefix); - ZVAL_STRING(&prefix, ""); - } else { - if (UNEXPECTED(Z_TYPE_P(prefix_param) != IS_STRING && Z_TYPE_P(prefix_param) != IS_NULL)) { - zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'prefix' must be of the type string")); - RETURN_MM_NULL(); - } - if (EXPECTED(Z_TYPE_P(prefix_param) == IS_STRING)) { - zephir_get_strval(&prefix, prefix_param); - } else { - ZEPHIR_INIT_VAR(&prefix); - } - } - if (!suffix_param) { - ZEPHIR_INIT_VAR(&suffix); - ZVAL_STRING(&suffix, ""); - } else { - if (UNEXPECTED(Z_TYPE_P(suffix_param) != IS_STRING && Z_TYPE_P(suffix_param) != IS_NULL)) { - zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'suffix' must be of the type string")); - RETURN_MM_NULL(); - } - if (EXPECTED(Z_TYPE_P(suffix_param) == IS_STRING)) { - zephir_get_strval(&suffix, suffix_param); - } else { - ZEPHIR_INIT_VAR(&suffix); - } - } - - - ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, ""); - if (UNEXPECTED(!ZEPHIR_IS_IDENTICAL(&_0, &value))) { - ZEPHIR_INIT_VAR(&_1$$3); - ZEPHIR_CONCAT_VVV(&_1$$3, &prefix, &value, &suffix); - ZEPHIR_CPY_WRT(&value, &_1$$3); - } - RETURN_CTOR(&value); -} - -static PHP_METHOD(Phalcon_Http_Message_Uri, filterFragment) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *fragment_param = NULL; - zval fragment; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&fragment); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR(fragment) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &fragment_param); - if (UNEXPECTED(Z_TYPE_P(fragment_param) != IS_STRING && Z_TYPE_P(fragment_param) != IS_NULL)) { - zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'fragment' must be of the type string")); - RETURN_MM_NULL(); - } - if (EXPECTED(Z_TYPE_P(fragment_param) == IS_STRING)) { - zephir_get_strval(&fragment, fragment_param); - } else { - ZEPHIR_INIT_VAR(&fragment); - } - - - ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 352, &fragment); - zephir_check_call_status(); - RETURN_MM(); -} - -static PHP_METHOD(Phalcon_Http_Message_Uri, filterPath) -{ - zend_string *_5; - zend_ulong _4; - zend_bool _1; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zephir_fcall_cache_entry *_7 = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *path_param = NULL, element, key, parts, _0, *_2, _3, _9, _10, _6$$4, _8$$5; - zval path; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&path); - ZVAL_UNDEF(&element); - ZVAL_UNDEF(&key); - ZVAL_UNDEF(&parts); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_3); - ZVAL_UNDEF(&_9); - ZVAL_UNDEF(&_10); - ZVAL_UNDEF(&_6$$4); - ZVAL_UNDEF(&_8$$5); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR(path) + Z_PARAM_STR_OR_NULL(message) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &path_param); - if (UNEXPECTED(Z_TYPE_P(path_param) != IS_STRING && Z_TYPE_P(path_param) != IS_NULL)) { - zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'path' must be of the type string")); - RETURN_MM_NULL(); - } - if (EXPECTED(Z_TYPE_P(path_param) == IS_STRING)) { - zephir_get_strval(&path, path_param); + zephir_fetch_params(1, 1, 1, &code_param, &message_param); + code = zephir_get_intval(code_param); + if (!message_param) { + ZEPHIR_INIT_VAR(&message); } else { - ZEPHIR_INIT_VAR(&path); + zephir_get_strval(&message, message_param); } - ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, ""); - _1 = ZEPHIR_IS_IDENTICAL(&_0, &path); - if (!(_1)) { - _1 = 1 != zephir_start_with_str(&path, SL("/")); - } - if (UNEXPECTED(_1)) { - RETURN_CTOR(&path); - } - ZEPHIR_INIT_VAR(&parts); - zephir_fast_explode_str(&parts, SL("/"), &path, LONG_MAX); - zephir_is_iterable(&parts, 1, "phalcon/Http/Message/Uri.zep", 522); - if (Z_TYPE_P(&parts) == IS_ARRAY) { - ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&parts), _4, _5, _2) + zephir_read_property(&_0, this_ptr, ZEND_STRL("headers"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(¤tHeadersRaw, &_0, "toarray", NULL, 0); + zephir_check_call_status(); + ZEPHIR_INIT_VAR(&_1); + zephir_is_iterable(¤tHeadersRaw, 0, "phalcon/Http/Response.zep", 711); + if (Z_TYPE_P(¤tHeadersRaw) == IS_ARRAY) { + ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(¤tHeadersRaw), _4, _5, _2) { ZEPHIR_INIT_NVAR(&key); if (_5 != NULL) { @@ -116292,365 +109408,413 @@ static PHP_METHOD(Phalcon_Http_Message_Uri, filterPath) } else { ZVAL_LONG(&key, _4); } - ZEPHIR_INIT_NVAR(&element); - ZVAL_COPY(&element, _2); - ZEPHIR_CALL_FUNCTION(&_6$$4, "rawurlencode", &_7, 352, &element); - zephir_check_call_status(); - zephir_array_update_zval(&parts, &key, &_6$$4, PH_COPY | PH_SEPARATE); + ZEPHIR_INIT_NVAR(&_1); + ZVAL_COPY(&_1, _2); + _6$$3 = Z_TYPE_P(&key) == IS_STRING; + if (_6$$3) { + ZEPHIR_INIT_NVAR(&_7$$3); + ZVAL_STRING(&_7$$3, "HTTP/"); + ZEPHIR_CALL_FUNCTION(&_8$$3, "strstr", &_9, 349, &key, &_7$$3); + zephir_check_call_status(); + _6$$3 = zephir_is_true(&_8$$3); + } + if (_6$$3) { + zephir_read_property(&_10$$4, this_ptr, ZEND_STRL("headers"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(NULL, &_10$$4, "remove", NULL, 0, &key); + zephir_check_call_status(); + } } ZEND_HASH_FOREACH_END(); } else { - ZEPHIR_CALL_METHOD(NULL, &parts, "rewind", NULL, 0); + ZEPHIR_CALL_METHOD(NULL, ¤tHeadersRaw, "rewind", NULL, 0); zephir_check_call_status(); while (1) { - ZEPHIR_CALL_METHOD(&_3, &parts, "valid", NULL, 0); + ZEPHIR_CALL_METHOD(&_3, ¤tHeadersRaw, "valid", NULL, 0); zephir_check_call_status(); if (!zend_is_true(&_3)) { break; } - ZEPHIR_CALL_METHOD(&key, &parts, "key", NULL, 0); + ZEPHIR_CALL_METHOD(&key, ¤tHeadersRaw, "key", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&element, &parts, "current", NULL, 0); + ZEPHIR_CALL_METHOD(&_1, ¤tHeadersRaw, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_8$$5, "rawurlencode", &_7, 352, &element); - zephir_check_call_status(); - zephir_array_update_zval(&parts, &key, &_8$$5, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &parts, "next", NULL, 0); + _11$$5 = Z_TYPE_P(&key) == IS_STRING; + if (_11$$5) { + ZEPHIR_INIT_NVAR(&_12$$5); + ZVAL_STRING(&_12$$5, "HTTP/"); + ZEPHIR_CALL_FUNCTION(&_13$$5, "strstr", &_9, 349, &key, &_12$$5); + zephir_check_call_status(); + _11$$5 = zephir_is_true(&_13$$5); + } + if (_11$$5) { + zephir_read_property(&_14$$6, this_ptr, ZEND_STRL("headers"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(NULL, &_14$$6, "remove", NULL, 0, &key); + zephir_check_call_status(); + } + ZEPHIR_CALL_METHOD(NULL, ¤tHeadersRaw, "next", NULL, 0); zephir_check_call_status(); } } - ZEPHIR_INIT_NVAR(&element); + ZEPHIR_INIT_NVAR(&_1); ZEPHIR_INIT_NVAR(&key); - ZEPHIR_INIT_NVAR(&path); - zephir_fast_join_str(&path, SL("/"), &parts); - ZEPHIR_INIT_VAR(&_9); - ZEPHIR_INIT_VAR(&_10); - ZVAL_STRING(&_10, "/"); - zephir_fast_trim(&_9, &path, &_10, ZEPHIR_TRIM_LEFT); - ZEPHIR_CONCAT_SV(return_value, "/", &_9); - RETURN_MM(); + if (ZEPHIR_IS_NULL(&message)) { + ZEPHIR_INIT_VAR(&statusCodes); + zephir_create_array(&statusCodes, 89, 0); + add_index_stringl(&statusCodes, 100, SL("Continue")); + add_index_stringl(&statusCodes, 101, SL("Switching Protocols")); + add_index_stringl(&statusCodes, 102, SL("Processing")); + add_index_stringl(&statusCodes, 103, SL("Early Hints")); + add_index_stringl(&statusCodes, 200, SL("OK")); + add_index_stringl(&statusCodes, 201, SL("Created")); + add_index_stringl(&statusCodes, 202, SL("Accepted")); + add_index_stringl(&statusCodes, 203, SL("Non-Authoritative Information")); + add_index_stringl(&statusCodes, 204, SL("No Content")); + add_index_stringl(&statusCodes, 205, SL("Reset Content")); + add_index_stringl(&statusCodes, 206, SL("Partial Content")); + add_index_stringl(&statusCodes, 207, SL("Multi-status")); + add_index_stringl(&statusCodes, 208, SL("Already Reported")); + add_index_stringl(&statusCodes, 226, SL("IM Used")); + add_index_stringl(&statusCodes, 300, SL("Multiple Choices")); + add_index_stringl(&statusCodes, 301, SL("Moved Permanently")); + add_index_stringl(&statusCodes, 302, SL("Found")); + add_index_stringl(&statusCodes, 303, SL("See Other")); + add_index_stringl(&statusCodes, 304, SL("Not Modified")); + add_index_stringl(&statusCodes, 305, SL("Use Proxy")); + add_index_stringl(&statusCodes, 306, SL("Switch Proxy")); + add_index_stringl(&statusCodes, 307, SL("Temporary Redirect")); + add_index_stringl(&statusCodes, 308, SL("Permanent Redirect")); + add_index_stringl(&statusCodes, 400, SL("Bad Request")); + add_index_stringl(&statusCodes, 401, SL("Unauthorized")); + add_index_stringl(&statusCodes, 402, SL("Payment Required")); + add_index_stringl(&statusCodes, 403, SL("Forbidden")); + add_index_stringl(&statusCodes, 404, SL("Not Found")); + add_index_stringl(&statusCodes, 405, SL("Method Not Allowed")); + add_index_stringl(&statusCodes, 406, SL("Not Acceptable")); + add_index_stringl(&statusCodes, 407, SL("Proxy Authentication Required")); + add_index_stringl(&statusCodes, 408, SL("Request Time-out")); + add_index_stringl(&statusCodes, 409, SL("Conflict")); + add_index_stringl(&statusCodes, 410, SL("Gone")); + add_index_stringl(&statusCodes, 411, SL("Length Required")); + add_index_stringl(&statusCodes, 412, SL("Precondition Failed")); + add_index_stringl(&statusCodes, 413, SL("Request Entity Too Large")); + add_index_stringl(&statusCodes, 414, SL("Request-URI Too Large")); + add_index_stringl(&statusCodes, 415, SL("Unsupported Media Type")); + add_index_stringl(&statusCodes, 416, SL("Requested range not satisfiable")); + add_index_stringl(&statusCodes, 417, SL("Expectation Failed")); + add_index_stringl(&statusCodes, 418, SL("I'm a teapot")); + add_index_stringl(&statusCodes, 421, SL("Misdirected Request")); + add_index_stringl(&statusCodes, 422, SL("Unprocessable Entity")); + add_index_stringl(&statusCodes, 423, SL("Locked")); + add_index_stringl(&statusCodes, 424, SL("Failed Dependency")); + add_index_stringl(&statusCodes, 425, SL("Unordered Collection")); + add_index_stringl(&statusCodes, 426, SL("Upgrade Required")); + add_index_stringl(&statusCodes, 428, SL("Precondition Required")); + add_index_stringl(&statusCodes, 429, SL("Too Many Requests")); + add_index_stringl(&statusCodes, 431, SL("Request Header Fields Too Large")); + add_index_stringl(&statusCodes, 451, SL("Unavailable For Legal Reasons")); + add_index_stringl(&statusCodes, 500, SL("Internal Server Error")); + add_index_stringl(&statusCodes, 501, SL("Not Implemented")); + add_index_stringl(&statusCodes, 502, SL("Bad Gateway")); + add_index_stringl(&statusCodes, 503, SL("Service Unavailable")); + add_index_stringl(&statusCodes, 504, SL("Gateway Time-out")); + add_index_stringl(&statusCodes, 505, SL("HTTP Version not supported")); + add_index_stringl(&statusCodes, 506, SL("Variant Also Negotiates")); + add_index_stringl(&statusCodes, 507, SL("Insufficient Storage")); + add_index_stringl(&statusCodes, 508, SL("Loop Detected")); + add_index_stringl(&statusCodes, 510, SL("Not Extended")); + add_index_stringl(&statusCodes, 511, SL("Network Authentication Required")); + add_index_stringl(&statusCodes, 218, SL("This is fine")); + add_index_stringl(&statusCodes, 419, SL("Page Expired")); + add_index_stringl(&statusCodes, 420, SL("Method Failure")); + add_index_stringl(&statusCodes, 440, SL("Login Time-out")); + add_index_stringl(&statusCodes, 444, SL("No Response")); + add_index_stringl(&statusCodes, 449, SL("Retry With")); + add_index_stringl(&statusCodes, 450, SL("Blocked by Windows Parental Controls (Microsoft)")); + add_index_stringl(&statusCodes, 494, SL("Request header too large")); + add_index_stringl(&statusCodes, 495, SL("SSL Certificate Error")); + add_index_stringl(&statusCodes, 496, SL("SSL Certificate Required")); + add_index_stringl(&statusCodes, 497, SL("HTTP Request Sent to HTTPS Port")); + add_index_stringl(&statusCodes, 498, SL("Invalid Token (Esri)")); + add_index_stringl(&statusCodes, 499, SL("Client Closed Request")); + add_index_stringl(&statusCodes, 509, SL("Bandwidth Limit Exceeded")); + add_index_stringl(&statusCodes, 520, SL("Unknown Error")); + add_index_stringl(&statusCodes, 521, SL("Web Server Is Down")); + add_index_stringl(&statusCodes, 522, SL("Connection Timed Out")); + add_index_stringl(&statusCodes, 523, SL("Origin Is Unreachable")); + add_index_stringl(&statusCodes, 524, SL("A Timeout Occurred")); + add_index_stringl(&statusCodes, 525, SL("SSL Handshake Failed")); + add_index_stringl(&statusCodes, 526, SL("Invalid SSL Certificate")); + add_index_stringl(&statusCodes, 527, SL("Railgun Error")); + add_index_stringl(&statusCodes, 530, SL("Origin DNS Error")); + add_index_stringl(&statusCodes, 598, SL("Network read timeout error")); + add_index_stringl(&statusCodes, 599, SL("Network Connect Timeout Error")); + if (UNEXPECTED(!(zephir_array_isset_long(&statusCodes, code)))) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "Non-standard statuscode given without a message", "phalcon/Http/Response.zep", 818); + return; + } + ZEPHIR_OBS_VAR(&defaultMessage); + zephir_array_fetch_long(&defaultMessage, &statusCodes, code, PH_NOISY, "phalcon/Http/Response.zep", 821); + zephir_get_strval(&message, &defaultMessage); + } + zephir_read_property(&_15, this_ptr, ZEND_STRL("headers"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_INIT_VAR(&_16); + ZVAL_LONG(&_16, code); + ZEPHIR_INIT_VAR(&_17); + ZEPHIR_CONCAT_SVSV(&_17, "HTTP/1.1 ", &_16, " ", &message); + ZEPHIR_CALL_METHOD(NULL, &_15, "setraw", NULL, 0, &_17); + zephir_check_call_status(); + zephir_read_property(&_18, this_ptr, ZEND_STRL("headers"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_INIT_VAR(&_19); + ZVAL_LONG(&_19, code); + ZEPHIR_INIT_VAR(&_20); + ZEPHIR_CONCAT_VSV(&_20, &_19, " ", &message); + ZEPHIR_INIT_VAR(&_21); + ZVAL_STRING(&_21, "Status"); + ZEPHIR_CALL_METHOD(NULL, &_18, "set", NULL, 0, &_21, &_20); + zephir_check_call_status(); + RETURN_THIS(); } -static PHP_METHOD(Phalcon_Http_Message_Uri, filterPort) +static PHP_METHOD(Phalcon_Http_Response, setRawHeader) { - zend_long _0$$3; - zval ports; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *port = NULL, port_sub; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *header_param = NULL, _0; + zval header; zval *this_ptr = getThis(); - ZVAL_UNDEF(&port_sub); - ZVAL_UNDEF(&ports); + ZVAL_UNDEF(&header); + ZVAL_UNDEF(&_0); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(port) + Z_PARAM_STR(header) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &port); - ZEPHIR_SEPARATE_PARAM(port); + zephir_fetch_params(1, 1, 0, &header_param); + zephir_get_strval(&header, header_param); - ZEPHIR_INIT_VAR(&ports); - zephir_create_array(&ports, 2, 0); - add_index_long(&ports, 80, 1); - add_index_long(&ports, 443, 1); - if (UNEXPECTED(Z_TYPE_P(port) != IS_NULL)) { - _0$$3 = zephir_get_intval(port); - ZEPHIR_INIT_NVAR(port); - ZVAL_LONG(port, _0$$3); - if (UNEXPECTED(zephir_array_isset(&ports, port))) { - ZEPHIR_INIT_NVAR(port); - ZVAL_NULL(port); - } - } - RETVAL_ZVAL(port, 1, 0); - RETURN_MM(); + zephir_read_property(&_0, this_ptr, ZEND_STRL("headers"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(NULL, &_0, "setraw", NULL, 0, &header); + zephir_check_call_status(); + RETURN_THIS(); } -static PHP_METHOD(Phalcon_Http_Message_Uri, filterQuery) +static PHP_METHOD(Phalcon_Http_Response, getBasename) { - zend_string *_6; - zend_ulong _5; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zephir_fcall_cache_entry *_7 = NULL, *_11 = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *query_param = NULL, index, part, parts, split, _0, _1, _2, *_3, _4, _8$$4, _12$$4, _13$$4, _14$$4, _15$$4, _16$$4, _9$$5, _10$$5, _17$$6, _20$$6, _21$$6, _22$$6, _23$$6, _24$$6, _18$$7, _19$$7; - zval query; + zval *uri_param = NULL, *suffix = NULL, suffix_sub, __$null, filename, matches, _0, _1, _2, _3, _4, _5, _6$$3, _7$$3, _8$$3, _9$$3; + zval uri; zval *this_ptr = getThis(); - ZVAL_UNDEF(&query); - ZVAL_UNDEF(&index); - ZVAL_UNDEF(&part); - ZVAL_UNDEF(&parts); - ZVAL_UNDEF(&split); + ZVAL_UNDEF(&uri); + ZVAL_UNDEF(&suffix_sub); + ZVAL_NULL(&__$null); + ZVAL_UNDEF(&filename); + ZVAL_UNDEF(&matches); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1); ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); ZVAL_UNDEF(&_4); - ZVAL_UNDEF(&_8$$4); - ZVAL_UNDEF(&_12$$4); - ZVAL_UNDEF(&_13$$4); - ZVAL_UNDEF(&_14$$4); - ZVAL_UNDEF(&_15$$4); - ZVAL_UNDEF(&_16$$4); - ZVAL_UNDEF(&_9$$5); - ZVAL_UNDEF(&_10$$5); - ZVAL_UNDEF(&_17$$6); - ZVAL_UNDEF(&_20$$6); - ZVAL_UNDEF(&_21$$6); - ZVAL_UNDEF(&_22$$6); - ZVAL_UNDEF(&_23$$6); - ZVAL_UNDEF(&_24$$6); - ZVAL_UNDEF(&_18$$7); - ZVAL_UNDEF(&_19$$7); + ZVAL_UNDEF(&_5); + ZVAL_UNDEF(&_6$$3); + ZVAL_UNDEF(&_7$$3); + ZVAL_UNDEF(&_8$$3); + ZVAL_UNDEF(&_9$$3); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR(query) + ZEND_PARSE_PARAMETERS_START(1, 2) + Z_PARAM_STR(uri) + Z_PARAM_OPTIONAL + Z_PARAM_ZVAL_OR_NULL(suffix) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &query_param); - zephir_get_strval(&query, query_param); + zephir_fetch_params(1, 1, 1, &uri_param, &suffix); + if (UNEXPECTED(Z_TYPE_P(uri_param) != IS_STRING && Z_TYPE_P(uri_param) != IS_NULL)) { + zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'uri' must be of the type string")); + RETURN_MM_NULL(); + } + if (EXPECTED(Z_TYPE_P(uri_param) == IS_STRING)) { + zephir_get_strval(&uri, uri_param); + } else { + ZEPHIR_INIT_VAR(&uri); + } + if (!suffix) { + suffix = &suffix_sub; + suffix = &__$null; + } ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, ""); - if (UNEXPECTED(ZEPHIR_IS_IDENTICAL(&_0, &query))) { - RETURN_MM_STRING(""); - } ZEPHIR_INIT_VAR(&_1); + ZVAL_STRING(&_1, "/"); + zephir_fast_trim(&_0, &uri, &_1, ZEPHIR_TRIM_RIGHT); + zephir_get_strval(&uri, &_0); ZEPHIR_INIT_VAR(&_2); - ZVAL_STRING(&_2, "?"); - zephir_fast_trim(&_1, &query, &_2, ZEPHIR_TRIM_LEFT); - zephir_get_strval(&query, &_1); - ZEPHIR_INIT_VAR(&parts); - zephir_fast_explode_str(&parts, SL("&"), &query, LONG_MAX); - zephir_is_iterable(&parts, 1, "phalcon/Http/Message/Uri.zep", 595); - if (Z_TYPE_P(&parts) == IS_ARRAY) { - ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&parts), _5, _6, _3) - { - ZEPHIR_INIT_NVAR(&index); - if (_6 != NULL) { - ZVAL_STR_COPY(&index, _6); - } else { - ZVAL_LONG(&index, _5); - } - ZEPHIR_INIT_NVAR(&part); - ZVAL_COPY(&part, _3); - ZEPHIR_CALL_METHOD(&split, this_ptr, "splitqueryvalue", &_7, 417, &part); - zephir_check_call_status(); - zephir_array_fetch_long(&_8$$4, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 587); - if (UNEXPECTED(Z_TYPE_P(&_8$$4) == IS_NULL)) { - zephir_array_fetch_long(&_9$$5, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 588); - ZEPHIR_CALL_FUNCTION(&_10$$5, "rawurlencode", &_11, 352, &_9$$5); - zephir_check_call_status(); - zephir_array_update_zval(&parts, &index, &_10$$5, PH_COPY | PH_SEPARATE); - continue; - } - zephir_array_fetch_long(&_12$$4, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 592); - ZEPHIR_CALL_FUNCTION(&_13$$4, "rawurlencode", &_11, 352, &_12$$4); - zephir_check_call_status(); - zephir_array_fetch_long(&_14$$4, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 592); - ZEPHIR_CALL_FUNCTION(&_15$$4, "rawurlencode", &_11, 352, &_14$$4); - zephir_check_call_status(); - ZEPHIR_INIT_NVAR(&_16$$4); - ZEPHIR_CONCAT_VSV(&_16$$4, &_13$$4, "=", &_15$$4); - zephir_array_update_zval(&parts, &index, &_16$$4, PH_COPY | PH_SEPARATE); - } ZEND_HASH_FOREACH_END(); + ZVAL_STRING(&_2, "/"); + ZEPHIR_INIT_VAR(&_3); + ZVAL_STRING(&_3, "@"); + ZEPHIR_CALL_FUNCTION(&_4, "preg_quote", NULL, 354, &_2, &_3); + zephir_check_call_status(); + ZEPHIR_INIT_VAR(&_5); + ZEPHIR_CONCAT_SVS(&_5, "@[^", &_4, "]+$@"); + ZEPHIR_INIT_NVAR(&_2); + zephir_preg_match(&_2, &_5, &uri, &matches, 0, 0 , 0 ); + if (zephir_is_true(&_2)) { + ZEPHIR_OBS_VAR(&filename); + zephir_array_fetch_long(&filename, &matches, 0, PH_NOISY, "phalcon/Http/Response.zep", 861); } else { - ZEPHIR_CALL_METHOD(NULL, &parts, "rewind", NULL, 0); + ZEPHIR_INIT_NVAR(&filename); + ZVAL_STRING(&filename, ""); + } + if (zephir_is_true(suffix)) { + ZEPHIR_INIT_VAR(&_6$$3); + ZVAL_STRING(&_6$$3, "@"); + ZEPHIR_CALL_FUNCTION(&_7$$3, "preg_quote", NULL, 354, suffix, &_6$$3); zephir_check_call_status(); - while (1) { - ZEPHIR_CALL_METHOD(&_4, &parts, "valid", NULL, 0); - zephir_check_call_status(); - if (!zend_is_true(&_4)) { - break; - } - ZEPHIR_CALL_METHOD(&index, &parts, "key", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&part, &parts, "current", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&split, this_ptr, "splitqueryvalue", &_7, 417, &part); - zephir_check_call_status(); - zephir_array_fetch_long(&_17$$6, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 587); - if (UNEXPECTED(Z_TYPE_P(&_17$$6) == IS_NULL)) { - zephir_array_fetch_long(&_18$$7, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 588); - ZEPHIR_CALL_FUNCTION(&_19$$7, "rawurlencode", &_11, 352, &_18$$7); - zephir_check_call_status(); - zephir_array_update_zval(&parts, &index, &_19$$7, PH_COPY | PH_SEPARATE); - continue; - } - zephir_array_fetch_long(&_20$$6, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 592); - ZEPHIR_CALL_FUNCTION(&_21$$6, "rawurlencode", &_11, 352, &_20$$6); - zephir_check_call_status(); - zephir_array_fetch_long(&_22$$6, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 592); - ZEPHIR_CALL_FUNCTION(&_23$$6, "rawurlencode", &_11, 352, &_22$$6); - zephir_check_call_status(); - ZEPHIR_INIT_NVAR(&_24$$6); - ZEPHIR_CONCAT_VSV(&_24$$6, &_21$$6, "=", &_23$$6); - zephir_array_update_zval(&parts, &index, &_24$$6, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &parts, "next", NULL, 0); - zephir_check_call_status(); - } + ZEPHIR_INIT_VAR(&_8$$3); + ZEPHIR_CONCAT_SVS(&_8$$3, "@", &_7$$3, "$@"); + ZEPHIR_INIT_NVAR(&_6$$3); + ZVAL_STRING(&_6$$3, ""); + ZEPHIR_CALL_FUNCTION(&_9$$3, "preg_replace", NULL, 37, &_8$$3, &_6$$3, &filename); + zephir_check_call_status(); + ZEPHIR_CPY_WRT(&filename, &_9$$3); } - ZEPHIR_INIT_NVAR(&part); - ZEPHIR_INIT_NVAR(&index); - zephir_fast_join_str(return_value, SL("&"), &parts); - RETURN_MM(); + RETURN_CCTOR(&filename); } -static PHP_METHOD(Phalcon_Http_Message_Uri, filterScheme) +static PHP_METHOD(Phalcon_Http_Response, encode) { - zval schemes; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *scheme_param = NULL, filtered, _0, _1, _2, _3, _4$$4, _5$$4, _6$$4, _7$$4; - zval scheme; + zend_long options, depth, ZEPHIR_LAST_CALL_STATUS; + zval *data, data_sub, *options_param = NULL, *depth_param = NULL, encoded, _0, _1, _2, _3$$3, _4$$3, _5$$3; zval *this_ptr = getThis(); - ZVAL_UNDEF(&scheme); - ZVAL_UNDEF(&filtered); + ZVAL_UNDEF(&data_sub); + ZVAL_UNDEF(&encoded); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1); ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_3); - ZVAL_UNDEF(&_4$$4); - ZVAL_UNDEF(&_5$$4); - ZVAL_UNDEF(&_6$$4); - ZVAL_UNDEF(&_7$$4); - ZVAL_UNDEF(&schemes); + ZVAL_UNDEF(&_3$$3); + ZVAL_UNDEF(&_4$$3); + ZVAL_UNDEF(&_5$$3); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR(scheme) + ZEND_PARSE_PARAMETERS_START(1, 3) + Z_PARAM_ZVAL(data) + Z_PARAM_OPTIONAL + Z_PARAM_LONG(options) + Z_PARAM_LONG(depth) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &scheme_param); - if (UNEXPECTED(Z_TYPE_P(scheme_param) != IS_STRING && Z_TYPE_P(scheme_param) != IS_NULL)) { - zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'scheme' must be of the type string")); - RETURN_MM_NULL(); + zephir_fetch_params(1, 1, 2, &data, &options_param, &depth_param); + if (!options_param) { + options = 0; + } else { + options = zephir_get_intval(options_param); } - if (EXPECTED(Z_TYPE_P(scheme_param) == IS_STRING)) { - zephir_get_strval(&scheme, scheme_param); + if (!depth_param) { + depth = 512; } else { - ZEPHIR_INIT_VAR(&scheme); + depth = zephir_get_intval(depth_param); } - ZEPHIR_CALL_FUNCTION(&_0, "mb_strtolower", NULL, 10, &scheme); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_1); - ZVAL_STRING(&_1, "#:(//)?$#"); - ZEPHIR_INIT_VAR(&_2); - ZVAL_STRING(&_2, ""); - ZEPHIR_CALL_FUNCTION(&filtered, "preg_replace", NULL, 50, &_1, &_2, &_0); + ZVAL_LONG(&_0, options); + ZVAL_LONG(&_1, depth); + ZEPHIR_INIT_VAR(&encoded); + zephir_json_encode(&encoded, data, zephir_get_intval(&_0) ); + ZEPHIR_CALL_FUNCTION(&_2, "json_last_error", NULL, 187); zephir_check_call_status(); - ZEPHIR_INIT_VAR(&schemes); - zephir_create_array(&schemes, 2, 0); - add_assoc_long_ex(&schemes, SL("http"), 1); - add_assoc_long_ex(&schemes, SL("https"), 1); - ZEPHIR_INIT_VAR(&_3); - ZVAL_STRING(&_3, ""); - if (UNEXPECTED(ZEPHIR_IS_IDENTICAL(&_3, &filtered))) { - RETURN_MM_STRING(""); - } - if (UNEXPECTED(!(zephir_array_isset(&schemes, &filtered)))) { - ZEPHIR_INIT_VAR(&_4$$4); - object_init_ex(&_4$$4, phalcon_http_message_exception_invalidargumentexception_ce); - ZEPHIR_INIT_VAR(&_5$$4); - ZEPHIR_INIT_VAR(&_6$$4); - zephir_array_keys(&_6$$4, &schemes); - zephir_fast_join_str(&_5$$4, SL(", "), &_6$$4); - ZEPHIR_INIT_VAR(&_7$$4); - ZEPHIR_CONCAT_SVSSVS(&_7$$4, "Unsupported scheme [", &filtered, "]. ", "Scheme must be one of [", &_5$$4, "]"); - ZEPHIR_CALL_METHOD(NULL, &_4$$4, "__construct", NULL, 40, &_7$$4); + if (UNEXPECTED(!ZEPHIR_IS_LONG_IDENTICAL(&_2, 0))) { + ZEPHIR_INIT_VAR(&_3$$3); + object_init_ex(&_3$$3, spl_ce_InvalidArgumentException); + ZEPHIR_CALL_FUNCTION(&_4$$3, "json_last_error_msg", NULL, 188); + zephir_check_call_status(); + ZEPHIR_INIT_VAR(&_5$$3); + ZEPHIR_CONCAT_SV(&_5$$3, "json_encode error: ", &_4$$3); + ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 189, &_5$$3); zephir_check_call_status(); - zephir_throw_exception_debug(&_4$$4, "phalcon/Http/Message/Uri.zep", 625); + zephir_throw_exception_debug(&_3$$3, "phalcon/Http/Response.zep", 885); ZEPHIR_MM_RESTORE(); return; } - RETURN_CTOR(&scheme); + RETURN_CCTOR(&encoded); } -static PHP_METHOD(Phalcon_Http_Message_Uri, splitQueryValue) +zend_object *zephir_init_properties_Phalcon_Http_Response(zend_class_entry *class_type) { + zval _0, _1$$3; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *element_param = NULL, __$null, data; - zval element; - zval *this_ptr = getThis(); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1$$3); + - ZVAL_UNDEF(&element); - ZVAL_NULL(&__$null); - ZVAL_UNDEF(&data); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR(element) - ZEND_PARSE_PARAMETERS_END(); -#endif + ZEPHIR_MM_GROW(); + + { + zval local_this_ptr, *this_ptr = &local_this_ptr; + ZEPHIR_CREATE_OBJECT(this_ptr, class_type); + zephir_read_property_ex(&_0, this_ptr, ZEND_STRL("statusCodes"), PH_NOISY_CC | PH_READONLY); + if (Z_TYPE_P(&_0) == IS_NULL) { + ZEPHIR_INIT_VAR(&_1$$3); + array_init(&_1$$3); + zephir_update_property_zval_ex(this_ptr, ZEND_STRL("statusCodes"), &_1$$3); + } + ZEPHIR_MM_RESTORE(); + return Z_OBJ_P(this_ptr); + } +} - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &element_param); - zephir_get_strval(&element, element_param); - ZEPHIR_INIT_VAR(&data); - zephir_fast_explode_str(&data, SL("="), &element, 2 ); - if (UNEXPECTED(!(zephir_array_isset_long(&data, 1)))) { - zephir_array_append(&data, &__$null, PH_SEPARATE, "phalcon/Http/Message/Uri.zep", 642); - } - RETURN_CCTOR(&data); -} +#ifdef HAVE_CONFIG_H +#endif -static PHP_METHOD(Phalcon_Http_Message_Uri, getArrVal) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *collection_param = NULL, *index, index_sub, *defaultValue = NULL, defaultValue_sub, __$null, value; - zval collection; - zval *this_ptr = getThis(); - ZVAL_UNDEF(&collection); - ZVAL_UNDEF(&index_sub); - ZVAL_UNDEF(&defaultValue_sub); - ZVAL_NULL(&__$null); - ZVAL_UNDEF(&value); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(2, 3) - Z_PARAM_ARRAY(collection) - Z_PARAM_ZVAL(index) - Z_PARAM_OPTIONAL - Z_PARAM_ZVAL_OR_NULL(defaultValue) - ZEND_PARSE_PARAMETERS_END(); -#endif - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 2, 1, &collection_param, &index, &defaultValue); - ZEPHIR_OBS_COPY_OR_DUP(&collection, collection_param); - if (!defaultValue) { - defaultValue = &defaultValue_sub; - defaultValue = &__$null; - } +ZEPHIR_INIT_CLASS(Phalcon_Http_ResponseInterface) +{ + ZEPHIR_REGISTER_INTERFACE(Phalcon\\Http, ResponseInterface, phalcon, http_responseinterface, phalcon_http_responseinterface_method_entry); - if (UNEXPECTED(!(zephir_array_isset_fetch(&value, &collection, index, 1)))) { - RETVAL_ZVAL(defaultValue, 1, 0); - RETURN_MM(); - } - RETURN_CTOR(&value); + return SUCCESS; } +ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, appendContent); +ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, getContent); +ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, getStatusCode); +ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, getHeaders); +ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, hasHeader); +ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, isSent); +ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, redirect); +ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, resetHeaders); +ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, setContent); +ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, setContentLength); +ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, setContentType); +ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, setExpires); +ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, setFileToSend); +ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, setHeader); +ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, setJsonContent); +ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, setNotModified); +ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, setRawHeader); +ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, setStatusCode); +ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, send); +ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, sendCookies); +ZEPHIR_DOC_METHOD(Phalcon_Http_ResponseInterface, sendHeaders); @@ -116661,54 +109825,47 @@ static PHP_METHOD(Phalcon_Http_Message_Uri, getArrVal) -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_UriFactory) +ZEPHIR_INIT_CLASS(Phalcon_Http_Cookie_CookieInterface) { - ZEPHIR_REGISTER_CLASS(Phalcon\\Http\\Message, UriFactory, phalcon, http_message_urifactory, phalcon_http_message_urifactory_method_entry, ZEND_ACC_FINAL_CLASS); + ZEPHIR_REGISTER_INTERFACE(Phalcon\\Http\\Cookie, CookieInterface, phalcon, http_cookie_cookieinterface, phalcon_http_cookie_cookieinterface_method_entry); - zend_class_implements(phalcon_http_message_urifactory_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\message\\urifactoryinterface"))); return SUCCESS; } -static PHP_METHOD(Phalcon_Http_Message_UriFactory, createUri) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *uri_param = NULL; - zval uri; - zval *this_ptr = getThis(); +ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, delete); +ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, getDomain); +ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, getExpiration); +ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, getHttpOnly); +ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, getName); +ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, getOptions); +ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, getPath); +ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, getSecure); +ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, getValue); +ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, isUsingEncryption); +ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, send); +ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, setDomain); +ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, setExpiration); +ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, setHttpOnly); +ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, setOptions); +ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, setPath); +ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, setSecure); +ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, setValue); +ZEPHIR_DOC_METHOD(Phalcon_Http_Cookie_CookieInterface, useEncryption); - ZVAL_UNDEF(&uri); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(0, 1) - Z_PARAM_OPTIONAL - Z_PARAM_STR(uri) - ZEND_PARSE_PARAMETERS_END(); + + +#ifdef HAVE_CONFIG_H #endif - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 0, 1, &uri_param); - if (!uri_param) { - ZEPHIR_INIT_VAR(&uri); - ZVAL_STRING(&uri, ""); - } else { - if (UNEXPECTED(Z_TYPE_P(uri_param) != IS_STRING && Z_TYPE_P(uri_param) != IS_NULL)) { - zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'uri' must be of the type string")); - RETURN_MM_NULL(); - } - if (EXPECTED(Z_TYPE_P(uri_param) == IS_STRING)) { - zephir_get_strval(&uri, uri_param); - } else { - ZEPHIR_INIT_VAR(&uri); - } - } - object_init_ex(return_value, phalcon_http_message_uri_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 116, &uri); - zephir_check_call_status(); - RETURN_MM(); + +ZEPHIR_INIT_CLASS(Phalcon_Http_Cookie_Exception) +{ + ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Http\\Cookie, Exception, phalcon, http_cookie_exception, zend_ce_exception, NULL, 0); + + return SUCCESS; } @@ -116721,11 +109878,30 @@ static PHP_METHOD(Phalcon_Http_Message_UriFactory, createUri) -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_Exception_InvalidArgumentException) +ZEPHIR_INIT_CLASS(Phalcon_Http_Message_RequestMethodInterface) { - ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Http\\Message\\Exception, InvalidArgumentException, phalcon, http_message_exception_invalidargumentexception, spl_ce_InvalidArgumentException, NULL, 0); + ZEPHIR_REGISTER_INTERFACE(Phalcon\\Http\\Message, RequestMethodInterface, phalcon, http_message_requestmethodinterface, NULL); + + zephir_declare_class_constant_string(phalcon_http_message_requestmethodinterface_ce, SL("METHOD_CONNECT"), "CONNECT"); + + zephir_declare_class_constant_string(phalcon_http_message_requestmethodinterface_ce, SL("METHOD_DELETE"), "DELETE"); + + zephir_declare_class_constant_string(phalcon_http_message_requestmethodinterface_ce, SL("METHOD_GET"), "GET"); + + zephir_declare_class_constant_string(phalcon_http_message_requestmethodinterface_ce, SL("METHOD_HEAD"), "HEAD"); + + zephir_declare_class_constant_string(phalcon_http_message_requestmethodinterface_ce, SL("METHOD_OPTIONS"), "OPTIONS"); + + zephir_declare_class_constant_string(phalcon_http_message_requestmethodinterface_ce, SL("METHOD_PATCH"), "PATCH"); + + zephir_declare_class_constant_string(phalcon_http_message_requestmethodinterface_ce, SL("METHOD_POST"), "POST"); + + zephir_declare_class_constant_string(phalcon_http_message_requestmethodinterface_ce, SL("METHOD_PURGE"), "PURGE"); + + zephir_declare_class_constant_string(phalcon_http_message_requestmethodinterface_ce, SL("METHOD_PUT"), "PUT"); + + zephir_declare_class_constant_string(phalcon_http_message_requestmethodinterface_ce, SL("METHOD_TRACE"), "TRACE"); - zend_class_implements(phalcon_http_message_exception_invalidargumentexception_ce, 1, zend_ce_throwable); return SUCCESS; } @@ -116739,272 +109915,187 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Message_Exception_InvalidArgumentException) -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_Stream_Input) +ZEPHIR_INIT_CLASS(Phalcon_Http_Message_ResponseStatusCodeInterface) { - ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Http\\Message\\Stream, Input, phalcon, http_message_stream_input, phalcon_http_message_stream_ce, phalcon_http_message_stream_input_method_entry, 0); + ZEPHIR_REGISTER_INTERFACE(Phalcon\\Http\\Message, ResponseStatusCodeInterface, phalcon, http_message_responsestatuscodeinterface, NULL); - zend_declare_property_string(phalcon_http_message_stream_input_ce, SL("data"), "", ZEND_ACC_PRIVATE); - zend_declare_property_bool(phalcon_http_message_stream_input_ce, SL("eof"), 0, ZEND_ACC_PRIVATE); - return SUCCESS; -} + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_CONTINUE"), 100); -static PHP_METHOD(Phalcon_Http_Message_Stream_Input, __construct) -{ - zval _1, _2; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zephir_fcall_cache_entry *_0 = NULL; - zval *this_ptr = getThis(); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_SWITCHING_PROTOCOLS"), 101); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_PROCESSING"), 102); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_EARLY_HINTS"), 103); - ZEPHIR_MM_GROW(); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_OK"), 200); - ZEPHIR_INIT_VAR(&_1); - ZVAL_STRING(&_1, "php://input"); - ZEPHIR_INIT_VAR(&_2); - ZVAL_STRING(&_2, "rb"); - ZEPHIR_CALL_PARENT(NULL, phalcon_http_message_stream_input_ce, getThis(), "__construct", &_0, 0, &_1, &_2); - zephir_check_call_status(); - ZEPHIR_MM_RESTORE(); -} + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_CREATED"), 201); -static PHP_METHOD(Phalcon_Http_Message_Stream_Input, __toString) -{ - zval _0; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *this_ptr = getThis(); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_ACCEPTED"), 202); - ZVAL_UNDEF(&_0); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_NON_AUTHORITATIVE_INFORMATION"), 203); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_NO_CONTENT"), 204); - ZEPHIR_MM_GROW(); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_RESET_CONTENT"), 205); - zephir_read_property(&_0, this_ptr, ZEND_STRL("eof"), PH_NOISY_CC | PH_READONLY); - if (UNEXPECTED(zephir_is_true(&_0))) { - RETURN_MM_MEMBER(getThis(), "data"); - } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "getcontents", NULL, 0); - zephir_check_call_status(); - RETURN_MM_MEMBER(getThis(), "data"); -} + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_PARTIAL_CONTENT"), 206); -static PHP_METHOD(Phalcon_Http_Message_Stream_Input, getContents) -{ - zend_bool _3; - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *length_param = NULL, __$true, __$false, data, _0, _1, _2, _4; - zend_long length, ZEPHIR_LAST_CALL_STATUS; - zval *this_ptr = getThis(); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_MULTI_STATUS"), 207); - ZVAL_BOOL(&__$true, 1); - ZVAL_BOOL(&__$false, 0); - ZVAL_UNDEF(&data); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_4); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(0, 1) - Z_PARAM_OPTIONAL - Z_PARAM_LONG(length) - ZEND_PARSE_PARAMETERS_END(); -#endif + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_ALREADY_REPORTED"), 208); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_IM_USED"), 226); - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 0, 1, &length_param); - if (!length_param) { - length = -1; - } else { - length = zephir_get_intval(length_param); - } + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_MULTIPLE_CHOICES"), 300); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_MOVED_PERMANENTLY"), 301); - zephir_read_property(&_0, this_ptr, ZEND_STRL("eof"), PH_NOISY_CC | PH_READONLY); - if (UNEXPECTED(zephir_is_true(&_0))) { - RETURN_MM_MEMBER(getThis(), "data"); - } - zephir_read_property(&_1, this_ptr, ZEND_STRL("handle"), PH_NOISY_CC | PH_READONLY); - ZVAL_LONG(&_2, length); - ZEPHIR_CALL_FUNCTION(&data, "stream_get_contents", NULL, 79, &_1, &_2); - zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &data); - _3 = -1 == length; - if (!(_3)) { - ZEPHIR_CALL_METHOD(&_4, this_ptr, "eof", NULL, 0); - zephir_check_call_status(); - _3 = zephir_is_true(&_4); - } - if (UNEXPECTED(_3)) { - if (1) { - zephir_update_property_zval(this_ptr, ZEND_STRL("eof"), &__$true); - } else { - zephir_update_property_zval(this_ptr, ZEND_STRL("eof"), &__$false); - } - } - RETURN_MM_MEMBER(getThis(), "data"); -} + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_FOUND"), 302); -static PHP_METHOD(Phalcon_Http_Message_Stream_Input, isWritable) -{ - zval *this_ptr = getThis(); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_SEE_OTHER"), 303); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_NOT_MODIFIED"), 304); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_USE_PROXY"), 305); - RETURN_BOOL(0); -} + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_RESERVED"), 306); -static PHP_METHOD(Phalcon_Http_Message_Stream_Input, read) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zephir_fcall_cache_entry *_0 = NULL; - zval *length, length_sub, __$true, __$false, data, _1, _2; - zval *this_ptr = getThis(); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_TEMPORARY_REDIRECT"), 307); - ZVAL_UNDEF(&length_sub); - ZVAL_BOOL(&__$true, 1); - ZVAL_BOOL(&__$false, 0); - ZVAL_UNDEF(&data); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(length) - ZEND_PARSE_PARAMETERS_END(); -#endif + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_PERMANENT_REDIRECT"), 308); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_BAD_REQUEST"), 400); - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &length); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_UNAUTHORIZED"), 401); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_PAYMENT_REQUIRED"), 402); - ZEPHIR_CALL_PARENT(&data, phalcon_http_message_stream_input_ce, getThis(), "read", &_0, 0, length); - zephir_check_call_status(); - zephir_read_property(&_1, this_ptr, ZEND_STRL("eof"), PH_NOISY_CC | PH_READONLY); - if (UNEXPECTED(!ZEPHIR_IS_TRUE_IDENTICAL(&_1))) { - zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &data); - } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "eof", NULL, 0); - zephir_check_call_status(); - if (UNEXPECTED(zephir_is_true(&_2))) { - if (1) { - zephir_update_property_zval(this_ptr, ZEND_STRL("eof"), &__$true); - } else { - zephir_update_property_zval(this_ptr, ZEND_STRL("eof"), &__$false); - } - } - RETURN_CCTOR(&data); -} + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_FORBIDDEN"), 403); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_NOT_FOUND"), 404); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_METHOD_NOT_ALLOWED"), 405); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_NOT_ACCEPTABLE"), 406); -#ifdef HAVE_CONFIG_H -#endif + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_PROXY_AUTHENTICATION_REQUIRED"), 407); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_REQUEST_TIMEOUT"), 408); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_CONFLICT"), 409); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_GONE"), 410); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_LENGTH_REQUIRED"), 411); -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_Stream_Memory) -{ - ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Http\\Message\\Stream, Memory, phalcon, http_message_stream_memory, phalcon_http_message_stream_ce, phalcon_http_message_stream_memory_method_entry, 0); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_PRECONDITION_FAILED"), 412); - return SUCCESS; -} + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_PAYLOAD_TOO_LARGE"), 413); -static PHP_METHOD(Phalcon_Http_Message_Stream_Memory, __construct) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zephir_fcall_cache_entry *_0 = NULL; - zval *mode = NULL, mode_sub, _1; - zval *this_ptr = getThis(); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_URI_TOO_LONG"), 414); - ZVAL_UNDEF(&mode_sub); - ZVAL_UNDEF(&_1); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(0, 1) - Z_PARAM_OPTIONAL - Z_PARAM_ZVAL(mode) - ZEND_PARSE_PARAMETERS_END(); -#endif + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_UNSUPPORTED_MEDIA_TYPE"), 415); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_RANGE_NOT_SATISFIABLE"), 416); - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 0, 1, &mode); - if (!mode) { - mode = &mode_sub; - ZEPHIR_INIT_VAR(mode); - ZVAL_STRING(mode, "rb"); - } + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_EXPECTATION_FAILED"), 417); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_IM_A_TEAPOT"), 418); - ZEPHIR_INIT_VAR(&_1); - ZVAL_STRING(&_1, "php://memory"); - ZEPHIR_CALL_PARENT(NULL, phalcon_http_message_stream_memory_ce, getThis(), "__construct", &_0, 0, &_1, mode); - zephir_check_call_status(); - ZEPHIR_MM_RESTORE(); -} + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_MISDIRECTED_REQUEST"), 421); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_UNPROCESSABLE_ENTITY"), 422); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_LOCKED"), 423); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_FAILED_DEPENDENCY"), 424); -#ifdef HAVE_CONFIG_H -#endif + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_TOO_EARLY"), 425); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_UPGRADE_REQUIRED"), 426); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_PRECONDITION_REQUIRED"), 428); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_TOO_MANY_REQUESTS"), 429); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE"), 431); -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_Stream_Temp) -{ - ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Http\\Message\\Stream, Temp, phalcon, http_message_stream_temp, phalcon_http_message_stream_ce, phalcon_http_message_stream_temp_method_entry, 0); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_UNAVAILABLE_FOR_LEGAL_REASONS"), 451); - return SUCCESS; -} + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_INTERNAL_SERVER_ERROR"), 500); -static PHP_METHOD(Phalcon_Http_Message_Stream_Temp, __construct) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zephir_fcall_cache_entry *_0 = NULL; - zval *mode = NULL, mode_sub, _1; - zval *this_ptr = getThis(); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_NOT_IMPLEMENTED"), 501); - ZVAL_UNDEF(&mode_sub); - ZVAL_UNDEF(&_1); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(0, 1) - Z_PARAM_OPTIONAL - Z_PARAM_ZVAL(mode) - ZEND_PARSE_PARAMETERS_END(); -#endif + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_BAD_GATEWAY"), 502); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_SERVICE_UNAVAILABLE"), 503); - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 0, 1, &mode); - if (!mode) { - mode = &mode_sub; - ZEPHIR_INIT_VAR(mode); - ZVAL_STRING(mode, "rb"); - } + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_GATEWAY_TIMEOUT"), 504); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_VERSION_NOT_SUPPORTED"), 505); - ZEPHIR_INIT_VAR(&_1); - ZVAL_STRING(&_1, "php://temp"); - ZEPHIR_CALL_PARENT(NULL, phalcon_http_message_stream_temp_ce, getThis(), "__construct", &_0, 0, &_1, mode); - zephir_check_call_status(); - ZEPHIR_MM_RESTORE(); + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_VARIANT_ALSO_NEGOTIATES"), 506); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_INSUFFICIENT_STORAGE"), 507); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_LOOP_DETECTED"), 508); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_NOT_EXTENDED"), 510); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_NETWORK_AUTHENTICATION_REQUIRED"), 511); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_THIS_IS_FINE"), 218); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_PAGE_EXPIRED"), 419); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_METHOD_FAILURE"), 420); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_LOGIN_TIMEOUT"), 440); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_NO_RESPONSE"), 444); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_RETRY_WITH"), 449); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_BLOCKED_BY_WINDOWS_PARENTAL_CONTROLS"), 450); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_REQUEST_HEADER_TOO_LARGE"), 494); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_SSL_CERTIFICATE_ERROR"), 495); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_SSL_CERTIFICATE_REQUIRED"), 496); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_HTTP_REQUEST_SENT_TO_HTTPS_PORT"), 497); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_INVALID_TOKEN_ESRI"), 498); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_CLIENT_CLOSED_REQUEST"), 499); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_BANDWIDTH_LIMIT_EXCEEDED"), 509); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_UNKNOWN_ERROR"), 520); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_WEB_SERVER_IS_DOWN"), 521); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_CONNECTION_TIMEOUT"), 522); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_ORIGIN_IS_UNREACHABLE"), 523); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_TIMEOUT_OCCURRED"), 524); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_SSL_HANDSHAKE_FAILED"), 525); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_INVALID_SSL_CERTIFICATE"), 526); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_RAILGUN_ERROR"), 527); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_ORIGIN_DNS_ERROR"), 530); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_NETWORK_READ_TIMEOUT_ERROR"), 598); + + zephir_declare_class_constant_long(phalcon_http_message_responsestatuscodeinterface_ce, SL("STATUS_NETWORK_CONNECT_TIMEOUT_ERROR"), 599); + + return SUCCESS; } @@ -117122,33 +110213,33 @@ static PHP_METHOD(Phalcon_Http_Request_File, __construct) zephir_update_property_zval(this_ptr, ZEND_STRL("name"), &name); ZEPHIR_INIT_VAR(&_0$$3); ZVAL_STRING(&_0$$3, "PATHINFO_EXTENSION"); - ZEPHIR_CALL_FUNCTION(&_1$$3, "defined", NULL, 146, &_0$$3); + ZEPHIR_CALL_FUNCTION(&_1$$3, "defined", NULL, 113, &_0$$3); zephir_check_call_status(); if (zephir_is_true(&_1$$3)) { ZVAL_LONG(&_2$$4, 4); - ZEPHIR_CALL_FUNCTION(&_3$$4, "pathinfo", NULL, 118, &name, &_2$$4); + ZEPHIR_CALL_FUNCTION(&_3$$4, "pathinfo", NULL, 85, &name, &_2$$4); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("extension"), &_3$$4); } } ZEPHIR_INIT_VAR(&_5); ZVAL_STRING(&_5, "tmp_name"); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "getarrval", NULL, 433, &file, &_5); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "getarrval", NULL, 347, &file, &_5); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("tmp"), &_4); ZEPHIR_INIT_NVAR(&_5); ZVAL_STRING(&_5, "size"); - ZEPHIR_CALL_METHOD(&_6, this_ptr, "getarrval", NULL, 433, &file, &_5); + ZEPHIR_CALL_METHOD(&_6, this_ptr, "getarrval", NULL, 347, &file, &_5); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("size"), &_6); ZEPHIR_INIT_NVAR(&_5); ZVAL_STRING(&_5, "type"); - ZEPHIR_CALL_METHOD(&_7, this_ptr, "getarrval", NULL, 433, &file, &_5); + ZEPHIR_CALL_METHOD(&_7, this_ptr, "getarrval", NULL, 347, &file, &_5); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_7); ZEPHIR_INIT_NVAR(&_5); ZVAL_STRING(&_5, "error"); - ZEPHIR_CALL_METHOD(&_8, this_ptr, "getarrval", NULL, 433, &file, &_5); + ZEPHIR_CALL_METHOD(&_8, this_ptr, "getarrval", NULL, 347, &file, &_5); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("error"), &_8); if (zephir_is_true(key)) { @@ -117181,15 +110272,15 @@ static PHP_METHOD(Phalcon_Http_Request_File, getRealType) ZEPHIR_MM_GROW(); ZVAL_LONG(&_0, 16); - ZEPHIR_CALL_FUNCTION(&finfo, "finfo_open", NULL, 332, &_0); + ZEPHIR_CALL_FUNCTION(&finfo, "finfo_open", NULL, 305, &_0); zephir_check_call_status(); - if (Z_TYPE_P(&finfo) != IS_RESOURCE) { + if (ZEPHIR_IS_FALSE_IDENTICAL(&finfo)) { RETURN_MM_STRING(""); } zephir_read_property(&_0, this_ptr, ZEND_STRL("tmp"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 333, &finfo, &_0); + ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 306, &finfo, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 334, &finfo); + ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 307, &finfo); zephir_check_call_status(); RETURN_CCTOR(&mime); } @@ -117278,7 +110369,7 @@ static PHP_METHOD(Phalcon_Http_Request_File, moveTo) zephir_read_property(&_0, this_ptr, ZEND_STRL("tmp"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_FUNCTION("move_uploaded_file", NULL, 404, &_0, &destination); + ZEPHIR_RETURN_CALL_FUNCTION("move_uploaded_file", NULL, 348, &_0, &destination); zephir_check_call_status(); RETURN_MM(); } @@ -117636,7 +110727,7 @@ static PHP_METHOD(Phalcon_Http_Response_Cookies, send) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_FUNCTION(&_0, "headers_sent", NULL, 440); + ZEPHIR_CALL_FUNCTION(&_0, "headers_sent", NULL, 355); zephir_check_call_status(); _1 = ZEPHIR_IS_TRUE_IDENTICAL(&_0); if (!(_1)) { @@ -118175,7 +111266,7 @@ static PHP_METHOD(Phalcon_Http_Response_Headers, send) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_FUNCTION(&_0, "headers_sent", NULL, 440); + ZEPHIR_CALL_FUNCTION(&_0, "headers_sent", NULL, 355); zephir_check_call_status(); _1 = ZEPHIR_IS_TRUE_IDENTICAL(&_0); if (!(_1)) { @@ -118201,7 +111292,7 @@ static PHP_METHOD(Phalcon_Http_Response_Headers, send) if (Z_TYPE_P(&value) != IS_NULL) { ZEPHIR_INIT_NVAR(&_8$$5); ZEPHIR_CONCAT_VSV(&_8$$5, &header, ": ", &value); - ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 441, &_8$$5, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 356, &_8$$5, &__$true); zephir_check_call_status(); } else { _10$$6 = zephir_memnstr_str(&header, SL(":"), "phalcon/Http/Response/Headers.zep", 99); @@ -118213,12 +111304,12 @@ static PHP_METHOD(Phalcon_Http_Response_Headers, send) _10$$6 = ZEPHIR_IS_STRING(&_13$$6, "HTTP/"); } if (_10$$6) { - ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 441, &header, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 356, &header, &__$true); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&_14$$8); ZEPHIR_CONCAT_VS(&_14$$8, &header, ": "); - ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 441, &_14$$8, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 356, &_14$$8, &__$true); zephir_check_call_status(); } } @@ -118239,7 +111330,7 @@ static PHP_METHOD(Phalcon_Http_Response_Headers, send) if (Z_TYPE_P(&value) != IS_NULL) { ZEPHIR_INIT_NVAR(&_15$$10); ZEPHIR_CONCAT_VSV(&_15$$10, &header, ": ", &value); - ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 441, &_15$$10, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 356, &_15$$10, &__$true); zephir_check_call_status(); } else { _16$$11 = zephir_memnstr_str(&header, SL(":"), "phalcon/Http/Response/Headers.zep", 99); @@ -118251,12 +111342,12 @@ static PHP_METHOD(Phalcon_Http_Response_Headers, send) _16$$11 = ZEPHIR_IS_STRING(&_19$$11, "HTTP/"); } if (_16$$11) { - ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 441, &header, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 356, &header, &__$true); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&_20$$13); ZEPHIR_CONCAT_VS(&_20$$13, &header, ": "); - ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 441, &_20$$13, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 356, &_20$$13, &__$true); zephir_check_call_status(); } } @@ -118394,50 +111485,6 @@ ZEPHIR_DOC_METHOD(Phalcon_Http_Response_HeadersInterface, setRaw); -ZEPHIR_INIT_CLASS(Phalcon_Http_Server_AbstractMiddleware) -{ - ZEPHIR_REGISTER_CLASS(Phalcon\\Http\\Server, AbstractMiddleware, phalcon, http_server_abstractmiddleware, phalcon_http_server_abstractmiddleware_method_entry, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); - - zend_class_implements(phalcon_http_server_abstractmiddleware_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\server\\middlewareinterface"))); - return SUCCESS; -} - -static PHP_METHOD(Phalcon_Http_Server_AbstractMiddleware, process) -{ -} - - - - -#ifdef HAVE_CONFIG_H -#endif - - - - - -ZEPHIR_INIT_CLASS(Phalcon_Http_Server_AbstractRequestHandler) -{ - ZEPHIR_REGISTER_CLASS(Phalcon\\Http\\Server, AbstractRequestHandler, phalcon, http_server_abstractrequesthandler, phalcon_http_server_abstractrequesthandler_method_entry, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); - - zend_class_implements(phalcon_http_server_abstractrequesthandler_ce, 1, zephir_get_internal_ce(SL("psrext\\http\\server\\requesthandlerinterface"))); - return SUCCESS; -} - -static PHP_METHOD(Phalcon_Http_Server_AbstractRequestHandler, handle) -{ -} - - - - -#ifdef HAVE_CONFIG_H -#endif - - - - - ZEPHIR_INIT_CLASS(Phalcon_Image_Enum) { ZEPHIR_REGISTER_CLASS(Phalcon\\Image, Enum, phalcon, image_enum, NULL, 0); @@ -118576,17 +111623,17 @@ static PHP_METHOD(Phalcon_Image_ImageFactory, load) zephir_array_unset_string(config, SL("adapter"), PH_SEPARATE); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "file"); - ZEPHIR_CALL_METHOD(&file, this_ptr, "getarrval", NULL, 485, config, &_1); + ZEPHIR_CALL_METHOD(&file, this_ptr, "getarrval", NULL, 400, config, &_1); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "height"); ZVAL_NULL(&_2); - ZEPHIR_CALL_METHOD(&height, this_ptr, "getarrval", NULL, 485, config, &_1, &_2); + ZEPHIR_CALL_METHOD(&height, this_ptr, "getarrval", NULL, 400, config, &_1, &_2); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "width"); ZVAL_NULL(&_2); - ZEPHIR_CALL_METHOD(&width, this_ptr, "getarrval", NULL, 485, config, &_1, &_2); + ZEPHIR_CALL_METHOD(&width, this_ptr, "getarrval", NULL, 400, config, &_1, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "newinstance", NULL, 0, &name, &file, &width, &height); zephir_check_call_status(); @@ -118871,16 +111918,16 @@ static PHP_METHOD(Phalcon_Image_Adapter_AbstractAdapter, background) ZVAL_STRING(&_6$$4, "/./"); ZEPHIR_INIT_VAR(&_7$$4); ZVAL_STRING(&_7$$4, "$0$0"); - ZEPHIR_CALL_FUNCTION(&_8$$4, "preg_replace", NULL, 50, &_6$$4, &_7$$4, &color); + ZEPHIR_CALL_FUNCTION(&_8$$4, "preg_replace", NULL, 37, &_6$$4, &_7$$4, &color); zephir_check_call_status(); zephir_get_strval(&color, &_8$$4); } ZVAL_LONG(&_9, 2); - ZEPHIR_CALL_FUNCTION(&_10, "str_split", NULL, 117, &color, &_9); + ZEPHIR_CALL_FUNCTION(&_10, "str_split", NULL, 84, &color, &_9); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_11); ZVAL_STRING(&_11, "hexdec"); - ZEPHIR_CALL_FUNCTION(&colors, "array_map", NULL, 97, &_11, &_10); + ZEPHIR_CALL_FUNCTION(&colors, "array_map", NULL, 66, &_11, &_10); zephir_check_call_status(); zephir_array_fetch_long(&_12, &colors, 0, PH_NOISY | PH_READONLY, "phalcon/Image/Adapter/AbstractAdapter.zep", 93); zephir_array_fetch_long(&_13, &colors, 1, PH_NOISY | PH_READONLY, "phalcon/Image/Adapter/AbstractAdapter.zep", 93); @@ -119272,7 +112319,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_AbstractAdapter, render) if (ZEPHIR_IS_EMPTY(&ext)) { zephir_read_property(&_0$$3, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_1$$3, 4); - ZEPHIR_CALL_FUNCTION(&_2$$3, "pathinfo", NULL, 118, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(&_2$$3, "pathinfo", NULL, 85, &_0$$3, &_1$$3); zephir_check_call_status(); zephir_cast_to_string(&_3$$3, &_2$$3); ZEPHIR_CPY_WRT(&ext, &_3$$3); @@ -119476,14 +112523,14 @@ static PHP_METHOD(Phalcon_Image_Adapter_AbstractAdapter, resize) ZVAL_LONG(&_24, width); zephir_round(&_23, &_24, NULL, NULL); ZVAL_LONG(&_25, 1); - ZEPHIR_CALL_FUNCTION(&_26, "max", NULL, 119, &_23, &_25); + ZEPHIR_CALL_FUNCTION(&_26, "max", NULL, 86, &_23, &_25); zephir_check_call_status(); width = zephir_get_intval(&_26); ZEPHIR_INIT_VAR(&_27); ZVAL_LONG(&_25, height); zephir_round(&_27, &_25, NULL, NULL); ZVAL_LONG(&_28, 1); - ZEPHIR_CALL_FUNCTION(&_29, "max", NULL, 119, &_27, &_28); + ZEPHIR_CALL_FUNCTION(&_29, "max", NULL, 86, &_27, &_28); zephir_check_call_status(); height = zephir_get_intval(&_29); ZVAL_LONG(&_28, width); @@ -119719,16 +112766,16 @@ static PHP_METHOD(Phalcon_Image_Adapter_AbstractAdapter, text) ZVAL_STRING(&_6$$7, "/./"); ZEPHIR_INIT_VAR(&_7$$7); ZVAL_STRING(&_7$$7, "$0$0"); - ZEPHIR_CALL_FUNCTION(&_8$$7, "preg_replace", NULL, 50, &_6$$7, &_7$$7, &color); + ZEPHIR_CALL_FUNCTION(&_8$$7, "preg_replace", NULL, 37, &_6$$7, &_7$$7, &color); zephir_check_call_status(); zephir_get_strval(&color, &_8$$7); } ZVAL_LONG(&_9, 2); - ZEPHIR_CALL_FUNCTION(&_10, "str_split", NULL, 117, &color, &_9); + ZEPHIR_CALL_FUNCTION(&_10, "str_split", NULL, 84, &color, &_9); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_11); ZVAL_STRING(&_11, "hexdec"); - ZEPHIR_CALL_FUNCTION(&colors, "array_map", NULL, 97, &_11, &_10); + ZEPHIR_CALL_FUNCTION(&colors, "array_map", NULL, 66, &_11, &_10); zephir_check_call_status(); zephir_array_fetch_long(&_12, &colors, 0, PH_NOISY | PH_READONLY, "phalcon/Image/Adapter/AbstractAdapter.zep", 449); zephir_array_fetch_long(&_13, &colors, 1, PH_NOISY | PH_READONLY, "phalcon/Image/Adapter/AbstractAdapter.zep", 450); @@ -119958,11 +113005,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) zephir_read_property(&_1, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); if ((zephir_file_exists(&_1) == SUCCESS)) { zephir_read_property(&_2$$4, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_3$$4, "realpath", NULL, 102, &_2$$4); + ZEPHIR_CALL_FUNCTION(&_3$$4, "realpath", NULL, 71, &_2$$4); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("realpath"), &_3$$4); zephir_read_property(&_4$$4, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&imageinfo, "getimagesize", NULL, 335, &_4$$4); + ZEPHIR_CALL_FUNCTION(&imageinfo, "getimagesize", NULL, 308, &_4$$4); zephir_check_call_status(); if (zephir_is_true(&imageinfo)) { zephir_array_fetch_long(&_5$$5, &imageinfo, 0, PH_NOISY | PH_READONLY, "phalcon/Image/Adapter/Gd.zep", 38); @@ -119978,35 +113025,35 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) do { if (ZEPHIR_IS_LONG(&_9$$4, 1)) { zephir_read_property(&_10$$6, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_11$$6, "imagecreatefromgif", NULL, 442, &_10$$6); + ZEPHIR_CALL_FUNCTION(&_11$$6, "imagecreatefromgif", NULL, 357, &_10$$6); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_11$$6); break; } if (ZEPHIR_IS_LONG(&_9$$4, 2)) { zephir_read_property(&_12$$7, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_13$$7, "imagecreatefromjpeg", NULL, 443, &_12$$7); + ZEPHIR_CALL_FUNCTION(&_13$$7, "imagecreatefromjpeg", NULL, 358, &_12$$7); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_13$$7); break; } if (ZEPHIR_IS_LONG(&_9$$4, 3)) { zephir_read_property(&_14$$8, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_15$$8, "imagecreatefrompng", NULL, 444, &_14$$8); + ZEPHIR_CALL_FUNCTION(&_15$$8, "imagecreatefrompng", NULL, 359, &_14$$8); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_15$$8); break; } if (ZEPHIR_IS_LONG(&_9$$4, 15)) { zephir_read_property(&_16$$9, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_17$$9, "imagecreatefromwbmp", NULL, 445, &_16$$9); + ZEPHIR_CALL_FUNCTION(&_17$$9, "imagecreatefromwbmp", NULL, 360, &_16$$9); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_17$$9); break; } if (ZEPHIR_IS_LONG(&_9$$4, 16)) { zephir_read_property(&_18$$10, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_19$$10, "imagecreatefromxbm", NULL, 446, &_18$$10); + ZEPHIR_CALL_FUNCTION(&_19$$10, "imagecreatefromxbm", NULL, 361, &_18$$10); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_19$$10); break; @@ -120018,7 +113065,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) zephir_read_property(&_22$$12, this_ptr, ZEND_STRL("mime"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_23$$12); ZEPHIR_CONCAT_SVS(&_23$$12, "Installed GD does not support ", &_22$$12, " images"); - ZEPHIR_CALL_METHOD(NULL, &_21$$12, "__construct", NULL, 31, &_23$$12); + ZEPHIR_CALL_METHOD(NULL, &_21$$12, "__construct", NULL, 29, &_23$$12); zephir_check_call_status(); zephir_throw_exception_debug(&_21$$12, "phalcon/Image/Adapter/Gd.zep", 69); ZEPHIR_MM_RESTORE(); @@ -120029,7 +113076,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) } while(0); zephir_read_property(&_24$$4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 447, &_24$$4, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 362, &_24$$4, &__$true); zephir_check_call_status(); } else { _25$$13 = !width; @@ -120042,7 +113089,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) zephir_read_property(&_27$$14, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_28$$14); ZEPHIR_CONCAT_SV(&_28$$14, "Failed to create image from file ", &_27$$14); - ZEPHIR_CALL_METHOD(NULL, &_26$$14, "__construct", NULL, 31, &_28$$14); + ZEPHIR_CALL_METHOD(NULL, &_26$$14, "__construct", NULL, 29, &_28$$14); zephir_check_call_status(); zephir_throw_exception_debug(&_26$$14, "phalcon/Image/Adapter/Gd.zep", 83); ZEPHIR_MM_RESTORE(); @@ -120050,14 +113097,14 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) } ZVAL_LONG(&_29$$13, width); ZVAL_LONG(&_30$$13, height); - ZEPHIR_CALL_FUNCTION(&_31$$13, "imagecreatetruecolor", NULL, 448, &_29$$13, &_30$$13); + ZEPHIR_CALL_FUNCTION(&_31$$13, "imagecreatetruecolor", NULL, 363, &_29$$13, &_30$$13); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_31$$13); zephir_read_property(&_29$$13, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 449, &_29$$13, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 364, &_29$$13, &__$true); zephir_check_call_status(); zephir_read_property(&_30$$13, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 447, &_30$$13, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 362, &_30$$13, &__$true); zephir_check_call_status(); zephir_read_property(&_32$$13, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); zephir_update_property_zval(this_ptr, ZEND_STRL("realpath"), &_32$$13); @@ -120094,7 +113141,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, __destruct) zephir_read_property(&_0, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&image, &_0); if (Z_TYPE_P(&image) == IS_RESOURCE) { - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 450, &image); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 365, &image); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -120134,14 +113181,14 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, check) ZVAL_STRING(&_1, "2.0.1"); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, ">="); - ZEPHIR_CALL_FUNCTION(&_3, "version_compare", NULL, 88, &version, &_1, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "version_compare", NULL, 128, &version, &_1, &_2); zephir_check_call_status(); if (UNEXPECTED(!zephir_is_true(&_3))) { ZEPHIR_INIT_VAR(&_4$$5); object_init_ex(&_4$$5, phalcon_image_exception_ce); ZEPHIR_INIT_VAR(&_5$$5); ZEPHIR_CONCAT_SV(&_5$$5, "Phalcon\\Image\\Adapter\\GD requires GD version '2.0.1' or greater, you have ", &version); - ZEPHIR_CALL_METHOD(NULL, &_4$$5, "__construct", NULL, 31, &_5$$5); + ZEPHIR_CALL_METHOD(NULL, &_4$$5, "__construct", NULL, 29, &_5$$5); zephir_check_call_status(); zephir_throw_exception_debug(&_4$$5, "phalcon/Image/Adapter/Gd.zep", 129); ZEPHIR_MM_RESTORE(); @@ -120180,13 +113227,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, getVersion) ZVAL_NULL(&version); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "GD_VERSION"); - ZEPHIR_CALL_FUNCTION(&_1, "defined", NULL, 146, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "defined", NULL, 113, &_0); zephir_check_call_status(); if (zephir_is_true(&_1)) { ZEPHIR_INIT_NVAR(&version); ZEPHIR_GET_CONSTANT(&version, "GD_VERSION"); } else { - ZEPHIR_CALL_FUNCTION(&info, "gd_info", NULL, 451); + ZEPHIR_CALL_FUNCTION(&info, "gd_info", NULL, 366); zephir_check_call_status(); ZEPHIR_INIT_VAR(&matches); ZVAL_NULL(&matches); @@ -120249,7 +113296,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processBackground) ZEPHIR_INIT_VAR(&_0); ZVAL_DOUBLE(&_1, ((zephir_safe_div_long_long((opacity * 127), 100)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 306, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 279, &_1); zephir_check_call_status(); zephir_round(&_0, &_2, NULL, NULL); opacity = zephir_get_intval(&_0); @@ -120261,9 +113308,9 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processBackground) ZVAL_LONG(&_5, g); ZVAL_LONG(&_6, b); ZVAL_LONG(&_7, opacity); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 452, &background, &_4, &_5, &_6, &_7); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 367, &background, &_4, &_5, &_6, &_7); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 449, &background, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 364, &background, &__$true); zephir_check_call_status(); zephir_read_property(&_4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_5, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY); @@ -120272,11 +113319,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processBackground) ZVAL_LONG(&_8, 0); ZVAL_LONG(&_9, 0); ZVAL_LONG(&_10, 0); - ZEPHIR_CALL_FUNCTION(&_11, "imagecopy", NULL, 453, &background, &_4, &_7, &_8, &_9, &_10, &_5, &_6); + ZEPHIR_CALL_FUNCTION(&_11, "imagecopy", NULL, 368, &background, &_4, &_7, &_8, &_9, &_10, &_5, &_6); zephir_check_call_status(); if (zephir_is_true(&_11)) { zephir_read_property(&_12$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 450, &_12$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 365, &_12$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &background); } @@ -120313,7 +113360,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processBlur) } zephir_read_property(&_0$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_1$$3, 7); - ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_2, 454, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_2, 369, &_0$$3, &_1$$3); zephir_check_call_status(); i++; } @@ -120349,11 +113396,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processCreate) ZVAL_LONG(&_0, width); ZVAL_LONG(&_1, height); - ZEPHIR_CALL_FUNCTION(&image, "imagecreatetruecolor", NULL, 448, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&image, "imagecreatetruecolor", NULL, 363, &_0, &_1); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 449, &image, &__$false); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 364, &image, &__$false); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 447, &image, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 362, &image, &__$true); zephir_check_call_status(); RETURN_CCTOR(&image); } @@ -120406,16 +113453,16 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processCrop) ZVAL_LONG(&_0, height); zephir_array_update_string(&rect, SL("height"), &_0, PH_COPY | PH_SEPARATE); zephir_read_property(&_1, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&image, "imagecrop", NULL, 455, &_1, &rect); + ZEPHIR_CALL_FUNCTION(&image, "imagecrop", NULL, 370, &_1, &rect); zephir_check_call_status(); zephir_read_property(&_2, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 450, &_2); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 365, &_2); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &image); - ZEPHIR_CALL_FUNCTION(&_3, "imagesx", NULL, 456, &image); + ZEPHIR_CALL_FUNCTION(&_3, "imagesx", NULL, 371, &image); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("width"), &_3); - ZEPHIR_CALL_FUNCTION(&_4, "imagesy", NULL, 457, &image); + ZEPHIR_CALL_FUNCTION(&_4, "imagesy", NULL, 372, &image); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("height"), &_4); ZEPHIR_MM_RESTORE(); @@ -120448,12 +113495,12 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processFlip) if (direction == 11) { zephir_read_property(&_0$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_1$$3, 1); - ZEPHIR_CALL_FUNCTION(NULL, "imageflip", NULL, 458, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imageflip", NULL, 373, &_0$$3, &_1$$3); zephir_check_call_status(); } else { zephir_read_property(&_2$$4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_3$$4, 2); - ZEPHIR_CALL_FUNCTION(NULL, "imageflip", NULL, 458, &_2$$4, &_3$$4); + ZEPHIR_CALL_FUNCTION(NULL, "imageflip", NULL, 373, &_2$$4, &_3$$4); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -120518,32 +113565,32 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processMask) ZEPHIR_CALL_METHOD(&_0, mask, "render", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&maskImage, "imagecreatefromstring", NULL, 459, &_0); + ZEPHIR_CALL_FUNCTION(&maskImage, "imagecreatefromstring", NULL, 374, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 456, &maskImage); + ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 371, &maskImage); zephir_check_call_status(); mask_width = zephir_get_intval(&_1); - ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 457, &maskImage); + ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 372, &maskImage); zephir_check_call_status(); mask_height = zephir_get_intval(&_2); alpha = 127; - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 447, &maskImage, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 362, &maskImage, &__$true); zephir_check_call_status(); zephir_read_property(&_3, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_4, this_ptr, ZEND_STRL("height"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&newimage, this_ptr, "processcreate", NULL, 0, &_3, &_4); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 447, &newimage, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 362, &newimage, &__$true); zephir_check_call_status(); ZVAL_LONG(&_5, 0); ZVAL_LONG(&_6, 0); ZVAL_LONG(&_7, 0); ZVAL_LONG(&_8, alpha); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 452, &newimage, &_5, &_6, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 367, &newimage, &_5, &_6, &_7, &_8); zephir_check_call_status(); ZVAL_LONG(&_5, 0); ZVAL_LONG(&_6, 0); - ZEPHIR_CALL_FUNCTION(NULL, "imagefill", NULL, 460, &newimage, &_5, &_6, &color); + ZEPHIR_CALL_FUNCTION(NULL, "imagefill", NULL, 375, &newimage, &_5, &_6, &color); zephir_check_call_status(); zephir_read_property(&_5, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY); _9 = !ZEPHIR_IS_LONG(&_5, mask_width); @@ -120554,7 +113601,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processMask) if (_9) { zephir_read_property(&_10$$3, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_11$$3, this_ptr, ZEND_STRL("height"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&tempImage, "imagecreatetruecolor", NULL, 448, &_10$$3, &_11$$3); + ZEPHIR_CALL_FUNCTION(&tempImage, "imagecreatetruecolor", NULL, 363, &_10$$3, &_11$$3); zephir_check_call_status(); zephir_read_property(&_12$$3, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_13$$3, this_ptr, ZEND_STRL("height"), PH_NOISY_CC | PH_READONLY); @@ -120564,9 +113611,9 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processMask) ZVAL_LONG(&_17$$3, 0); ZVAL_LONG(&_18$$3, mask_width); ZVAL_LONG(&_19$$3, mask_height); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopyresampled", NULL, 461, &tempImage, &maskImage, &_14$$3, &_15$$3, &_16$$3, &_17$$3, &_12$$3, &_13$$3, &_18$$3, &_19$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopyresampled", NULL, 376, &tempImage, &maskImage, &_14$$3, &_15$$3, &_16$$3, &_17$$3, &_12$$3, &_13$$3, &_18$$3, &_19$$3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 450, &maskImage); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 365, &maskImage); zephir_check_call_status(); ZEPHIR_CPY_WRT(&maskImage, &tempImage); } @@ -120584,9 +113631,9 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processMask) } ZVAL_LONG(&_21$$5, x); ZVAL_LONG(&_22$$5, y); - ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_23, 462, &maskImage, &_21$$5, &_22$$5); + ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_23, 377, &maskImage, &_21$$5, &_22$$5); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_24, 463, &maskImage, &index); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_24, 378, &maskImage, &index); zephir_check_call_status(); if (zephir_array_isset_string(&color, SL("red"))) { zephir_array_fetch_string(&_25$$6, &color, SL("red"), PH_NOISY | PH_READONLY, "phalcon/Image/Adapter/Gd.zep", 291); @@ -120596,10 +113643,10 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processMask) zephir_read_property(&_21$$5, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_22$$5, x); ZVAL_LONG(&_27$$5, y); - ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_23, 462, &_21$$5, &_22$$5, &_27$$5); + ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_23, 377, &_21$$5, &_22$$5, &_27$$5); zephir_check_call_status(); zephir_read_property(&_22$$5, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_24, 463, &_22$$5, &index); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_24, 378, &_22$$5, &index); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&r); zephir_array_fetch_string(&r, &color, SL("red"), PH_NOISY, "phalcon/Image/Adapter/Gd.zep", 296); @@ -120608,20 +113655,20 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processMask) ZEPHIR_OBS_NVAR(&b); zephir_array_fetch_string(&b, &color, SL("blue"), PH_NOISY, "phalcon/Image/Adapter/Gd.zep", 298); ZVAL_LONG(&_27$$5, alpha); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 452, &newimage, &r, &g, &b, &_27$$5); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 367, &newimage, &r, &g, &b, &_27$$5); zephir_check_call_status(); ZVAL_LONG(&_27$$5, x); ZVAL_LONG(&_28$$5, y); - ZEPHIR_CALL_FUNCTION(NULL, "imagesetpixel", &_29, 464, &newimage, &_27$$5, &_28$$5, &color); + ZEPHIR_CALL_FUNCTION(NULL, "imagesetpixel", &_29, 379, &newimage, &_27$$5, &_28$$5, &color); zephir_check_call_status(); y++; } x++; } zephir_read_property(&_8, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 450, &_8); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 365, &_8); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 450, &maskImage); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 365, &maskImage); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &newimage); ZEPHIR_MM_RESTORE(); @@ -120686,7 +113733,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processPixelate) zephir_read_property(&_5$$4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_6$$4, x1); ZVAL_LONG(&_7$$4, y1); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorat", &_8, 462, &_5$$4, &_6$$4, &_7$$4); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorat", &_8, 377, &_5$$4, &_6$$4, &_7$$4); zephir_check_call_status(); x2 = (x + amount); y2 = (y + amount); @@ -120695,7 +113742,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processPixelate) ZVAL_LONG(&_9$$4, y); ZVAL_LONG(&_10$$4, x2); ZVAL_LONG(&_11$$4, y2); - ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", &_12, 465, &_6$$4, &_7$$4, &_9$$4, &_10$$4, &_11$$4, &color); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", &_12, 380, &_6$$4, &_7$$4, &_9$$4, &_10$$4, &_11$$4, &color); zephir_check_call_status(); y += amount; } @@ -120762,7 +113809,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processReflection) ZEPHIR_INIT_VAR(&_0); ZVAL_DOUBLE(&_1, ((zephir_safe_div_long_long((opacity * 127), 100)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 306, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 279, &_1); zephir_check_call_status(); zephir_round(&_0, &_2, NULL, NULL); opacity = zephir_get_intval(&_0); @@ -120783,7 +113830,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processReflection) ZVAL_LONG(&_8, 0); ZVAL_LONG(&_9, 0); ZVAL_LONG(&_10, 0); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", NULL, 453, &reflection, &_4, &_7, &_8, &_9, &_10, &_5, &_6); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", NULL, 368, &reflection, &_4, &_7, &_8, &_9, &_10, &_5, &_6); zephir_check_call_status(); offset = 0; while (1) { @@ -120816,14 +113863,14 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processReflection) ZVAL_LONG(&_22$$5, 0); ZVAL_LONG(&_23$$5, src_y); ZVAL_LONG(&_24$$5, 1); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", NULL, 453, &line, &_18$$5, &_20$$5, &_21$$5, &_22$$5, &_23$$5, &_19$$5, &_24$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", NULL, 368, &line, &_18$$5, &_20$$5, &_21$$5, &_22$$5, &_23$$5, &_19$$5, &_24$$5); zephir_check_call_status(); ZVAL_LONG(&_20$$5, 4); ZVAL_LONG(&_21$$5, 0); ZVAL_LONG(&_22$$5, 0); ZVAL_LONG(&_23$$5, 0); ZVAL_LONG(&_24$$5, dst_opacity); - ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_25, 454, &line, &_20$$5, &_21$$5, &_22$$5, &_23$$5, &_24$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_25, 369, &line, &_20$$5, &_21$$5, &_22$$5, &_23$$5, &_24$$5); zephir_check_call_status(); zephir_read_property(&_20$$5, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_21$$5, 0); @@ -120831,18 +113878,18 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processReflection) ZVAL_LONG(&_23$$5, 0); ZVAL_LONG(&_24$$5, 0); ZVAL_LONG(&_26$$5, 1); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", NULL, 453, &reflection, &line, &_21$$5, &_22$$5, &_23$$5, &_24$$5, &_20$$5, &_26$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", NULL, 368, &reflection, &line, &_21$$5, &_22$$5, &_23$$5, &_24$$5, &_20$$5, &_26$$5); zephir_check_call_status(); offset++; } zephir_read_property(&_7, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 450, &_7); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 365, &_7); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &reflection); - ZEPHIR_CALL_FUNCTION(&_27, "imagesx", NULL, 456, &reflection); + ZEPHIR_CALL_FUNCTION(&_27, "imagesx", NULL, 371, &reflection); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("width"), &_27); - ZEPHIR_CALL_FUNCTION(&_28, "imagesy", NULL, 457, &reflection); + ZEPHIR_CALL_FUNCTION(&_28, "imagesy", NULL, 372, &reflection); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("height"), &_28); ZEPHIR_MM_RESTORE(); @@ -120893,69 +113940,69 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processRender) ZEPHIR_INIT_VAR(&_0); zephir_fast_strtolower(&_0, &ext); zephir_get_strval(&ext, &_0); - ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 466); + ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 381); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "gif"); - ZEPHIR_CALL_FUNCTION(&_2, "strcmp", NULL, 315, &ext, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "strcmp", NULL, 288, &ext, &_1); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "jpg"); - ZEPHIR_CALL_FUNCTION(&_3, "strcmp", NULL, 315, &ext, &_1); + ZEPHIR_CALL_FUNCTION(&_3, "strcmp", NULL, 288, &ext, &_1); zephir_check_call_status(); _4 = ZEPHIR_IS_LONG(&_3, 0); if (!(_4)) { ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "jpeg"); - ZEPHIR_CALL_FUNCTION(&_5, "strcmp", NULL, 315, &ext, &_1); + ZEPHIR_CALL_FUNCTION(&_5, "strcmp", NULL, 288, &ext, &_1); zephir_check_call_status(); _4 = ZEPHIR_IS_LONG(&_5, 0); } ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "png"); - ZEPHIR_CALL_FUNCTION(&_6, "strcmp", NULL, 315, &ext, &_1); + ZEPHIR_CALL_FUNCTION(&_6, "strcmp", NULL, 288, &ext, &_1); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "wbmp"); - ZEPHIR_CALL_FUNCTION(&_7, "strcmp", NULL, 315, &ext, &_1); + ZEPHIR_CALL_FUNCTION(&_7, "strcmp", NULL, 288, &ext, &_1); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "xbm"); - ZEPHIR_CALL_FUNCTION(&_8, "strcmp", NULL, 315, &ext, &_1); + ZEPHIR_CALL_FUNCTION(&_8, "strcmp", NULL, 288, &ext, &_1); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_2, 0)) { zephir_read_property(&_9$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 467, &_9$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 382, &_9$$3); zephir_check_call_status(); } else if (_4) { zephir_read_property(&_10$$4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_11$$4, quality); - ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 468, &_10$$4, &__$null, &_11$$4); + ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 383, &_10$$4, &__$null, &_11$$4); zephir_check_call_status(); } else if (ZEPHIR_IS_LONG(&_6, 0)) { zephir_read_property(&_12$$5, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 469, &_12$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 384, &_12$$5); zephir_check_call_status(); } else if (ZEPHIR_IS_LONG(&_7, 0)) { zephir_read_property(&_13$$6, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 470, &_13$$6); + ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 385, &_13$$6); zephir_check_call_status(); } else if (ZEPHIR_IS_LONG(&_8, 0)) { zephir_read_property(&_14$$7, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 471, &_14$$7, &__$null); + ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 386, &_14$$7, &__$null); zephir_check_call_status(); } else { ZEPHIR_INIT_VAR(&_15$$8); object_init_ex(&_15$$8, phalcon_image_exception_ce); ZEPHIR_INIT_VAR(&_16$$8); ZEPHIR_CONCAT_SVS(&_16$$8, "Installed GD does not support '", &ext, "' images"); - ZEPHIR_CALL_METHOD(NULL, &_15$$8, "__construct", NULL, 31, &_16$$8); + ZEPHIR_CALL_METHOD(NULL, &_15$$8, "__construct", NULL, 29, &_16$$8); zephir_check_call_status(); zephir_throw_exception_debug(&_15$$8, "phalcon/Image/Adapter/Gd.zep", 454); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", NULL, 472); + ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", NULL, 387); zephir_check_call_status(); RETURN_MM(); } @@ -120991,16 +114038,16 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processResize) zephir_read_property(&_0, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_1, width); ZVAL_LONG(&_2, height); - ZEPHIR_CALL_FUNCTION(&image, "imagescale", NULL, 473, &_0, &_1, &_2); + ZEPHIR_CALL_FUNCTION(&image, "imagescale", NULL, 388, &_0, &_1, &_2); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 450, &_1); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 365, &_1); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &image); - ZEPHIR_CALL_FUNCTION(&_3, "imagesx", NULL, 456, &image); + ZEPHIR_CALL_FUNCTION(&_3, "imagesx", NULL, 371, &image); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("width"), &_3); - ZEPHIR_CALL_FUNCTION(&_4, "imagesy", NULL, 457, &image); + ZEPHIR_CALL_FUNCTION(&_4, "imagesy", NULL, 372, &image); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("height"), &_4); ZEPHIR_MM_RESTORE(); @@ -121046,18 +114093,18 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processRotate) ZVAL_LONG(&_2, 0); ZVAL_LONG(&_3, 0); ZVAL_LONG(&_4, 127); - ZEPHIR_CALL_FUNCTION(&transparent, "imagecolorallocatealpha", NULL, 452, &_0, &_1, &_2, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&transparent, "imagecolorallocatealpha", NULL, 367, &_0, &_1, &_2, &_3, &_4); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_2, (360 - degrees)); ZVAL_LONG(&_3, 1); - ZEPHIR_CALL_FUNCTION(&image, "imagerotate", NULL, 474, &_1, &_2, &transparent, &_3); + ZEPHIR_CALL_FUNCTION(&image, "imagerotate", NULL, 389, &_1, &_2, &transparent, &_3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 447, &image, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 362, &image, &__$true); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&width, "imagesx", NULL, 456, &image); + ZEPHIR_CALL_FUNCTION(&width, "imagesx", NULL, 371, &image); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&height, "imagesy", NULL, 457, &image); + ZEPHIR_CALL_FUNCTION(&height, "imagesy", NULL, 372, &image); zephir_check_call_status(); zephir_read_property(&_2, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_3, 0); @@ -121065,11 +114112,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processRotate) ZVAL_LONG(&_5, 0); ZVAL_LONG(&_6, 0); ZVAL_LONG(&_7, 100); - ZEPHIR_CALL_FUNCTION(&_8, "imagecopymerge", NULL, 475, &_2, &image, &_3, &_4, &_5, &_6, &width, &height, &_7); + ZEPHIR_CALL_FUNCTION(&_8, "imagecopymerge", NULL, 390, &_2, &image, &_3, &_4, &_5, &_6, &width, &height, &_7); zephir_check_call_status(); if (zephir_is_true(&_8)) { zephir_read_property(&_9$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 450, &_9$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 365, &_9$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &image); zephir_update_property_zval(this_ptr, ZEND_STRL("width"), &width); @@ -121133,11 +114180,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processSave) ZVAL_LONG(&_0, 4); - ZEPHIR_CALL_FUNCTION(&ext, "pathinfo", NULL, 118, &file, &_0); + ZEPHIR_CALL_FUNCTION(&ext, "pathinfo", NULL, 85, &file, &_0); zephir_check_call_status(); if (!(zephir_is_true(&ext))) { zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("type"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&ext, "image_type_to_extension", NULL, 476, &_1$$3, &__$false); + ZEPHIR_CALL_FUNCTION(&ext, "image_type_to_extension", NULL, 391, &_1$$3, &__$false); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_2); @@ -121145,30 +114192,30 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processSave) ZEPHIR_CPY_WRT(&ext, &_2); ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "gif"); - ZEPHIR_CALL_FUNCTION(&_3, "strcmp", NULL, 315, &ext, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "strcmp", NULL, 288, &ext, &_2); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_3, 0)) { ZEPHIR_INIT_ZVAL_NREF(_4$$4); ZVAL_LONG(&_4$$4, 1); zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_4$$4); zephir_read_property(&_4$$4, this_ptr, ZEND_STRL("type"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_5$$4, "image_type_to_mime_type", NULL, 477, &_4$$4); + ZEPHIR_CALL_FUNCTION(&_5$$4, "image_type_to_mime_type", NULL, 392, &_4$$4); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("mime"), &_5$$4); zephir_read_property(&_6$$4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 467, &_6$$4, &file); + ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 382, &_6$$4, &file); zephir_check_call_status(); RETURN_MM_BOOL(1); } ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "jpg"); - ZEPHIR_CALL_FUNCTION(&_7, "strcmp", NULL, 315, &ext, &_2); + ZEPHIR_CALL_FUNCTION(&_7, "strcmp", NULL, 288, &ext, &_2); zephir_check_call_status(); _8 = ZEPHIR_IS_LONG(&_7, 0); if (!(_8)) { ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "jpeg"); - ZEPHIR_CALL_FUNCTION(&_9, "strcmp", NULL, 315, &ext, &_2); + ZEPHIR_CALL_FUNCTION(&_9, "strcmp", NULL, 288, &ext, &_2); zephir_check_call_status(); _8 = ZEPHIR_IS_LONG(&_9, 0); } @@ -121177,7 +114224,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processSave) ZVAL_LONG(&_10$$5, 2); zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_10$$5); zephir_read_property(&_10$$5, this_ptr, ZEND_STRL("type"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_11$$5, "image_type_to_mime_type", NULL, 477, &_10$$5); + ZEPHIR_CALL_FUNCTION(&_11$$5, "image_type_to_mime_type", NULL, 392, &_10$$5); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("mime"), &_11$$5); if (quality >= 0) { @@ -121188,63 +114235,63 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processSave) } zephir_read_property(&_12$$6, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_13$$6, quality); - ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 468, &_12$$6, &file, &_13$$6); + ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 383, &_12$$6, &file, &_13$$6); zephir_check_call_status(); } else { zephir_read_property(&_14$$9, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 468, &_14$$9, &file); + ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 383, &_14$$9, &file); zephir_check_call_status(); } RETURN_MM_BOOL(1); } ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "png"); - ZEPHIR_CALL_FUNCTION(&_15, "strcmp", NULL, 315, &ext, &_2); + ZEPHIR_CALL_FUNCTION(&_15, "strcmp", NULL, 288, &ext, &_2); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_15, 0)) { ZEPHIR_INIT_ZVAL_NREF(_16$$10); ZVAL_LONG(&_16$$10, 3); zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_16$$10); zephir_read_property(&_16$$10, this_ptr, ZEND_STRL("type"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_17$$10, "image_type_to_mime_type", NULL, 477, &_16$$10); + ZEPHIR_CALL_FUNCTION(&_17$$10, "image_type_to_mime_type", NULL, 392, &_16$$10); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("mime"), &_17$$10); zephir_read_property(&_18$$10, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 469, &_18$$10, &file); + ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 384, &_18$$10, &file); zephir_check_call_status(); RETURN_MM_BOOL(1); } ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "wbmp"); - ZEPHIR_CALL_FUNCTION(&_19, "strcmp", NULL, 315, &ext, &_2); + ZEPHIR_CALL_FUNCTION(&_19, "strcmp", NULL, 288, &ext, &_2); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_19, 0)) { ZEPHIR_INIT_ZVAL_NREF(_20$$11); ZVAL_LONG(&_20$$11, 15); zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_20$$11); zephir_read_property(&_20$$11, this_ptr, ZEND_STRL("type"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_21$$11, "image_type_to_mime_type", NULL, 477, &_20$$11); + ZEPHIR_CALL_FUNCTION(&_21$$11, "image_type_to_mime_type", NULL, 392, &_20$$11); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("mime"), &_21$$11); zephir_read_property(&_22$$11, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 470, &_22$$11, &file); + ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 385, &_22$$11, &file); zephir_check_call_status(); RETURN_MM_BOOL(1); } ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "xbm"); - ZEPHIR_CALL_FUNCTION(&_23, "strcmp", NULL, 315, &ext, &_2); + ZEPHIR_CALL_FUNCTION(&_23, "strcmp", NULL, 288, &ext, &_2); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_23, 0)) { ZEPHIR_INIT_ZVAL_NREF(_24$$12); ZVAL_LONG(&_24$$12, 16); zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_24$$12); zephir_read_property(&_24$$12, this_ptr, ZEND_STRL("type"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_25$$12, "image_type_to_mime_type", NULL, 477, &_24$$12); + ZEPHIR_CALL_FUNCTION(&_25$$12, "image_type_to_mime_type", NULL, 392, &_24$$12); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("mime"), &_25$$12); zephir_read_property(&_26$$12, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 471, &_26$$12, &file); + ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 386, &_26$$12, &file); zephir_check_call_status(); RETURN_MM_BOOL(1); } @@ -121252,7 +114299,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processSave) object_init_ex(&_2, phalcon_image_exception_ce); ZEPHIR_INIT_VAR(&_27); ZEPHIR_CONCAT_SVS(&_27, "Installed GD does not support '", &ext, "' images"); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 31, &_27); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 29, &_27); zephir_check_call_status(); zephir_throw_exception_debug(&_2, "phalcon/Image/Adapter/Gd.zep", 576); ZEPHIR_MM_RESTORE(); @@ -121296,7 +114343,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processSharpen) ZEPHIR_INIT_VAR(&_0); ZVAL_LONG(&_1, (-18 + ((amount * 0.08)))); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 306, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 279, &_1); zephir_check_call_status(); ZVAL_LONG(&_1, 2); zephir_round(&_0, &_2, &_1, NULL); @@ -121342,15 +114389,15 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processSharpen) zephir_read_property(&_5, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_6, (amount - 8)); ZVAL_LONG(&_7, 0); - ZEPHIR_CALL_FUNCTION(&_8, "imageconvolution", NULL, 478, &_5, &matrix, &_6, &_7); + ZEPHIR_CALL_FUNCTION(&_8, "imageconvolution", NULL, 393, &_5, &matrix, &_6, &_7); zephir_check_call_status(); if (zephir_is_true(&_8)) { zephir_read_property(&_9$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_10$$3, "imagesx", NULL, 456, &_9$$3); + ZEPHIR_CALL_FUNCTION(&_10$$3, "imagesx", NULL, 371, &_9$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("width"), &_10$$3); zephir_read_property(&_11$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_12$$3, "imagesy", NULL, 457, &_11$$3); + ZEPHIR_CALL_FUNCTION(&_12$$3, "imagesy", NULL, 372, &_11$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("height"), &_12$$3); } @@ -121430,14 +114477,14 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processText) topRightY = 0; ZEPHIR_INIT_VAR(&_0); ZVAL_DOUBLE(&_1, ((zephir_safe_div_long_long((opacity * 127), 100)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 306, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 279, &_1); zephir_check_call_status(); zephir_round(&_0, &_2, NULL, NULL); opacity = zephir_get_intval(&_0); if (!(ZEPHIR_IS_EMPTY(&fontfile))) { ZVAL_LONG(&_3$$3, size); ZVAL_LONG(&_4$$3, 0); - ZEPHIR_CALL_FUNCTION(&space, "imagettfbbox", NULL, 479, &_3$$3, &_4$$3, &fontfile, &text); + ZEPHIR_CALL_FUNCTION(&space, "imagettfbbox", NULL, 394, &_3$$3, &_4$$3, &fontfile, &text); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&space)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_image_exception_ce, "Call to imagettfbbox() failed", "phalcon/Image/Adapter/Gd.zep", 618); @@ -121458,11 +114505,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processText) topRightY = zephir_get_intval(&_8$$5); } ZVAL_LONG(&_3$$3, (topRightX - bottomLeftX)); - ZEPHIR_CALL_FUNCTION(&_9$$3, "abs", NULL, 306, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_9$$3, "abs", NULL, 279, &_3$$3); zephir_check_call_status(); width = (zephir_get_numberval(&_9$$3) + 10); ZVAL_LONG(&_3$$3, (topRightY - bottomLeftY)); - ZEPHIR_CALL_FUNCTION(&_10$$3, "abs", NULL, 306, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_10$$3, "abs", NULL, 279, &_3$$3); zephir_check_call_status(); height = (zephir_get_numberval(&_10$$3) + 10); if (offsetX < 0) { @@ -121478,7 +114525,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processText) ZVAL_LONG(&_13$$3, g); ZVAL_LONG(&_14$$3, b); ZVAL_LONG(&_15$$3, opacity); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 452, &_3$$3, &_4$$3, &_13$$3, &_14$$3, &_15$$3); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 367, &_3$$3, &_4$$3, &_13$$3, &_14$$3, &_15$$3); zephir_check_call_status(); angle = 0; zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); @@ -121486,15 +114533,15 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processText) ZVAL_LONG(&_14$$3, angle); ZVAL_LONG(&_15$$3, offsetX); ZVAL_LONG(&_16$$3, offsetY); - ZEPHIR_CALL_FUNCTION(NULL, "imagettftext", NULL, 480, &_4$$3, &_13$$3, &_14$$3, &_15$$3, &_16$$3, &color, &fontfile, &text); + ZEPHIR_CALL_FUNCTION(NULL, "imagettftext", NULL, 395, &_4$$3, &_13$$3, &_14$$3, &_15$$3, &_16$$3, &color, &fontfile, &text); zephir_check_call_status(); } else { ZVAL_LONG(&_17$$8, size); - ZEPHIR_CALL_FUNCTION(&_18$$8, "imagefontwidth", NULL, 481, &_17$$8); + ZEPHIR_CALL_FUNCTION(&_18$$8, "imagefontwidth", NULL, 396, &_17$$8); zephir_check_call_status(); width = (zephir_get_intval(&_18$$8) * zephir_fast_strlen_ev(&text)); ZVAL_LONG(&_17$$8, size); - ZEPHIR_CALL_FUNCTION(&_19$$8, "imagefontheight", NULL, 482, &_17$$8); + ZEPHIR_CALL_FUNCTION(&_19$$8, "imagefontheight", NULL, 397, &_17$$8); zephir_check_call_status(); height = zephir_get_intval(&_19$$8); if (offsetX < 0) { @@ -121510,13 +114557,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processText) ZVAL_LONG(&_23$$8, g); ZVAL_LONG(&_24$$8, b); ZVAL_LONG(&_25$$8, opacity); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 452, &_17$$8, &_22$$8, &_23$$8, &_24$$8, &_25$$8); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 367, &_17$$8, &_22$$8, &_23$$8, &_24$$8, &_25$$8); zephir_check_call_status(); zephir_read_property(&_22$$8, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_23$$8, size); ZVAL_LONG(&_24$$8, offsetX); ZVAL_LONG(&_25$$8, offsetY); - ZEPHIR_CALL_FUNCTION(NULL, "imagestring", NULL, 483, &_22$$8, &_23$$8, &_24$$8, &_25$$8, &text, &color); + ZEPHIR_CALL_FUNCTION(NULL, "imagestring", NULL, 398, &_22$$8, &_23$$8, &_24$$8, &_25$$8, &text, &color); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -121571,20 +114618,20 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processWatermark) ZEPHIR_CALL_METHOD(&_0, watermark, "render", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&overlay, "imagecreatefromstring", NULL, 459, &_0); + ZEPHIR_CALL_FUNCTION(&overlay, "imagecreatefromstring", NULL, 374, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 447, &overlay, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 362, &overlay, &__$true); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 456, &overlay); + ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 371, &overlay); zephir_check_call_status(); width = zephir_get_intval(&_1); - ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 457, &overlay); + ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 372, &overlay); zephir_check_call_status(); height = zephir_get_intval(&_2); if (opacity < 100) { ZEPHIR_INIT_VAR(&_3$$3); ZVAL_DOUBLE(&_4$$3, ((zephir_safe_div_long_long((opacity * 127), 100)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_5$$3, "abs", NULL, 306, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "abs", NULL, 279, &_4$$3); zephir_check_call_status(); zephir_round(&_3$$3, &_5$$3, NULL, NULL); opacity = zephir_get_intval(&_3$$3); @@ -121592,20 +114639,20 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processWatermark) ZVAL_LONG(&_6$$3, 127); ZVAL_LONG(&_7$$3, 127); ZVAL_LONG(&_8$$3, opacity); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 452, &overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 367, &overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3); zephir_check_call_status(); ZVAL_LONG(&_4$$3, 3); - ZEPHIR_CALL_FUNCTION(NULL, "imagelayereffect", NULL, 484, &overlay, &_4$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagelayereffect", NULL, 399, &overlay, &_4$$3); zephir_check_call_status(); ZVAL_LONG(&_4$$3, 0); ZVAL_LONG(&_6$$3, 0); ZVAL_LONG(&_7$$3, width); ZVAL_LONG(&_8$$3, height); - ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", NULL, 465, &overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3, &color); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", NULL, 380, &overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3, &color); zephir_check_call_status(); } zephir_read_property(&_9, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 449, &_9, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 364, &_9, &__$true); zephir_check_call_status(); zephir_read_property(&_10, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_11, offsetX); @@ -121614,10 +114661,10 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processWatermark) ZVAL_LONG(&_14, 0); ZVAL_LONG(&_15, width); ZVAL_LONG(&_16, height); - ZEPHIR_CALL_FUNCTION(&_17, "imagecopy", NULL, 453, &_10, &overlay, &_11, &_12, &_13, &_14, &_15, &_16); + ZEPHIR_CALL_FUNCTION(&_17, "imagecopy", NULL, 368, &_10, &overlay, &_11, &_12, &_13, &_14, &_15, &_16); zephir_check_call_status(); if (zephir_is_true(&_17)) { - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 450, &overlay); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 365, &overlay); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -121739,7 +114786,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, __construct) zephir_read_property(&_2, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); if ((zephir_file_exists(&_2) == SUCCESS)) { zephir_read_property(&_3$$4, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_4$$4, "realpath", NULL, 102, &_3$$4); + ZEPHIR_CALL_FUNCTION(&_4$$4, "realpath", NULL, 71, &_3$$4); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("realpath"), &_4$$4); zephir_read_property(&_5$$4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); @@ -121752,7 +114799,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, __construct) zephir_read_property(&_9$$5, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_10$$5); ZEPHIR_CONCAT_SVS(&_10$$5, "Imagick::readImage ", &_9$$5, " failed"); - ZEPHIR_CALL_METHOD(NULL, &_8$$5, "__construct", NULL, 31, &_10$$5); + ZEPHIR_CALL_METHOD(NULL, &_8$$5, "__construct", NULL, 29, &_10$$5); zephir_check_call_status(); zephir_throw_exception_debug(&_8$$5, "phalcon/Image/Adapter/Imagick.zep", 63); ZEPHIR_MM_RESTORE(); @@ -121765,7 +114812,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, __construct) zephir_read_property(&_13$$6, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_14$$6); ZVAL_STRING(&_14$$6, "Imagick::ALPHACHANNEL_SET"); - ZEPHIR_CALL_FUNCTION(&_15$$6, "constant", NULL, 147, &_14$$6); + ZEPHIR_CALL_FUNCTION(&_15$$6, "constant", NULL, 114, &_14$$6); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_13$$6, "setimagealphachannel", NULL, 0, &_15$$6); zephir_check_call_status(); @@ -121794,7 +114841,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, __construct) zephir_read_property(&_22$$9, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_23$$9); ZEPHIR_CONCAT_SV(&_23$$9, "Failed to create image from file ", &_22$$9); - ZEPHIR_CALL_METHOD(NULL, &_21$$9, "__construct", NULL, 31, &_23$$9); + ZEPHIR_CALL_METHOD(NULL, &_21$$9, "__construct", NULL, 29, &_23$$9); zephir_check_call_status(); zephir_throw_exception_debug(&_21$$9, "phalcon/Image/Adapter/Imagick.zep", 84); ZEPHIR_MM_RESTORE(); @@ -121903,12 +114950,12 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, check) } ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "Imagick::IMAGICK_EXTNUM"); - ZEPHIR_CALL_FUNCTION(&_3, "defined", NULL, 146, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "defined", NULL, 113, &_2); zephir_check_call_status(); if (zephir_is_true(&_3)) { ZEPHIR_INIT_VAR(&_4$$5); ZVAL_STRING(&_4$$5, "Imagick::IMAGICK_EXTNUM"); - ZEPHIR_CALL_FUNCTION(&_5$$5, "constant", NULL, 147, &_4$$5); + ZEPHIR_CALL_FUNCTION(&_5$$5, "constant", NULL, 114, &_4$$5); zephir_check_call_status(); zephir_update_static_property_ce(phalcon_image_adapter_imagick_ce, ZEND_STRL("version"), &_5$$5); } @@ -122016,7 +115063,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processBackground) ZVAL_LONG(&_1, r); ZVAL_LONG(&_2, g); ZVAL_LONG(&_3, b); - ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 145, &_0, &_1, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 112, &_0, &_1, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&pixel1); object_init_ex(&pixel1, zephir_get_internal_ce(SL("imagickpixel"))); @@ -122046,7 +115093,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processBackground) if (!(zephir_is_true(&_7$$3))) { ZEPHIR_INIT_NVAR(&_9$$4); ZVAL_STRING(&_9$$4, "Imagick::ALPHACHANNEL_SET"); - ZEPHIR_CALL_FUNCTION(&_10$$4, "constant", &_11, 147, &_9$$4); + ZEPHIR_CALL_FUNCTION(&_10$$4, "constant", &_11, 114, &_9$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &background, "setimagealphachannel", &_12, 0, &_10$$4); zephir_check_call_status(); @@ -122055,11 +115102,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processBackground) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_14$$3); ZVAL_STRING(&_14$$3, "Imagick::EVALUATE_MULTIPLY"); - ZEPHIR_CALL_FUNCTION(&_15$$3, "constant", &_11, 147, &_14$$3); + ZEPHIR_CALL_FUNCTION(&_15$$3, "constant", &_11, 114, &_14$$3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_14$$3); ZVAL_STRING(&_14$$3, "Imagick::CHANNEL_ALPHA"); - ZEPHIR_CALL_FUNCTION(&_16$$3, "constant", &_11, 147, &_14$$3); + ZEPHIR_CALL_FUNCTION(&_16$$3, "constant", &_11, 114, &_14$$3); zephir_check_call_status(); ZVAL_LONG(&_17$$3, opacity); ZEPHIR_CALL_METHOD(NULL, &background, "evaluateimage", &_18, 0, &_15$$3, &_17$$3, &_16$$3); @@ -122072,7 +115119,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processBackground) zephir_read_property(&_21$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_14$$3); ZVAL_STRING(&_14$$3, "Imagick::COMPOSITE_DISSOLVE"); - ZEPHIR_CALL_FUNCTION(&_22$$3, "constant", &_11, 147, &_14$$3); + ZEPHIR_CALL_FUNCTION(&_22$$3, "constant", &_11, 114, &_14$$3); zephir_check_call_status(); ZVAL_LONG(&_23$$3, 0); ZVAL_LONG(&_24$$3, 0); @@ -122385,7 +115432,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processMask) zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_5$$3); ZVAL_STRING(&_5$$3, "Imagick::COMPOSITE_DSTIN"); - ZEPHIR_CALL_FUNCTION(&_6$$3, "constant", &_7, 147, &_5$$3); + ZEPHIR_CALL_FUNCTION(&_6$$3, "constant", &_7, 114, &_5$$3); zephir_check_call_status(); ZVAL_LONG(&_8$$3, 0); ZVAL_LONG(&_9$$3, 0); @@ -122611,7 +115658,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) while (1) { ZEPHIR_INIT_NVAR(&_19$$7); ZVAL_STRING(&_19$$7, "Imagick::COMPOSITE_DSTOUT"); - ZEPHIR_CALL_FUNCTION(&_20$$7, "constant", &_21, 147, &_19$$7); + ZEPHIR_CALL_FUNCTION(&_20$$7, "constant", &_21, 114, &_19$$7); zephir_check_call_status(); ZVAL_LONG(&_22$$7, 0); ZVAL_LONG(&_23$$7, 0); @@ -122623,11 +115670,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) } ZEPHIR_INIT_NVAR(&_19$$7); ZVAL_STRING(&_19$$7, "Imagick::EVALUATE_MULTIPLY"); - ZEPHIR_CALL_FUNCTION(&_25$$7, "constant", &_21, 147, &_19$$7); + ZEPHIR_CALL_FUNCTION(&_25$$7, "constant", &_21, 114, &_19$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_19$$7); ZVAL_STRING(&_19$$7, "Imagick::CHANNEL_ALPHA"); - ZEPHIR_CALL_FUNCTION(&_26$$7, "constant", &_21, 147, &_19$$7); + ZEPHIR_CALL_FUNCTION(&_26$$7, "constant", &_21, 114, &_19$$7); zephir_check_call_status(); ZVAL_LONG(&_22$$7, opacity); ZEPHIR_CALL_METHOD(NULL, &reflection, "evaluateimage", &_27, 0, &_25$$7, &_22$$7, &_26$$7); @@ -122663,7 +115710,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_36$$10); ZVAL_STRING(&_36$$10, "Imagick::ALPHACHANNEL_SET"); - ZEPHIR_CALL_FUNCTION(&_37$$10, "constant", &_21, 147, &_36$$10); + ZEPHIR_CALL_FUNCTION(&_37$$10, "constant", &_21, 114, &_36$$10); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &image, "setimagealphachannel", &_38, 0, &_37$$10); zephir_check_call_status(); @@ -122680,7 +115727,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) zephir_read_property(&_44$$10, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_36$$10); ZVAL_STRING(&_36$$10, "Imagick::COMPOSITE_SRC"); - ZEPHIR_CALL_FUNCTION(&_45$$10, "constant", &_21, 147, &_36$$10); + ZEPHIR_CALL_FUNCTION(&_45$$10, "constant", &_21, 114, &_36$$10); zephir_check_call_status(); ZVAL_LONG(&_46$$10, 0); ZVAL_LONG(&_47$$10, 0); @@ -122706,7 +115753,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) while (1) { ZEPHIR_INIT_NVAR(&_50$$13); ZVAL_STRING(&_50$$13, "Imagick::COMPOSITE_OVER"); - ZEPHIR_CALL_FUNCTION(&_51$$13, "constant", &_21, 147, &_50$$13); + ZEPHIR_CALL_FUNCTION(&_51$$13, "constant", &_21, 114, &_50$$13); zephir_check_call_status(); zephir_read_property(&_52$$13, this_ptr, ZEND_STRL("height"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_53$$13, 0); @@ -122804,7 +115851,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processRender) zephir_update_property_zval(this_ptr, ZEND_STRL("mime"), &_3); ZEPHIR_INIT_VAR(&_4); ZVAL_STRING(&_4, "gif"); - ZEPHIR_CALL_FUNCTION(&_5, "strcasecmp", NULL, 47, &extension, &_4); + ZEPHIR_CALL_FUNCTION(&_5, "strcasecmp", NULL, 34, &extension, &_4); zephir_check_call_status(); if (ZEPHIR_IS_LONG_IDENTICAL(&_5, 0)) { ZEPHIR_CALL_METHOD(NULL, &image, "optimizeimagelayers", NULL, 0); @@ -122812,20 +115859,20 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processRender) } else { ZEPHIR_INIT_VAR(&_6$$4); ZVAL_STRING(&_6$$4, "jpg"); - ZEPHIR_CALL_FUNCTION(&_7$$4, "strcasecmp", NULL, 47, &extension, &_6$$4); + ZEPHIR_CALL_FUNCTION(&_7$$4, "strcasecmp", NULL, 34, &extension, &_6$$4); zephir_check_call_status(); _8$$4 = ZEPHIR_IS_LONG_IDENTICAL(&_7$$4, 0); if (!(_8$$4)) { ZEPHIR_INIT_NVAR(&_6$$4); ZVAL_STRING(&_6$$4, "jpeg"); - ZEPHIR_CALL_FUNCTION(&_9$$4, "strcasecmp", NULL, 47, &extension, &_6$$4); + ZEPHIR_CALL_FUNCTION(&_9$$4, "strcasecmp", NULL, 34, &extension, &_6$$4); zephir_check_call_status(); _8$$4 = ZEPHIR_IS_LONG_IDENTICAL(&_9$$4, 0); } if (_8$$4) { ZEPHIR_INIT_VAR(&_10$$5); ZVAL_STRING(&_10$$5, "Imagick::COMPRESSION_JPEG"); - ZEPHIR_CALL_FUNCTION(&_11$$5, "constant", NULL, 147, &_10$$5); + ZEPHIR_CALL_FUNCTION(&_11$$5, "constant", NULL, 114, &_10$$5); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &image, "setimagecompression", NULL, 0, &_11$$5); zephir_check_call_status(); @@ -123013,7 +116060,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processSave) ZVAL_LONG(&_0, 4); - ZEPHIR_CALL_FUNCTION(&ext, "pathinfo", NULL, 118, &file, &_0); + ZEPHIR_CALL_FUNCTION(&ext, "pathinfo", NULL, 85, &file, &_0); zephir_check_call_status(); zephir_read_property(&_0, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(NULL, &_0, "setformat", NULL, 0, &ext); @@ -123033,7 +116080,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processSave) zephir_update_property_zval(this_ptr, ZEND_STRL("mime"), &_6); ZEPHIR_INIT_VAR(&_7); ZVAL_STRING(&_7, "gif"); - ZEPHIR_CALL_FUNCTION(&_8, "strcasecmp", NULL, 47, &ext, &_7); + ZEPHIR_CALL_FUNCTION(&_8, "strcasecmp", NULL, 34, &ext, &_7); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_8, 0)) { zephir_read_property(&_9$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); @@ -123041,7 +116088,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processSave) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_10$$3); ZVAL_STRING(&_10$$3, "w"); - ZEPHIR_CALL_FUNCTION(&fp, "fopen", NULL, 90, &file, &_10$$3); + ZEPHIR_CALL_FUNCTION(&fp, "fopen", NULL, 134, &file, &_10$$3); zephir_check_call_status(); zephir_read_property(&_11$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(NULL, &_11$$3, "writeimagesfile", NULL, 0, &fp); @@ -123051,13 +116098,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processSave) } ZEPHIR_INIT_NVAR(&_7); ZVAL_STRING(&_7, "jpg"); - ZEPHIR_CALL_FUNCTION(&_12, "strcasecmp", NULL, 47, &ext, &_7); + ZEPHIR_CALL_FUNCTION(&_12, "strcasecmp", NULL, 34, &ext, &_7); zephir_check_call_status(); _13 = ZEPHIR_IS_LONG(&_12, 0); if (!(_13)) { ZEPHIR_INIT_NVAR(&_7); ZVAL_STRING(&_7, "jpeg"); - ZEPHIR_CALL_FUNCTION(&_14, "strcasecmp", NULL, 47, &ext, &_7); + ZEPHIR_CALL_FUNCTION(&_14, "strcasecmp", NULL, 34, &ext, &_7); zephir_check_call_status(); _13 = ZEPHIR_IS_LONG(&_14, 0); } @@ -123065,7 +116112,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processSave) zephir_read_property(&_15$$4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_16$$4); ZVAL_STRING(&_16$$4, "Imagick::COMPRESSION_JPEG"); - ZEPHIR_CALL_FUNCTION(&_17$$4, "constant", NULL, 147, &_16$$4); + ZEPHIR_CALL_FUNCTION(&_17$$4, "constant", NULL, 114, &_16$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_15$$4, "setimagecompression", NULL, 0, &_17$$4); zephir_check_call_status(); @@ -123220,7 +116267,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) ZVAL_LONG(&_1, r); ZVAL_LONG(&_2, g); ZVAL_LONG(&_3, b); - ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 145, &_0, &_1, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 112, &_0, &_1, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_0); object_init_ex(&_0, zephir_get_internal_ce(SL("imagickpixel"))); @@ -123252,7 +116299,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) ZVAL_LONG(offsetY, 0); ZEPHIR_INIT_VAR(&_6$$7); ZVAL_STRING(&_6$$7, "Imagick::GRAVITY_CENTER"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 147, &_6$$7); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 114, &_6$$7); zephir_check_call_status(); } else { if (Z_TYPE_P(offsetY) == IS_LONG) { @@ -123265,13 +116312,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) ZVAL_LONG(offsetY, (y * -1)); ZEPHIR_INIT_VAR(&_7$$11); ZVAL_STRING(&_7$$11, "Imagick::GRAVITY_SOUTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 147, &_7$$11); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 114, &_7$$11); zephir_check_call_status(); } else { ZVAL_LONG(offsetX, 0); ZEPHIR_INIT_VAR(&_8$$12); ZVAL_STRING(&_8$$12, "Imagick::GRAVITY_NORTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 147, &_8$$12); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 114, &_8$$12); zephir_check_call_status(); } } else { @@ -123282,13 +116329,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) ZVAL_LONG(offsetY, (y * -1)); ZEPHIR_INIT_VAR(&_9$$14); ZVAL_STRING(&_9$$14, "Imagick::GRAVITY_SOUTH"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 147, &_9$$14); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 114, &_9$$14); zephir_check_call_status(); } else { ZVAL_LONG(offsetX, 0); ZEPHIR_INIT_VAR(&_10$$15); ZVAL_STRING(&_10$$15, "Imagick::GRAVITY_NORTH"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 147, &_10$$15); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 114, &_10$$15); zephir_check_call_status(); } } @@ -123307,13 +116354,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) ZVAL_LONG(offsetY, 0); ZEPHIR_INIT_VAR(&_11$$21); ZVAL_STRING(&_11$$21, "Imagick::GRAVITY_SOUTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 147, &_11$$21); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 114, &_11$$21); zephir_check_call_status(); } else { ZVAL_LONG(offsetY, 0); ZEPHIR_INIT_VAR(&_12$$22); ZVAL_STRING(&_12$$22, "Imagick::GRAVITY_SOUTH"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 147, &_12$$22); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 114, &_12$$22); zephir_check_call_status(); } } else { @@ -123324,13 +116371,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) ZVAL_LONG(offsetY, 0); ZEPHIR_INIT_VAR(&_13$$24); ZVAL_STRING(&_13$$24, "Imagick::GRAVITY_EAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 147, &_13$$24); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 114, &_13$$24); zephir_check_call_status(); } else { ZVAL_LONG(offsetY, 0); ZEPHIR_INIT_VAR(&_14$$25); ZVAL_STRING(&_14$$25, "Imagick::GRAVITY_WEST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 147, &_14$$25); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 114, &_14$$25); zephir_check_call_status(); } } @@ -123346,13 +116393,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) ZVAL_LONG(offsetY, (y * -1)); ZEPHIR_INIT_VAR(&_15$$29); ZVAL_STRING(&_15$$29, "Imagick::GRAVITY_SOUTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 147, &_15$$29); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 114, &_15$$29); zephir_check_call_status(); } else { ZVAL_LONG(offsetX, (x * -1)); ZEPHIR_INIT_VAR(&_16$$30); ZVAL_STRING(&_16$$30, "Imagick::GRAVITY_NORTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 147, &_16$$30); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 114, &_16$$30); zephir_check_call_status(); } } else { @@ -123363,13 +116410,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) ZVAL_LONG(offsetY, (y * -1)); ZEPHIR_INIT_VAR(&_17$$32); ZVAL_STRING(&_17$$32, "Imagick::GRAVITY_SOUTHWEST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 147, &_17$$32); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 114, &_17$$32); zephir_check_call_status(); } else { ZVAL_LONG(offsetX, 0); ZEPHIR_INIT_VAR(&_18$$33); ZVAL_STRING(&_18$$33, "Imagick::GRAVITY_NORTHWEST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 147, &_18$$33); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 114, &_18$$33); zephir_check_call_status(); } } @@ -123452,11 +116499,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processWatermark) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "Imagick::EVALUATE_MULTIPLY"); - ZEPHIR_CALL_FUNCTION(&_2, "constant", NULL, 147, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "constant", NULL, 114, &_1); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "Imagick::CHANNEL_ALPHA"); - ZEPHIR_CALL_FUNCTION(&_3, "constant", NULL, 147, &_1); + ZEPHIR_CALL_FUNCTION(&_3, "constant", NULL, 114, &_1); zephir_check_call_status(); ZVAL_LONG(&_4, opacity); ZEPHIR_CALL_METHOD(NULL, &watermark, "evaluateimage", NULL, 0, &_2, &_4, &_3); @@ -123469,7 +116516,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processWatermark) zephir_read_property(&_6$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_7$$3); ZVAL_STRING(&_7$$3, "Imagick::COMPOSITE_OVER"); - ZEPHIR_CALL_FUNCTION(&_8$$3, "constant", NULL, 147, &_7$$3); + ZEPHIR_CALL_FUNCTION(&_8$$3, "constant", NULL, 114, &_7$$3); zephir_check_call_status(); ZVAL_LONG(&_9$$3, offsetX); ZVAL_LONG(&_10$$3, offsetY); @@ -123577,7 +116624,7 @@ static PHP_METHOD(Phalcon_Logger_AbstractLogger, __construct) if (Z_TYPE_P(timezone) == IS_NULL) { - ZEPHIR_CALL_FUNCTION(&defaultTimezone, "date_default_timezone_get", NULL, 125); + ZEPHIR_CALL_FUNCTION(&defaultTimezone, "date_default_timezone_get", NULL, 92); zephir_check_call_status(); if (UNEXPECTED(1 == ZEPHIR_IS_EMPTY(&defaultTimezone))) { ZEPHIR_INIT_NVAR(&defaultTimezone); @@ -123919,11 +116966,11 @@ static PHP_METHOD(Phalcon_Logger_AbstractLogger, addMessage) ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 0, &_4$$3, &_3$$3); zephir_check_call_status(); ZVAL_LONG(&_5$$3, level); - ZEPHIR_CALL_METHOD(NULL, &item, "__construct", NULL, 126, &message, &levelName, &_5$$3, &_2$$3, &context); + ZEPHIR_CALL_METHOD(NULL, &item, "__construct", NULL, 93, &message, &levelName, &_5$$3, &_2$$3, &context); zephir_check_call_status(); zephir_read_property(&_5$$3, this_ptr, ZEND_STRL("adapters"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_6$$3, this_ptr, ZEND_STRL("excluded"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&collection, "array_diff_key", NULL, 127, &_5$$3, &_6$$3); + ZEPHIR_CALL_FUNCTION(&collection, "array_diff_key", NULL, 94, &_5$$3, &_6$$3); zephir_check_call_status(); zephir_is_iterable(&collection, 0, "phalcon/Logger/AbstractLogger.zep", 305); if (Z_TYPE_P(&collection) == IS_ARRAY) { @@ -124004,7 +117051,7 @@ static PHP_METHOD(Phalcon_Logger_AbstractLogger, getLevelNumber) zephir_fast_strtoupper(&levelName, level); ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "getlevels", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&levels, "array_flip", NULL, 128, &_0$$3); + ZEPHIR_CALL_FUNCTION(&levels, "array_flip", NULL, 95, &_0$$3); zephir_check_call_status(); if (zephir_array_isset(&levels, &levelName)) { zephir_array_fetch(&_1$$4, &levels, &levelName, PH_NOISY | PH_READONLY, "phalcon/Logger/AbstractLogger.zep", 330); @@ -124217,6 +117264,41 @@ static PHP_METHOD(Phalcon_Logger_AdapterFactory, getServices) +ZEPHIR_INIT_CLASS(Phalcon_Logger_Enum) +{ + ZEPHIR_REGISTER_CLASS(Phalcon\\Logger, Enum, phalcon, logger_enum, NULL, 0); + + zephir_declare_class_constant_long(phalcon_logger_enum_ce, SL("ALERT"), 2); + + zephir_declare_class_constant_long(phalcon_logger_enum_ce, SL("CRITICAL"), 1); + + zephir_declare_class_constant_long(phalcon_logger_enum_ce, SL("CUSTOM"), 8); + + zephir_declare_class_constant_long(phalcon_logger_enum_ce, SL("DEBUG"), 7); + + zephir_declare_class_constant_long(phalcon_logger_enum_ce, SL("EMERGENCY"), 0); + + zephir_declare_class_constant_long(phalcon_logger_enum_ce, SL("ERROR"), 3); + + zephir_declare_class_constant_long(phalcon_logger_enum_ce, SL("INFO"), 6); + + zephir_declare_class_constant_long(phalcon_logger_enum_ce, SL("NOTICE"), 5); + + zephir_declare_class_constant_long(phalcon_logger_enum_ce, SL("WARNING"), 4); + + return SUCCESS; +} + + + + +#ifdef HAVE_CONFIG_H +#endif + + + + + ZEPHIR_INIT_CLASS(Phalcon_Logger_Exception) { ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Logger, Exception, phalcon, logger_exception, zend_ce_exception, NULL, 0); @@ -124967,7 +118049,7 @@ static PHP_METHOD(Phalcon_Logger_LoggerFactory, newInstance) object_init_ex(return_value, phalcon_logger_logger_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 491, &name, &adapters, timezone); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 406, &name, &adapters, timezone); zephir_check_call_status(); RETURN_MM(); } @@ -125186,7 +118268,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, commit) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checktransaction", NULL, 95); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checktransaction", NULL, 64); zephir_check_call_status(); zephir_read_property(&_0, this_ptr, ZEND_STRL("queue"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&queue, &_0); @@ -125217,7 +118299,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, commit) } } ZEPHIR_INIT_NVAR(&item); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "resettransaction", NULL, 96); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "resettransaction", NULL, 65); zephir_check_call_status(); RETURN_THIS(); } @@ -125270,9 +118352,9 @@ static PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, rollback) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checktransaction", NULL, 95); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checktransaction", NULL, 64); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "resettransaction", NULL, 96); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "resettransaction", NULL, 65); zephir_check_call_status(); RETURN_THIS(); } @@ -125535,7 +118617,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Stream, __construct) } ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "r"); - ZEPHIR_CALL_FUNCTION(&_1, "mb_strpos", NULL, 113, &mode, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "mb_strpos", NULL, 82, &mode, &_0); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&_1)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_logger_exception_ce, "Adapter cannot be opened in read mode", "phalcon/Logger/Adapter/Stream.zep", 84); @@ -125618,7 +118700,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Stream, process) zephir_read_property(&_7$$4, this_ptr, ZEND_STRL("mode"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_8$$4); ZEPHIR_CONCAT_SVSVS(&_8$$4, "The file '", &_6$$4, "' cannot be opened with mode '", &_7$$4, "'"); - ZEPHIR_CALL_METHOD(NULL, &_5$$4, "__construct", NULL, 486, &_8$$4); + ZEPHIR_CALL_METHOD(NULL, &_5$$4, "__construct", NULL, 401, &_8$$4); zephir_check_call_status(); zephir_throw_exception_debug(&_5$$4, "phalcon/Logger/Adapter/Stream.zep", 128); ZEPHIR_MM_RESTORE(); @@ -125661,7 +118743,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Stream, phpFopen) zephir_get_strval(&mode, mode_param); - ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 90, &filename, &mode); + ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 134, &filename, &mode); zephir_check_call_status(); RETURN_MM(); } @@ -125760,7 +118842,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Syslog, close) if (!(zephir_is_true(&_0))) { RETURN_MM_BOOL(1); } - ZEPHIR_RETURN_CALL_FUNCTION("closelog", NULL, 487); + ZEPHIR_RETURN_CALL_FUNCTION("closelog", NULL, 402); zephir_check_call_status(); RETURN_MM(); } @@ -125817,9 +118899,9 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Syslog, process) zephir_cast_to_string(&_6$$3, &_5$$3); ZEPHIR_INIT_VAR(&_7$$3); ZVAL_STRING(&_7$$3, "Cannot open syslog for name [%s] and facility [%s]"); - ZEPHIR_CALL_FUNCTION(&_8$$3, "sprintf", NULL, 145, &_7$$3, &_4$$3, &_6$$3); + ZEPHIR_CALL_FUNCTION(&_8$$3, "sprintf", NULL, 112, &_7$$3, &_4$$3, &_6$$3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 486, &_8$$3); + ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 401, &_8$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$3, "phalcon/Logger/Adapter/Syslog.zep", 106); ZEPHIR_MM_RESTORE(); @@ -125832,9 +118914,9 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Syslog, process) } ZEPHIR_CALL_METHOD(&_9, item, "getlevel", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&level, this_ptr, "logleveltosyslog", NULL, 488, &_9); + ZEPHIR_CALL_METHOD(&level, this_ptr, "logleveltosyslog", NULL, 403, &_9); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "syslog", NULL, 489, &level, &message); + ZEPHIR_CALL_FUNCTION(NULL, "syslog", NULL, 404, &level, &message); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -125869,7 +118951,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Syslog, openlog) ZVAL_LONG(&_0, option); ZVAL_LONG(&_1, facility); - ZEPHIR_RETURN_CALL_FUNCTION("openlog", NULL, 490, &ident, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("openlog", NULL, 405, &ident, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -126983,7 +120065,8 @@ static PHP_METHOD(Phalcon_Messages_Messages, next) static PHP_METHOD(Phalcon_Messages_Messages, offsetExists) { - zval *index, index_sub, _0; + zval index_sub, _0; + zval *index; zval *this_ptr = getThis(); ZVAL_UNDEF(&index_sub); @@ -127006,7 +120089,8 @@ static PHP_METHOD(Phalcon_Messages_Messages, offsetExists) static PHP_METHOD(Phalcon_Messages_Messages, offsetGet) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *index, index_sub, message, returnValue, _0; + zval index_sub, message, returnValue, _0; + zval *index; zval *this_ptr = getThis(); ZVAL_UNDEF(&index_sub); @@ -127036,11 +120120,14 @@ static PHP_METHOD(Phalcon_Messages_Messages, offsetGet) static PHP_METHOD(Phalcon_Messages_Messages, offsetSet) { - zval *index, index_sub, *message, message_sub; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval index_sub, message_sub, _0; + zval *index, *message; zval *this_ptr = getThis(); ZVAL_UNDEF(&index_sub); ZVAL_UNDEF(&message_sub); + ZVAL_UNDEF(&_0); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) @@ -127050,21 +120137,26 @@ static PHP_METHOD(Phalcon_Messages_Messages, offsetSet) #endif - zephir_fetch_params_without_memory_grow(2, 0, &index, &message); + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 2, 0, &index, &message); - if (Z_TYPE_P(message) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_messages_exception_ce, "The message must be an object", "phalcon/Messages/Messages.zep", 241); + ZEPHIR_INIT_VAR(&_0); + zephir_gettype(&_0, message); + if (!ZEPHIR_IS_STRING(&_0, "object")) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_messages_exception_ce, "The message must be an object", "phalcon/Messages/Messages.zep", 241); return; } zephir_update_property_array(this_ptr, SL("messages"), index, message); + ZEPHIR_MM_RESTORE(); } static PHP_METHOD(Phalcon_Messages_Messages, offsetUnset) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *index, index_sub, _0, _1$$3, _2$$3; + zval index_sub, _0, _1$$3, _2$$3; + zval *index; zval *this_ptr = getThis(); ZVAL_UNDEF(&index_sub); @@ -127088,7 +120180,7 @@ static PHP_METHOD(Phalcon_Messages_Messages, offsetUnset) zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("messages"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_2$$3, 1); ZEPHIR_MAKE_REF(&_1$$3); - ZEPHIR_CALL_FUNCTION(NULL, "array_splice", NULL, 492, &_1$$3, index, &_2$$3); + ZEPHIR_CALL_FUNCTION(NULL, "array_splice", NULL, 407, &_1$$3, index, &_2$$3); ZEPHIR_UNREF(&_1$$3); zephir_check_call_status(); } @@ -127146,12 +120238,12 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Application) static PHP_METHOD(Phalcon_Mvc_Application, handle) { - zval _17$$21; - zend_class_entry *_6$$8; - zend_bool returnedResponse = 0, _10$$7, _13$$12, _31$$31, _33$$31; + zval _17$$20; + zend_class_entry *_6$$7; + zend_bool returnedResponse = 0, _1, _10$$6, _13$$11, _31$$30, _33$$30; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *uri_param = NULL, __$false, container, eventsManager, router, dispatcher, response, view, module, moduleObject, moduleName, className, path, implicitView, controller, possibleResponse, renderStatus, matchedRoute, match, _0, _3, _4, _21, _22, _23, _24, _41, _1$$4, _2$$4, _5$$8, _7$$7, _8$$9, _9$$9, _11$$13, _12$$13, _14$$19, _15$$19, _16$$16, _18$$23, _19$$24, _20$$24, _25$$26, _26$$26, _27$$28, _28$$28, _29$$30, _30$$30, _32$$32, _34$$35, _35$$36, _36$$36, _37$$39, _38$$39, _39$$40, _40$$41; + zval *uri_param = NULL, __$false, container, eventsManager, router, dispatcher, response, view, module, moduleObject, moduleName, className, path, implicitView, controller, possibleResponse, renderStatus, matchedRoute, match, _0, _2, _3, _4, _21, _22, _23, _24, _41, _5$$7, _7$$6, _8$$8, _9$$8, _11$$12, _12$$12, _14$$18, _15$$18, _16$$15, _18$$22, _19$$23, _20$$23, _25$$25, _26$$25, _27$$27, _28$$27, _29$$29, _30$$29, _32$$31, _34$$34, _35$$35, _36$$35, _37$$38, _38$$38, _39$$39, _40$$40; zval uri; zval *this_ptr = getThis(); @@ -127175,6 +120267,7 @@ static PHP_METHOD(Phalcon_Mvc_Application, handle) ZVAL_UNDEF(&matchedRoute); ZVAL_UNDEF(&match); ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_2); ZVAL_UNDEF(&_3); ZVAL_UNDEF(&_4); ZVAL_UNDEF(&_21); @@ -127182,35 +120275,33 @@ static PHP_METHOD(Phalcon_Mvc_Application, handle) ZVAL_UNDEF(&_23); ZVAL_UNDEF(&_24); ZVAL_UNDEF(&_41); - ZVAL_UNDEF(&_1$$4); - ZVAL_UNDEF(&_2$$4); - ZVAL_UNDEF(&_5$$8); - ZVAL_UNDEF(&_7$$7); - ZVAL_UNDEF(&_8$$9); - ZVAL_UNDEF(&_9$$9); - ZVAL_UNDEF(&_11$$13); - ZVAL_UNDEF(&_12$$13); - ZVAL_UNDEF(&_14$$19); - ZVAL_UNDEF(&_15$$19); - ZVAL_UNDEF(&_16$$16); - ZVAL_UNDEF(&_18$$23); - ZVAL_UNDEF(&_19$$24); - ZVAL_UNDEF(&_20$$24); - ZVAL_UNDEF(&_25$$26); - ZVAL_UNDEF(&_26$$26); - ZVAL_UNDEF(&_27$$28); - ZVAL_UNDEF(&_28$$28); - ZVAL_UNDEF(&_29$$30); - ZVAL_UNDEF(&_30$$30); - ZVAL_UNDEF(&_32$$32); - ZVAL_UNDEF(&_34$$35); - ZVAL_UNDEF(&_35$$36); - ZVAL_UNDEF(&_36$$36); - ZVAL_UNDEF(&_37$$39); - ZVAL_UNDEF(&_38$$39); - ZVAL_UNDEF(&_39$$40); - ZVAL_UNDEF(&_40$$41); - ZVAL_UNDEF(&_17$$21); + ZVAL_UNDEF(&_5$$7); + ZVAL_UNDEF(&_7$$6); + ZVAL_UNDEF(&_8$$8); + ZVAL_UNDEF(&_9$$8); + ZVAL_UNDEF(&_11$$12); + ZVAL_UNDEF(&_12$$12); + ZVAL_UNDEF(&_14$$18); + ZVAL_UNDEF(&_15$$18); + ZVAL_UNDEF(&_16$$15); + ZVAL_UNDEF(&_18$$22); + ZVAL_UNDEF(&_19$$23); + ZVAL_UNDEF(&_20$$23); + ZVAL_UNDEF(&_25$$25); + ZVAL_UNDEF(&_26$$25); + ZVAL_UNDEF(&_27$$27); + ZVAL_UNDEF(&_28$$27); + ZVAL_UNDEF(&_29$$29); + ZVAL_UNDEF(&_30$$29); + ZVAL_UNDEF(&_32$$31); + ZVAL_UNDEF(&_34$$34); + ZVAL_UNDEF(&_35$$35); + ZVAL_UNDEF(&_36$$35); + ZVAL_UNDEF(&_37$$38); + ZVAL_UNDEF(&_38$$38); + ZVAL_UNDEF(&_39$$39); + ZVAL_UNDEF(&_40$$40); + ZVAL_UNDEF(&_17$$20); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -127234,26 +120325,28 @@ static PHP_METHOD(Phalcon_Mvc_Application, handle) zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&container, &_0); - if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) { + if (Z_TYPE_P(&container) == IS_NULL) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_application_exception_ce, "A dependency injection container is required to access internal services", "phalcon/Mvc/Application.zep", 100); return; } zephir_read_property(&_0, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&eventsManager, &_0); - if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(&_2$$4); - ZVAL_STRING(&_2$$4, "application:boot"); - ZEPHIR_CALL_METHOD(&_1$$4, &eventsManager, "fire", NULL, 0, &_2$$4, this_ptr); + _1 = Z_TYPE_P(&eventsManager) != IS_NULL; + if (_1) { + ZEPHIR_INIT_VAR(&_3); + ZVAL_STRING(&_3, "application:boot"); + ZEPHIR_CALL_METHOD(&_2, &eventsManager, "fire", NULL, 0, &_3, this_ptr); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(&_1$$4)) { - RETURN_MM_BOOL(0); - } + _1 = ZEPHIR_IS_FALSE_IDENTICAL(&_2); } - ZEPHIR_INIT_VAR(&_4); - ZVAL_STRING(&_4, "router"); - ZEPHIR_CALL_METHOD(&_3, &container, "getshared", NULL, 0, &_4); + if (_1) { + RETURN_MM_BOOL(0); + } + ZEPHIR_INIT_NVAR(&_3); + ZVAL_STRING(&_3, "router"); + ZEPHIR_CALL_METHOD(&_4, &container, "getshared", NULL, 0, &_3); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&router, &_3); + ZEPHIR_CPY_WRT(&router, &_4); ZEPHIR_CALL_METHOD(NULL, &router, "handle", NULL, 0, &uri); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&matchedRoute, &router, "getmatchedroute", NULL, 0); @@ -127263,31 +120356,31 @@ static PHP_METHOD(Phalcon_Mvc_Application, handle) zephir_check_call_status(); if (Z_TYPE_P(&match) != IS_NULL) { if (zephir_is_instance_of(&match, SL("Closure"))) { - _6$$8 = zephir_fetch_class_str_ex(SL("Closure"), ZEND_FETCH_CLASS_AUTO); - ZEPHIR_CALL_CE_STATIC(&_5$$8, _6$$8, "bind", NULL, 0, &match, &container); + _6$$7 = zephir_fetch_class_str_ex(SL("Closure"), ZEND_FETCH_CLASS_AUTO); + ZEPHIR_CALL_CE_STATIC(&_5$$7, _6$$7, "bind", NULL, 0, &match, &container); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&match, &_5$$8); + ZEPHIR_CPY_WRT(&match, &_5$$7); } - ZEPHIR_CALL_METHOD(&_7$$7, &router, "getparams", NULL, 0); + ZEPHIR_CALL_METHOD(&_7$$6, &router, "getparams", NULL, 0); zephir_check_call_status(); ZEPHIR_INIT_VAR(&possibleResponse); - ZEPHIR_CALL_USER_FUNC_ARRAY(&possibleResponse, &match, &_7$$7); + ZEPHIR_CALL_USER_FUNC_ARRAY(&possibleResponse, &match, &_7$$6); zephir_check_call_status(); if (Z_TYPE_P(&possibleResponse) == IS_STRING) { - ZEPHIR_INIT_VAR(&_9$$9); - ZVAL_STRING(&_9$$9, "response"); - ZEPHIR_CALL_METHOD(&_8$$9, &container, "getshared", NULL, 0, &_9$$9); + ZEPHIR_INIT_VAR(&_9$$8); + ZVAL_STRING(&_9$$8, "response"); + ZEPHIR_CALL_METHOD(&_8$$8, &container, "getshared", NULL, 0, &_9$$8); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&response, &_8$$9); + ZEPHIR_CPY_WRT(&response, &_8$$8); ZEPHIR_CALL_METHOD(NULL, &response, "setcontent", NULL, 0, &possibleResponse); zephir_check_call_status(); RETURN_CCTOR(&response); } - _10$$7 = Z_TYPE_P(&possibleResponse) == IS_OBJECT; - if (_10$$7) { - _10$$7 = zephir_instance_of_ev(&possibleResponse, phalcon_http_responseinterface_ce); + _10$$6 = Z_TYPE_P(&possibleResponse) == IS_OBJECT; + if (_10$$6) { + _10$$6 = zephir_instance_of_ev(&possibleResponse, phalcon_http_responseinterface_ce); } - if (_10$$7) { + if (_10$$6) { ZEPHIR_CALL_METHOD(NULL, &possibleResponse, "sendheaders", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &possibleResponse, "sendcookies", NULL, 0); @@ -127306,22 +120399,22 @@ static PHP_METHOD(Phalcon_Mvc_Application, handle) ZVAL_NULL(&moduleObject); if (zephir_is_true(&moduleName)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(&_12$$13); - ZVAL_STRING(&_12$$13, "application:beforeStartModule"); - ZEPHIR_CALL_METHOD(&_11$$13, &eventsManager, "fire", NULL, 0, &_12$$13, this_ptr, &moduleName); + ZEPHIR_INIT_VAR(&_12$$12); + ZVAL_STRING(&_12$$12, "application:beforeStartModule"); + ZEPHIR_CALL_METHOD(&_11$$12, &eventsManager, "fire", NULL, 0, &_12$$12, this_ptr, &moduleName); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(&_11$$13)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(&_11$$12)) { RETURN_MM_BOOL(0); } } ZEPHIR_CALL_METHOD(&module, this_ptr, "getmodule", NULL, 0, &moduleName); zephir_check_call_status(); - _13$$12 = Z_TYPE_P(&module) != IS_ARRAY; - if (_13$$12) { - _13$$12 = Z_TYPE_P(&module) != IS_OBJECT; + _13$$11 = Z_TYPE_P(&module) != IS_ARRAY; + if (_13$$11) { + _13$$11 = Z_TYPE_P(&module) != IS_OBJECT; } - if (UNEXPECTED(_13$$12)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_application_exception_ce, "Invalid module definition", "phalcon/Mvc/Application.zep", 198); + if (UNEXPECTED(_13$$11)) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_application_exception_ce, "Invalid module definition", "phalcon/Mvc/Application.zep", 196); return; } if (Z_TYPE_P(&module) == IS_ARRAY) { @@ -127333,13 +120426,13 @@ static PHP_METHOD(Phalcon_Mvc_Application, handle) ZEPHIR_OBS_VAR(&path); if (zephir_array_isset_string_fetch(&path, &module, SL("path"), 0)) { if (UNEXPECTED(!((zephir_file_exists(&path) == SUCCESS)))) { - ZEPHIR_INIT_VAR(&_14$$19); - object_init_ex(&_14$$19, phalcon_mvc_application_exception_ce); - ZEPHIR_INIT_VAR(&_15$$19); - ZEPHIR_CONCAT_SVS(&_15$$19, "Module definition path '", &path, "' doesn't exist"); - ZEPHIR_CALL_METHOD(NULL, &_14$$19, "__construct", NULL, 31, &_15$$19); + ZEPHIR_INIT_VAR(&_14$$18); + object_init_ex(&_14$$18, phalcon_mvc_application_exception_ce); + ZEPHIR_INIT_VAR(&_15$$18); + ZEPHIR_CONCAT_SVS(&_15$$18, "Module definition path '", &path, "' doesn't exist"); + ZEPHIR_CALL_METHOD(NULL, &_14$$18, "__construct", NULL, 29, &_15$$18); zephir_check_call_status(); - zephir_throw_exception_debug(&_14$$19, "phalcon/Mvc/Application.zep", 220); + zephir_throw_exception_debug(&_14$$18, "phalcon/Mvc/Application.zep", 218); ZEPHIR_MM_RESTORE(); return; } @@ -127349,49 +120442,49 @@ static PHP_METHOD(Phalcon_Mvc_Application, handle) } } } - ZEPHIR_CALL_METHOD(&_16$$16, &container, "get", NULL, 0, &className); + ZEPHIR_CALL_METHOD(&_16$$15, &container, "get", NULL, 0, &className); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&moduleObject, &_16$$16); + ZEPHIR_CPY_WRT(&moduleObject, &_16$$15); ZEPHIR_CALL_METHOD(NULL, &moduleObject, "registerautoloaders", NULL, 0, &container); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &moduleObject, "registerservices", NULL, 0, &container); zephir_check_call_status(); } else { if (UNEXPECTED(!((zephir_is_instance_of(&module, SL("Closure")))))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_application_exception_ce, "Invalid module definition", "phalcon/Mvc/Application.zep", 241); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_application_exception_ce, "Invalid module definition", "phalcon/Mvc/Application.zep", 239); return; } - ZEPHIR_INIT_VAR(&_17$$21); - zephir_create_array(&_17$$21, 1, 0); - zephir_array_fast_append(&_17$$21, &container); + ZEPHIR_INIT_VAR(&_17$$20); + zephir_create_array(&_17$$20, 1, 0); + zephir_array_fast_append(&_17$$20, &container); ZEPHIR_INIT_NVAR(&moduleObject); - ZEPHIR_CALL_USER_FUNC_ARRAY(&moduleObject, &module, &_17$$21); + ZEPHIR_CALL_USER_FUNC_ARRAY(&moduleObject, &module, &_17$$20); zephir_check_call_status(); } if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(&_18$$23); - ZVAL_STRING(&_18$$23, "application:afterStartModule"); - ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_18$$23, this_ptr, &moduleObject); + ZEPHIR_INIT_VAR(&_18$$22); + ZVAL_STRING(&_18$$22, "application:afterStartModule"); + ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_18$$22, this_ptr, &moduleObject); zephir_check_call_status(); } } zephir_read_property(&_0, this_ptr, ZEND_STRL("implicitView"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&implicitView, &_0); if (ZEPHIR_IS_TRUE_IDENTICAL(&implicitView)) { - ZEPHIR_INIT_VAR(&_20$$24); - ZVAL_STRING(&_20$$24, "view"); - ZEPHIR_CALL_METHOD(&_19$$24, &container, "getshared", NULL, 0, &_20$$24); + ZEPHIR_INIT_VAR(&_20$$23); + ZVAL_STRING(&_20$$23, "view"); + ZEPHIR_CALL_METHOD(&_19$$23, &container, "getshared", NULL, 0, &_20$$23); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&view, &_19$$24); + ZEPHIR_CPY_WRT(&view, &_19$$23); } - ZEPHIR_INIT_NVAR(&_4); - ZVAL_STRING(&_4, "dispatcher"); - ZEPHIR_CALL_METHOD(&_3, &container, "getshared", NULL, 0, &_4); + ZEPHIR_INIT_NVAR(&_3); + ZVAL_STRING(&_3, "dispatcher"); + ZEPHIR_CALL_METHOD(&_4, &container, "getshared", NULL, 0, &_3); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&dispatcher, &_3); - ZEPHIR_CALL_METHOD(&_3, &router, "getmodulename", NULL, 0); + ZEPHIR_CPY_WRT(&dispatcher, &_4); + ZEPHIR_CALL_METHOD(&_4, &router, "getmodulename", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &dispatcher, "setmodulename", NULL, 0, &_3); + ZEPHIR_CALL_METHOD(NULL, &dispatcher, "setmodulename", NULL, 0, &_4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_21, &router, "getnamespacename", NULL, 0); zephir_check_call_status(); @@ -127414,11 +120507,11 @@ static PHP_METHOD(Phalcon_Mvc_Application, handle) zephir_check_call_status(); } if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(&_26$$26); - ZVAL_STRING(&_26$$26, "application:beforeHandleRequest"); - ZEPHIR_CALL_METHOD(&_25$$26, &eventsManager, "fire", NULL, 0, &_26$$26, this_ptr, &dispatcher); + ZEPHIR_INIT_VAR(&_26$$25); + ZVAL_STRING(&_26$$25, "application:beforeHandleRequest"); + ZEPHIR_CALL_METHOD(&_25$$25, &eventsManager, "fire", NULL, 0, &_26$$25, this_ptr, &dispatcher); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(&_25$$26)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(&_25$$25)) { RETURN_MM_BOOL(0); } } @@ -127427,52 +120520,52 @@ static PHP_METHOD(Phalcon_Mvc_Application, handle) ZEPHIR_CALL_METHOD(&possibleResponse, &dispatcher, "getreturnedvalue", NULL, 0); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&possibleResponse)) { - ZEPHIR_INIT_VAR(&_28$$28); - ZVAL_STRING(&_28$$28, "response"); - ZEPHIR_CALL_METHOD(&_27$$28, &container, "getshared", NULL, 0, &_28$$28); + ZEPHIR_INIT_VAR(&_28$$27); + ZVAL_STRING(&_28$$27, "response"); + ZEPHIR_CALL_METHOD(&_27$$27, &container, "getshared", NULL, 0, &_28$$27); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&response, &_27$$28); + ZEPHIR_CPY_WRT(&response, &_27$$27); } else { if (Z_TYPE_P(&possibleResponse) == IS_STRING) { - ZEPHIR_INIT_VAR(&_30$$30); - ZVAL_STRING(&_30$$30, "response"); - ZEPHIR_CALL_METHOD(&_29$$30, &container, "getshared", NULL, 0, &_30$$30); + ZEPHIR_INIT_VAR(&_30$$29); + ZVAL_STRING(&_30$$29, "response"); + ZEPHIR_CALL_METHOD(&_29$$29, &container, "getshared", NULL, 0, &_30$$29); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&response, &_29$$30); + ZEPHIR_CPY_WRT(&response, &_29$$29); ZEPHIR_CALL_METHOD(NULL, &response, "setcontent", NULL, 0, &possibleResponse); zephir_check_call_status(); } else { - _31$$31 = (Z_TYPE_P(&possibleResponse) == IS_OBJECT); - if (_31$$31) { - _31$$31 = (zephir_instance_of_ev(&possibleResponse, phalcon_http_responseinterface_ce)); + _31$$30 = (Z_TYPE_P(&possibleResponse) == IS_OBJECT); + if (_31$$30) { + _31$$30 = (zephir_instance_of_ev(&possibleResponse, phalcon_http_responseinterface_ce)); } - returnedResponse = _31$$31; + returnedResponse = _31$$30; if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(&_32$$32); - ZVAL_STRING(&_32$$32, "application:afterHandleRequest"); - ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_32$$32, this_ptr, &controller); + ZEPHIR_INIT_VAR(&_32$$31); + ZVAL_STRING(&_32$$31, "application:afterHandleRequest"); + ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_32$$31, this_ptr, &controller); zephir_check_call_status(); } - _33$$31 = returnedResponse == 0; - if (_33$$31) { - _33$$31 = ZEPHIR_IS_TRUE_IDENTICAL(&implicitView); + _33$$30 = returnedResponse == 0; + if (_33$$30) { + _33$$30 = ZEPHIR_IS_TRUE_IDENTICAL(&implicitView); } - if (_33$$31) { + if (_33$$30) { if (Z_TYPE_P(&controller) == IS_OBJECT) { ZEPHIR_INIT_VAR(&renderStatus); ZVAL_BOOL(&renderStatus, 1); if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(&_34$$35); - ZVAL_STRING(&_34$$35, "application:viewRender"); - ZEPHIR_CALL_METHOD(&renderStatus, &eventsManager, "fire", NULL, 0, &_34$$35, this_ptr, &view); + ZEPHIR_INIT_VAR(&_34$$34); + ZVAL_STRING(&_34$$34, "application:viewRender"); + ZEPHIR_CALL_METHOD(&renderStatus, &eventsManager, "fire", NULL, 0, &_34$$34, this_ptr, &view); zephir_check_call_status(); } if (!ZEPHIR_IS_FALSE_IDENTICAL(&renderStatus)) { - ZEPHIR_CALL_METHOD(&_35$$36, &dispatcher, "getcontrollername", NULL, 0); + ZEPHIR_CALL_METHOD(&_35$$35, &dispatcher, "getcontrollername", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_36$$36, &dispatcher, "getactionname", NULL, 0); + ZEPHIR_CALL_METHOD(&_36$$35, &dispatcher, "getactionname", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &view, "render", NULL, 0, &_35$$36, &_36$$36); + ZEPHIR_CALL_METHOD(NULL, &view, "render", NULL, 0, &_35$$35, &_36$$35); zephir_check_call_status(); } } @@ -127484,24 +120577,24 @@ static PHP_METHOD(Phalcon_Mvc_Application, handle) if (returnedResponse == 1) { ZEPHIR_CPY_WRT(&response, &possibleResponse); } else { - ZEPHIR_INIT_VAR(&_38$$39); - ZVAL_STRING(&_38$$39, "response"); - ZEPHIR_CALL_METHOD(&_37$$39, &container, "getshared", NULL, 0, &_38$$39); + ZEPHIR_INIT_VAR(&_38$$38); + ZVAL_STRING(&_38$$38, "response"); + ZEPHIR_CALL_METHOD(&_37$$38, &container, "getshared", NULL, 0, &_38$$38); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&response, &_37$$39); + ZEPHIR_CPY_WRT(&response, &_37$$38); if (ZEPHIR_IS_TRUE_IDENTICAL(&implicitView)) { - ZEPHIR_CALL_METHOD(&_39$$40, &view, "getcontent", NULL, 0); + ZEPHIR_CALL_METHOD(&_39$$39, &view, "getcontent", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &response, "setcontent", NULL, 0, &_39$$40); + ZEPHIR_CALL_METHOD(NULL, &response, "setcontent", NULL, 0, &_39$$39); zephir_check_call_status(); } } } } if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(&_40$$41); - ZVAL_STRING(&_40$$41, "application:beforeSendResponse"); - ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_40$$41, this_ptr, &response); + ZEPHIR_INIT_VAR(&_40$$40); + ZVAL_STRING(&_40$$40, "application:beforeSendResponse"); + ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_40$$40, this_ptr, &response); zephir_check_call_status(); } zephir_read_property(&_0, this_ptr, ZEND_STRL("sendHeaders"), PH_NOISY_CC | PH_READONLY); @@ -127973,7 +121066,7 @@ static PHP_METHOD(Phalcon_Mvc_Dispatcher, throwDispatchException) ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "A dependency injection container is required to access the 'response' service"); ZVAL_LONG(&_3$$3, 0); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 31, &_2$$3, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_2$$3, &_3$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Mvc/Dispatcher.zep", 228); ZEPHIR_MM_RESTORE(); @@ -127992,7 +121085,7 @@ static PHP_METHOD(Phalcon_Mvc_Dispatcher, throwDispatchException) ZEPHIR_INIT_VAR(&exception); object_init_ex(&exception, phalcon_mvc_dispatcher_exception_ce); ZVAL_LONG(&_0, exceptionCode); - ZEPHIR_CALL_METHOD(NULL, &exception, "__construct", NULL, 31, &message, &_0); + ZEPHIR_CALL_METHOD(NULL, &exception, "__construct", NULL, 29, &message, &_0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_4, this_ptr, "handleexception", NULL, 0, &exception); zephir_check_call_status(); @@ -128469,11 +121562,11 @@ static PHP_METHOD(Phalcon_Mvc_Micro, getService) if (Z_TYPE_P(&container) != IS_OBJECT) { ZEPHIR_INIT_NVAR(&container); object_init_ex(&container, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 493); + ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 408); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container); } - ZEPHIR_RETURN_CALL_METHOD(&container, "get", NULL, 494, &serviceName); + ZEPHIR_RETURN_CALL_METHOD(&container, "get", NULL, 409, &serviceName); zephir_check_call_status(); RETURN_MM(); } @@ -128515,11 +121608,11 @@ static PHP_METHOD(Phalcon_Mvc_Micro, getSharedService) if (Z_TYPE_P(&container) != IS_OBJECT) { ZEPHIR_INIT_NVAR(&container); object_init_ex(&container, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 493); + ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 408); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container); } - ZEPHIR_RETURN_CALL_METHOD(&container, "getshared", NULL, 495, &serviceName); + ZEPHIR_RETURN_CALL_METHOD(&container, "getshared", NULL, 410, &serviceName); zephir_check_call_status(); RETURN_MM(); } @@ -128699,7 +121792,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle) object_init_ex(&_8$$8, phalcon_mvc_micro_exception_ce); ZEPHIR_INIT_VAR(&_9$$8); ZVAL_STRING(&_9$$8, "Matched route doesn't have an associated handler"); - ZEPHIR_CALL_METHOD(NULL, &_8$$8, "__construct", NULL, 31, &_9$$8); + ZEPHIR_CALL_METHOD(NULL, &_8$$8, "__construct", NULL, 29, &_9$$8); zephir_check_call_status_or_jump(try_end_1); zephir_throw_exception_debug(&_8$$8, "phalcon/Mvc/Micro.zep", 455); goto try_end_1; @@ -128743,7 +121836,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle) object_init_ex(&_16$$14, phalcon_mvc_micro_exception_ce); ZEPHIR_INIT_NVAR(&_17$$14); ZVAL_STRING(&_17$$14, "'before' handler is not callable"); - ZEPHIR_CALL_METHOD(NULL, &_16$$14, "__construct", NULL, 31, &_17$$14); + ZEPHIR_CALL_METHOD(NULL, &_16$$14, "__construct", NULL, 29, &_17$$14); zephir_check_call_status_or_jump(try_end_1); zephir_throw_exception_debug(&_16$$14, "phalcon/Mvc/Micro.zep", 491); goto try_end_1; @@ -128782,7 +121875,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle) object_init_ex(&_20$$19, phalcon_mvc_micro_exception_ce); ZEPHIR_INIT_NVAR(&_21$$19); ZVAL_STRING(&_21$$19, "'before' handler is not callable"); - ZEPHIR_CALL_METHOD(NULL, &_20$$19, "__construct", NULL, 31, &_21$$19); + ZEPHIR_CALL_METHOD(NULL, &_20$$19, "__construct", NULL, 29, &_21$$19); zephir_check_call_status_or_jump(try_end_1); zephir_throw_exception_debug(&_20$$19, "phalcon/Mvc/Micro.zep", 491); goto try_end_1; @@ -128903,7 +121996,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle) object_init_ex(&_40$$34, phalcon_mvc_micro_exception_ce); ZEPHIR_INIT_NVAR(&_41$$34); ZVAL_STRING(&_41$$34, "'afterBinding' handler is not callable"); - ZEPHIR_CALL_METHOD(NULL, &_40$$34, "__construct", NULL, 31, &_41$$34); + ZEPHIR_CALL_METHOD(NULL, &_40$$34, "__construct", NULL, 29, &_41$$34); zephir_check_call_status_or_jump(try_end_1); zephir_throw_exception_debug(&_40$$34, "phalcon/Mvc/Micro.zep", 602); goto try_end_1; @@ -128942,7 +122035,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle) object_init_ex(&_44$$39, phalcon_mvc_micro_exception_ce); ZEPHIR_INIT_NVAR(&_45$$39); ZVAL_STRING(&_45$$39, "'afterBinding' handler is not callable"); - ZEPHIR_CALL_METHOD(NULL, &_44$$39, "__construct", NULL, 31, &_45$$39); + ZEPHIR_CALL_METHOD(NULL, &_44$$39, "__construct", NULL, 29, &_45$$39); zephir_check_call_status_or_jump(try_end_1); zephir_throw_exception_debug(&_44$$39, "phalcon/Mvc/Micro.zep", 602); goto try_end_1; @@ -128994,7 +122087,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle) object_init_ex(&_51$$45, phalcon_mvc_micro_exception_ce); ZEPHIR_INIT_NVAR(&_52$$45); ZVAL_STRING(&_52$$45, "One of the 'after' handlers is not callable"); - ZEPHIR_CALL_METHOD(NULL, &_51$$45, "__construct", NULL, 31, &_52$$45); + ZEPHIR_CALL_METHOD(NULL, &_51$$45, "__construct", NULL, 29, &_52$$45); zephir_check_call_status_or_jump(try_end_1); zephir_throw_exception_debug(&_51$$45, "phalcon/Mvc/Micro.zep", 648); goto try_end_1; @@ -129033,7 +122126,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle) object_init_ex(&_55$$50, phalcon_mvc_micro_exception_ce); ZEPHIR_INIT_NVAR(&_56$$50); ZVAL_STRING(&_56$$50, "One of the 'after' handlers is not callable"); - ZEPHIR_CALL_METHOD(NULL, &_55$$50, "__construct", NULL, 31, &_56$$50); + ZEPHIR_CALL_METHOD(NULL, &_55$$50, "__construct", NULL, 29, &_56$$50); zephir_check_call_status_or_jump(try_end_1); zephir_throw_exception_debug(&_55$$50, "phalcon/Mvc/Micro.zep", 648); goto try_end_1; @@ -129071,7 +122164,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle) object_init_ex(&_61$$55, phalcon_mvc_micro_exception_ce); ZEPHIR_INIT_VAR(&_62$$55); ZVAL_STRING(&_62$$55, "Not-Found handler is not callable or is not defined"); - ZEPHIR_CALL_METHOD(NULL, &_61$$55, "__construct", NULL, 31, &_62$$55); + ZEPHIR_CALL_METHOD(NULL, &_61$$55, "__construct", NULL, 29, &_62$$55); zephir_check_call_status_or_jump(try_end_1); zephir_throw_exception_debug(&_61$$55, "phalcon/Mvc/Micro.zep", 681); goto try_end_1; @@ -129113,7 +122206,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle) object_init_ex(&_67$$60, phalcon_mvc_micro_exception_ce); ZEPHIR_INIT_NVAR(&_68$$60); ZVAL_STRING(&_68$$60, "One of the 'finish' handlers is not callable"); - ZEPHIR_CALL_METHOD(NULL, &_67$$60, "__construct", NULL, 31, &_68$$60); + ZEPHIR_CALL_METHOD(NULL, &_67$$60, "__construct", NULL, 29, &_68$$60); zephir_check_call_status_or_jump(try_end_1); zephir_throw_exception_debug(&_67$$60, "phalcon/Mvc/Micro.zep", 717); goto try_end_1; @@ -129155,7 +122248,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle) object_init_ex(&_72$$65, phalcon_mvc_micro_exception_ce); ZEPHIR_INIT_NVAR(&_73$$65); ZVAL_STRING(&_73$$65, "One of the 'finish' handlers is not callable"); - ZEPHIR_CALL_METHOD(NULL, &_72$$65, "__construct", NULL, 31, &_73$$65); + ZEPHIR_CALL_METHOD(NULL, &_72$$65, "__construct", NULL, 29, &_73$$65); zephir_check_call_status_or_jump(try_end_1); zephir_throw_exception_debug(&_72$$65, "phalcon/Mvc/Micro.zep", 717); goto try_end_1; @@ -129310,11 +122403,11 @@ static PHP_METHOD(Phalcon_Mvc_Micro, hasService) if (Z_TYPE_P(&container) != IS_OBJECT) { ZEPHIR_INIT_NVAR(&container); object_init_ex(&container, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 493); + ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 408); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container); } - ZEPHIR_RETURN_CALL_METHOD(&container, "has", NULL, 496, &serviceName); + ZEPHIR_RETURN_CALL_METHOD(&container, "has", NULL, 411, &serviceName); zephir_check_call_status(); RETURN_MM(); } @@ -129463,7 +122556,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, mount) if (zephir_is_true(&_0)) { ZEPHIR_INIT_VAR(&lazyHandler); object_init_ex(&lazyHandler, phalcon_mvc_micro_lazyloader_ce); - ZEPHIR_CALL_METHOD(NULL, &lazyHandler, "__construct", NULL, 497, &mainHandler); + ZEPHIR_CALL_METHOD(NULL, &lazyHandler, "__construct", NULL, 412, &mainHandler); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&lazyHandler, &mainHandler); @@ -129610,23 +122703,24 @@ static PHP_METHOD(Phalcon_Mvc_Micro, offsetExists) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *alias, alias_sub; + zval offset_sub; + zval *offset; zval *this_ptr = getThis(); - ZVAL_UNDEF(&alias_sub); + ZVAL_UNDEF(&offset_sub); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(alias) + Z_PARAM_ZVAL(offset) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &alias); + zephir_fetch_params(1, 1, 0, &offset); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "hasservice", NULL, 0, alias); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "hasservice", NULL, 0, offset); zephir_check_call_status(); RETURN_MM(); } @@ -129635,23 +122729,24 @@ static PHP_METHOD(Phalcon_Mvc_Micro, offsetGet) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *alias, alias_sub; + zval offset_sub; + zval *offset; zval *this_ptr = getThis(); - ZVAL_UNDEF(&alias_sub); + ZVAL_UNDEF(&offset_sub); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(alias) + Z_PARAM_ZVAL(offset) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &alias); + zephir_fetch_params(1, 1, 0, &offset); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getservice", NULL, 0, alias); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getservice", NULL, 0, offset); zephir_check_call_status(); RETURN_MM(); } @@ -129660,25 +122755,26 @@ static PHP_METHOD(Phalcon_Mvc_Micro, offsetSet) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *alias, alias_sub, *definition, definition_sub; + zval offset_sub, value_sub; + zval *offset, *value; zval *this_ptr = getThis(); - ZVAL_UNDEF(&alias_sub); - ZVAL_UNDEF(&definition_sub); + ZVAL_UNDEF(&offset_sub); + ZVAL_UNDEF(&value_sub); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_ZVAL(alias) - Z_PARAM_ZVAL(definition) + Z_PARAM_ZVAL(offset) + Z_PARAM_ZVAL(value) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 2, 0, &alias, &definition); + zephir_fetch_params(1, 2, 0, &offset, &value); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "setservice", NULL, 0, alias, definition); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setservice", NULL, 0, offset, value); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -129687,34 +122783,36 @@ static PHP_METHOD(Phalcon_Mvc_Micro, offsetUnset) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *alias, alias_sub, container, _0; + zval offset_sub, _0, _2, _1$$3; + zval *offset; zval *this_ptr = getThis(); - ZVAL_UNDEF(&alias_sub); - ZVAL_UNDEF(&container); + ZVAL_UNDEF(&offset_sub); ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_1$$3); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(alias) + Z_PARAM_ZVAL(offset) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &alias); + zephir_fetch_params(1, 1, 0, &offset); zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CPY_WRT(&container, &_0); - if (Z_TYPE_P(&container) != IS_OBJECT) { - ZEPHIR_INIT_NVAR(&container); - object_init_ex(&container, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 493); + if (Z_TYPE_P(&_0) == IS_NULL) { + ZEPHIR_INIT_VAR(&_1$$3); + object_init_ex(&_1$$3, phalcon_di_factorydefault_ce); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 408); zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container); + zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &_1$$3); } - ZEPHIR_CALL_METHOD(NULL, &container, "remove", NULL, 498, alias); + zephir_read_property(&_2, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(NULL, &_2, "remove", NULL, 0, offset); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -130068,7 +123166,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, setService) if (Z_TYPE_P(&container) != IS_OBJECT) { ZEPHIR_INIT_NVAR(&container); object_init_ex(&container, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 493); + ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 408); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container); } @@ -130077,7 +123175,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, setService) } else { ZVAL_BOOL(&_0, 0); } - ZEPHIR_RETURN_CALL_METHOD(&container, "set", NULL, 499, &serviceName, definition, &_0); + ZEPHIR_RETURN_CALL_METHOD(&container, "set", NULL, 413, &serviceName, definition, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -130329,7 +123427,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __call) zephir_get_arrval(&arguments, arguments_param); - ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 500, &method, &arguments); + ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 414, &method, &arguments); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&records)) { RETURN_CCTOR(&records); @@ -130351,7 +123449,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __call) object_init_ex(&_2, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_3); ZEPHIR_CONCAT_SVSVS(&_3, "The method '", &method, "' doesn't exist on model '", &modelName, "'"); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 31, &_3); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 29, &_3); zephir_check_call_status(); zephir_throw_exception_debug(&_2, "phalcon/Mvc/Model.zep", 266); ZEPHIR_MM_RESTORE(); @@ -130389,7 +123487,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __callStatic) zephir_get_arrval(&arguments, arguments_param); - ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 500, &method, &arguments); + ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 414, &method, &arguments); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&records)) { RETURN_CCTOR(&records); @@ -130400,7 +123498,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __callStatic) object_init_ex(&_1, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_2); ZEPHIR_CONCAT_SVSVS(&_2, "The method '", &method, "' doesn't exist on model '", &modelName, "'"); - ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 31, &_2); + ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 29, &_2); zephir_check_call_status(); zephir_throw_exception_debug(&_1, "phalcon/Mvc/Model.zep", 292); ZEPHIR_MM_RESTORE(); @@ -130717,13 +123815,13 @@ static PHP_METHOD(Phalcon_Mvc_Model, __set) } } - ZEPHIR_CALL_METHOD(&_14, this_ptr, "possiblesetter", NULL, 501, &property, value); + ZEPHIR_CALL_METHOD(&_14, this_ptr, "possiblesetter", NULL, 415, &property, value); zephir_check_call_status(); if (zephir_is_true(&_14)) { RETVAL_ZVAL(value, 1, 0); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_15, "property_exists", NULL, 311, this_ptr, &property); + ZEPHIR_CALL_FUNCTION(&_15, "property_exists", NULL, 284, this_ptr, &property); zephir_check_call_status(); if (zephir_is_true(&_15)) { ZEPHIR_CALL_METHOD(&manager, this_ptr, "getmodelsmanager", NULL, 0); @@ -130735,7 +123833,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __set) object_init_ex(&_17$$21, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_18$$21); ZEPHIR_CONCAT_SVS(&_18$$21, "Cannot access property '", &property, "' (not public)."); - ZEPHIR_CALL_METHOD(NULL, &_17$$21, "__construct", NULL, 31, &_18$$21); + ZEPHIR_CALL_METHOD(NULL, &_17$$21, "__construct", NULL, 29, &_18$$21); zephir_check_call_status(); zephir_throw_exception_debug(&_17$$21, "phalcon/Mvc/Model.zep", 499); ZEPHIR_MM_RESTORE(); @@ -130928,7 +124026,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, assign) _7$$12 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_7$$12) { - ZEPHIR_CALL_SELF(&_8$$13, "caseinsensitivecolumnmap", &_9, 502, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_8$$13, "caseinsensitivecolumnmap", &_9, 416, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_8$$13); } @@ -130940,7 +124038,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, assign) object_init_ex(&_10$$16, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_11$$16); ZEPHIR_CONCAT_SVS(&_11$$16, "Column '", &attribute, "' doesn't make part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_10$$16, "__construct", &_12, 31, &_11$$16); + ZEPHIR_CALL_METHOD(NULL, &_10$$16, "__construct", &_12, 29, &_11$$16); zephir_check_call_status(); zephir_throw_exception_debug(&_10$$16, "phalcon/Mvc/Model.zep", 676); ZEPHIR_MM_RESTORE(); @@ -130960,7 +124058,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, assign) } _13$$18 = zephir_is_true(&disableAssignSetters); if (!(_13$$18)) { - ZEPHIR_CALL_METHOD(&_14$$18, this_ptr, "possiblesetter", &_15, 501, &attributeField, &value); + ZEPHIR_CALL_METHOD(&_14$$18, this_ptr, "possiblesetter", &_15, 415, &attributeField, &value); zephir_check_call_status(); _13$$18 = !zephir_is_true(&_14$$18); } @@ -130985,7 +124083,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, assign) _16$$22 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_16$$22) { - ZEPHIR_CALL_SELF(&_17$$23, "caseinsensitivecolumnmap", &_9, 502, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_17$$23, "caseinsensitivecolumnmap", &_9, 416, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_17$$23); } @@ -130997,7 +124095,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, assign) object_init_ex(&_18$$26, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_19$$26); ZEPHIR_CONCAT_SVS(&_19$$26, "Column '", &attribute, "' doesn't make part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_18$$26, "__construct", &_12, 31, &_19$$26); + ZEPHIR_CALL_METHOD(NULL, &_18$$26, "__construct", &_12, 29, &_19$$26); zephir_check_call_status(); zephir_throw_exception_debug(&_18$$26, "phalcon/Mvc/Model.zep", 676); ZEPHIR_MM_RESTORE(); @@ -131017,7 +124115,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, assign) } _20$$28 = zephir_is_true(&disableAssignSetters); if (!(_20$$28)) { - ZEPHIR_CALL_METHOD(&_21$$28, this_ptr, "possiblesetter", &_15, 501, &attributeField, &value); + ZEPHIR_CALL_METHOD(&_21$$28, this_ptr, "possiblesetter", &_15, 415, &attributeField, &value); zephir_check_call_status(); _20$$28 = !zephir_is_true(&_21$$28); } @@ -131283,7 +124381,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) object_init_ex(&_6$$9, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_7$$9); ZEPHIR_CONCAT_SVS(&_7$$9, "Column '", &key, "' doesn't make part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_6$$9, "__construct", &_8, 31, &_7$$9); + ZEPHIR_CALL_METHOD(NULL, &_6$$9, "__construct", &_8, 29, &_7$$9); zephir_check_call_status(); zephir_throw_exception_debug(&_6$$9, "phalcon/Mvc/Model.zep", 852); ZEPHIR_MM_RESTORE(); @@ -131297,7 +124395,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) object_init_ex(&_9$$11, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_10$$11); ZEPHIR_CONCAT_SVS(&_10$$11, "Column '", &key, "' doesn't make part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_9$$11, "__construct", &_8, 31, &_10$$11); + ZEPHIR_CALL_METHOD(NULL, &_9$$11, "__construct", &_8, 29, &_10$$11); zephir_check_call_status(); zephir_throw_exception_debug(&_9$$11, "phalcon/Mvc/Model.zep", 861); ZEPHIR_MM_RESTORE(); @@ -131319,7 +124417,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) do { if (ZEPHIR_IS_LONG(&_12$$13, 0) || ZEPHIR_IS_LONG(&_12$$13, 21) || ZEPHIR_IS_LONG(&_12$$13, 22) || ZEPHIR_IS_LONG(&_12$$13, 26)) { ZVAL_LONG(&_13$$14, 10); - ZEPHIR_CALL_FUNCTION(&castValue, "intval", &_14, 51, &value, &_13$$14); + ZEPHIR_CALL_FUNCTION(&castValue, "intval", &_14, 38, &value, &_13$$14); zephir_check_call_status(); break; } @@ -131393,7 +124491,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) object_init_ex(&_17$$27, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_18$$27); ZEPHIR_CONCAT_SVS(&_18$$27, "Column '", &key, "' doesn't make part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_17$$27, "__construct", &_8, 31, &_18$$27); + ZEPHIR_CALL_METHOD(NULL, &_17$$27, "__construct", &_8, 29, &_18$$27); zephir_check_call_status(); zephir_throw_exception_debug(&_17$$27, "phalcon/Mvc/Model.zep", 852); ZEPHIR_MM_RESTORE(); @@ -131407,7 +124505,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) object_init_ex(&_19$$29, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_20$$29); ZEPHIR_CONCAT_SVS(&_20$$29, "Column '", &key, "' doesn't make part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_19$$29, "__construct", &_8, 31, &_20$$29); + ZEPHIR_CALL_METHOD(NULL, &_19$$29, "__construct", &_8, 29, &_20$$29); zephir_check_call_status(); zephir_throw_exception_debug(&_19$$29, "phalcon/Mvc/Model.zep", 861); ZEPHIR_MM_RESTORE(); @@ -131429,7 +124527,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) do { if (ZEPHIR_IS_LONG(&_22$$31, 0) || ZEPHIR_IS_LONG(&_22$$31, 21) || ZEPHIR_IS_LONG(&_22$$31, 22) || ZEPHIR_IS_LONG(&_22$$31, 26)) { ZVAL_LONG(&_23$$32, 10); - ZEPHIR_CALL_FUNCTION(&castValue, "intval", &_14, 51, &value, &_23$$32); + ZEPHIR_CALL_FUNCTION(&castValue, "intval", &_14, 38, &value, &_23$$32); zephir_check_call_status(); break; } @@ -131555,7 +124653,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate) _4$$7 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_4$$7) { - ZEPHIR_CALL_SELF(&_5$$8, "caseinsensitivecolumnmap", &_6, 502, columnMap, &key); + ZEPHIR_CALL_SELF(&_5$$8, "caseinsensitivecolumnmap", &_6, 416, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_5$$8); } @@ -131566,7 +124664,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate) object_init_ex(&_7$$10, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_8$$10); ZEPHIR_CONCAT_SVS(&_8$$10, "Column '", &key, "' doesn't make part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_7$$10, "__construct", &_9, 31, &_8$$10); + ZEPHIR_CALL_METHOD(NULL, &_7$$10, "__construct", &_9, 29, &_8$$10); zephir_check_call_status(); zephir_throw_exception_debug(&_7$$10, "phalcon/Mvc/Model.zep", 988); ZEPHIR_MM_RESTORE(); @@ -131607,7 +124705,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate) _10$$16 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_10$$16) { - ZEPHIR_CALL_SELF(&_11$$17, "caseinsensitivecolumnmap", &_6, 502, columnMap, &key); + ZEPHIR_CALL_SELF(&_11$$17, "caseinsensitivecolumnmap", &_6, 416, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_11$$17); } @@ -131618,7 +124716,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate) object_init_ex(&_12$$19, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_13$$19); ZEPHIR_CONCAT_SVS(&_13$$19, "Column '", &key, "' doesn't make part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_12$$19, "__construct", &_9, 31, &_13$$19); + ZEPHIR_CALL_METHOD(NULL, &_12$$19, "__construct", &_9, 29, &_13$$19); zephir_check_call_status(); zephir_throw_exception_debug(&_12$$19, "phalcon/Mvc/Model.zep", 988); ZEPHIR_MM_RESTORE(); @@ -131803,7 +124901,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, create) ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "getwriteconnection", NULL, 503); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getwriteconnection", NULL, 417); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, this_ptr, "has", NULL, 0, &metaData, &_1); zephir_check_call_status(); @@ -131887,7 +124985,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete) ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 503); + ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 417); zephir_check_call_status(); ZEPHIR_INIT_ZVAL_NREF(_0); ZVAL_LONG(&_0, 3); @@ -131896,7 +124994,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete) array_init(&_1); zephir_update_property_zval(this_ptr, ZEND_STRL("errorMessages"), &_1); if (ZEPHIR_GLOBAL(orm).virtual_foreign_keys) { - ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "checkforeignkeysreverserestrict", NULL, 504); + ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "checkforeignkeysreverserestrict", NULL, 418); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&_2$$3)) { RETURN_MM_BOOL(0); @@ -131935,7 +125033,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete) object_init_ex(&_5$$9, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_6$$9); ZEPHIR_CONCAT_SVS(&_6$$9, "Column '", &primaryKey, "' have not defined a bind data type"); - ZEPHIR_CALL_METHOD(NULL, &_5$$9, "__construct", &_7, 31, &_6$$9); + ZEPHIR_CALL_METHOD(NULL, &_5$$9, "__construct", &_7, 29, &_6$$9); zephir_check_call_status(); zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model.zep", 1217); ZEPHIR_MM_RESTORE(); @@ -131948,7 +125046,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete) object_init_ex(&_8$$11, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_9$$11); ZEPHIR_CONCAT_SVS(&_9$$11, "Column '", &primaryKey, "' isn't part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_8$$11, "__construct", &_7, 31, &_9$$11); + ZEPHIR_CALL_METHOD(NULL, &_8$$11, "__construct", &_7, 29, &_9$$11); zephir_check_call_status(); zephir_throw_exception_debug(&_8$$11, "phalcon/Mvc/Model.zep", 1227); ZEPHIR_MM_RESTORE(); @@ -131963,7 +125061,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete) object_init_ex(&_10$$13, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_11$$13); ZEPHIR_CONCAT_SVS(&_11$$13, "Cannot delete the record because the primary key attribute: '", &attributeField, "' was not set"); - ZEPHIR_CALL_METHOD(NULL, &_10$$13, "__construct", &_7, 31, &_11$$13); + ZEPHIR_CALL_METHOD(NULL, &_10$$13, "__construct", &_7, 29, &_11$$13); zephir_check_call_status(); zephir_throw_exception_debug(&_10$$13, "phalcon/Mvc/Model.zep", 1240); ZEPHIR_MM_RESTORE(); @@ -131994,7 +125092,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete) object_init_ex(&_15$$15, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_16$$15); ZEPHIR_CONCAT_SVS(&_16$$15, "Column '", &primaryKey, "' have not defined a bind data type"); - ZEPHIR_CALL_METHOD(NULL, &_15$$15, "__construct", &_7, 31, &_16$$15); + ZEPHIR_CALL_METHOD(NULL, &_15$$15, "__construct", &_7, 29, &_16$$15); zephir_check_call_status(); zephir_throw_exception_debug(&_15$$15, "phalcon/Mvc/Model.zep", 1217); ZEPHIR_MM_RESTORE(); @@ -132007,7 +125105,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete) object_init_ex(&_17$$17, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_18$$17); ZEPHIR_CONCAT_SVS(&_18$$17, "Column '", &primaryKey, "' isn't part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_17$$17, "__construct", &_7, 31, &_18$$17); + ZEPHIR_CALL_METHOD(NULL, &_17$$17, "__construct", &_7, 29, &_18$$17); zephir_check_call_status(); zephir_throw_exception_debug(&_17$$17, "phalcon/Mvc/Model.zep", 1227); ZEPHIR_MM_RESTORE(); @@ -132022,7 +125120,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete) object_init_ex(&_19$$19, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_20$$19); ZEPHIR_CONCAT_SVS(&_20$$19, "Cannot delete the record because the primary key attribute: '", &attributeField, "' was not set"); - ZEPHIR_CALL_METHOD(NULL, &_19$$19, "__construct", &_7, 31, &_20$$19); + ZEPHIR_CALL_METHOD(NULL, &_19$$19, "__construct", &_7, 29, &_20$$19); zephir_check_call_status(); zephir_throw_exception_debug(&_19$$19, "phalcon/Mvc/Model.zep", 1240); ZEPHIR_MM_RESTORE(); @@ -132058,9 +125156,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete) RETURN_MM_BOOL(1); } } - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 505); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 419); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 506); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 420); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); @@ -132075,7 +125173,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete) ZEPHIR_CALL_METHOD(&success, &writeConnection, "delete", NULL, 0, &table, &_27, &values, &bindTypes); zephir_check_call_status(); if (ZEPHIR_GLOBAL(orm).virtual_foreign_keys) { - ZEPHIR_CALL_METHOD(&_28$$25, this_ptr, "checkforeignkeysreversecascade", NULL, 507); + ZEPHIR_CALL_METHOD(&_28$$25, this_ptr, "checkforeignkeysreversecascade", NULL, 421); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&_28$$25)) { RETURN_MM_BOOL(0); @@ -132105,7 +125203,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, dump) ZEPHIR_MM_GROW(); - ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 508, this_ptr); + ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 422, this_ptr); zephir_check_call_status(); RETURN_MM(); } @@ -132150,7 +125248,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, find) } else { ZEPHIR_CPY_WRT(¶ms, parameters); } - ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_0, 509, ¶ms); + ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_0, 423, ¶ms); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&resultset, &query, "execute", NULL, 0); zephir_check_call_status(); @@ -132215,7 +125313,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, findFirst) return; } ZVAL_LONG(&_3, 1); - ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_2, 509, ¶ms, &_3); + ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_2, 423, ¶ms, &_3); zephir_check_call_status(); ZVAL_BOOL(&_3, 1); ZEPHIR_CALL_METHOD(NULL, &query, "setuniquerow", NULL, 0, &_3); @@ -132685,7 +125783,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, getRelated) object_init_ex(&_2$$3, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_3$$3); ZEPHIR_CONCAT_SVSVS(&_3$$3, "There is no defined relations for the model '", &className, "' using alias '", &alias, "'"); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 31, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 29, &_3$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_2$$3, "phalcon/Mvc/Model.zep", 1950); ZEPHIR_MM_RESTORE(); @@ -132955,7 +126053,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, hasChanged) RETURN_MM_BOOL(zephir_fast_in_array(fieldName, &changedFields)); } if (Z_TYPE_P(fieldName) == IS_ARRAY) { - ZEPHIR_CALL_FUNCTION(&intersect, "array_intersect", NULL, 510, fieldName, &changedFields); + ZEPHIR_CALL_FUNCTION(&intersect, "array_intersect", NULL, 424, fieldName, &changedFields); zephir_check_call_status(); if (allFields) { RETURN_MM_BOOL(ZEPHIR_IS_EQUAL(&intersect, fieldName)); @@ -133019,7 +126117,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, hasUpdated) RETURN_MM_BOOL(zephir_fast_in_array(fieldName, &updatedFields)); } if (Z_TYPE_P(fieldName) == IS_ARRAY) { - ZEPHIR_CALL_FUNCTION(&intersect, "array_intersect", NULL, 510, fieldName, &updatedFields); + ZEPHIR_CALL_FUNCTION(&intersect, "array_intersect", NULL, 424, fieldName, &updatedFields); zephir_check_call_status(); if (allFields) { RETURN_MM_BOOL(ZEPHIR_IS_EQUAL(&intersect, fieldName)); @@ -133169,12 +126267,12 @@ static PHP_METHOD(Phalcon_Mvc_Model, query) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 511, container); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 425, container); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_3); zephir_get_called_class(&_3); - ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 0, &_3); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 426, &_3); zephir_check_call_status(); RETURN_CCTOR(&criteria); } @@ -133264,13 +126362,13 @@ static PHP_METHOD(Phalcon_Mvc_Model, refresh) } ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 0); + ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 427); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("modelsManager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_1); - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 505); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 419); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 506); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 420); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); @@ -133407,7 +126505,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, save) ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 503); + ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 417); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "prepareSave"); @@ -133423,9 +126521,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, save) RETURN_MM_BOOL(0); } } - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 505); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 419); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 506); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 420); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); @@ -133435,7 +126533,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, save) } else { ZEPHIR_CPY_WRT(&table, &source); } - ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 0); + ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 427); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&exists, this_ptr, "has", NULL, 0, &metaData, &readConnection); zephir_check_call_status(); @@ -133466,7 +126564,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, save) object_init_ex(&_6$$11, phalcon_mvc_model_validationfailed_ce); ZEPHIR_CALL_METHOD(&_7$$11, this_ptr, "getmessages", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_6$$11, "__construct", NULL, 0, this_ptr, &_7$$11); + ZEPHIR_CALL_METHOD(NULL, &_6$$11, "__construct", NULL, 428, this_ptr, &_7$$11); zephir_check_call_status(); zephir_throw_exception_debug(&_6$$11, "phalcon/Mvc/Model.zep", 2561); ZEPHIR_MM_RESTORE(); @@ -133892,7 +126990,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData) object_init_ex(&_4$$7, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_5$$7); ZEPHIR_CONCAT_SVS(&_5$$7, "Column '", &key, "' doesn't make part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_4$$7, "__construct", &_6, 31, &_5$$7); + ZEPHIR_CALL_METHOD(NULL, &_4$$7, "__construct", &_6, 29, &_5$$7); zephir_check_call_status(); zephir_throw_exception_debug(&_4$$7, "phalcon/Mvc/Model.zep", 2818); ZEPHIR_MM_RESTORE(); @@ -133908,7 +127006,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData) object_init_ex(&_7$$10, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_8$$10); ZEPHIR_CONCAT_SVS(&_8$$10, "Column '", &key, "' doesn't make part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_7$$10, "__construct", &_6, 31, &_8$$10); + ZEPHIR_CALL_METHOD(NULL, &_7$$10, "__construct", &_6, 29, &_8$$10); zephir_check_call_status(); zephir_throw_exception_debug(&_7$$10, "phalcon/Mvc/Model.zep", 2829); ZEPHIR_MM_RESTORE(); @@ -133942,7 +127040,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData) object_init_ex(&_9$$14, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_10$$14); ZEPHIR_CONCAT_SVS(&_10$$14, "Column '", &key, "' doesn't make part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_9$$14, "__construct", &_6, 31, &_10$$14); + ZEPHIR_CALL_METHOD(NULL, &_9$$14, "__construct", &_6, 29, &_10$$14); zephir_check_call_status(); zephir_throw_exception_debug(&_9$$14, "phalcon/Mvc/Model.zep", 2818); ZEPHIR_MM_RESTORE(); @@ -133958,7 +127056,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData) object_init_ex(&_11$$17, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_12$$17); ZEPHIR_CONCAT_SVS(&_12$$17, "Column '", &key, "' doesn't make part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_11$$17, "__construct", &_6, 31, &_12$$17); + ZEPHIR_CALL_METHOD(NULL, &_11$$17, "__construct", &_6, 29, &_12$$17); zephir_check_call_status(); zephir_throw_exception_debug(&_11$$17, "phalcon/Mvc/Model.zep", 2829); ZEPHIR_MM_RESTORE(); @@ -134053,7 +127151,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) _4$$4 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_4$$4) { - ZEPHIR_CALL_SELF(&_5$$6, "caseinsensitivecolumnmap", &_6, 502, columnMap, &key); + ZEPHIR_CALL_SELF(&_5$$6, "caseinsensitivecolumnmap", &_6, 416, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_5$$6); } @@ -134064,7 +127162,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) object_init_ex(&_7$$8, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_8$$8); ZEPHIR_CONCAT_SVS(&_8$$8, "Column '", &key, "' doesn't make part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_7$$8, "__construct", &_9, 31, &_8$$8); + ZEPHIR_CALL_METHOD(NULL, &_7$$8, "__construct", &_9, 29, &_8$$8); zephir_check_call_status(); zephir_throw_exception_debug(&_7$$8, "phalcon/Mvc/Model.zep", 2883); ZEPHIR_MM_RESTORE(); @@ -134080,7 +127178,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) object_init_ex(&_10$$11, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_11$$11); ZEPHIR_CONCAT_SVS(&_11$$11, "Column '", &key, "' doesn't make part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_10$$11, "__construct", &_9, 31, &_11$$11); + ZEPHIR_CALL_METHOD(NULL, &_10$$11, "__construct", &_9, 29, &_11$$11); zephir_check_call_status(); zephir_throw_exception_debug(&_10$$11, "phalcon/Mvc/Model.zep", 2894); ZEPHIR_MM_RESTORE(); @@ -134112,7 +127210,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) _12$$12 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_12$$12) { - ZEPHIR_CALL_SELF(&_13$$14, "caseinsensitivecolumnmap", &_6, 502, columnMap, &key); + ZEPHIR_CALL_SELF(&_13$$14, "caseinsensitivecolumnmap", &_6, 416, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_13$$14); } @@ -134123,7 +127221,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) object_init_ex(&_14$$16, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_15$$16); ZEPHIR_CONCAT_SVS(&_15$$16, "Column '", &key, "' doesn't make part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_14$$16, "__construct", &_9, 31, &_15$$16); + ZEPHIR_CALL_METHOD(NULL, &_14$$16, "__construct", &_9, 29, &_15$$16); zephir_check_call_status(); zephir_throw_exception_debug(&_14$$16, "phalcon/Mvc/Model.zep", 2883); ZEPHIR_MM_RESTORE(); @@ -134139,7 +127237,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) object_init_ex(&_16$$19, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_17$$19); ZEPHIR_CONCAT_SVS(&_17$$19, "Column '", &key, "' doesn't make part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_16$$19, "__construct", &_9, 31, &_17$$19); + ZEPHIR_CALL_METHOD(NULL, &_16$$19, "__construct", &_9, 29, &_17$$19); zephir_check_call_status(); zephir_throw_exception_debug(&_16$$19, "phalcon/Mvc/Model.zep", 2894); ZEPHIR_MM_RESTORE(); @@ -134446,7 +127544,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, toArray) _3$$4 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_3$$4) { - ZEPHIR_CALL_SELF(&_4$$5, "caseinsensitivecolumnmap", &_5, 502, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_4$$5, "caseinsensitivecolumnmap", &_5, 416, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_4$$5); } @@ -134457,7 +127555,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, toArray) object_init_ex(&_6$$7, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_7$$7); ZEPHIR_CONCAT_SVS(&_7$$7, "Column '", &attribute, "' doesn't make part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_6$$7, "__construct", &_8, 31, &_7$$7); + ZEPHIR_CALL_METHOD(NULL, &_6$$7, "__construct", &_8, 29, &_7$$7); zephir_check_call_status(); zephir_throw_exception_debug(&_6$$7, "phalcon/Mvc/Model.zep", 3153); ZEPHIR_MM_RESTORE(); @@ -134497,7 +127595,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, toArray) _9$$14 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_9$$14) { - ZEPHIR_CALL_SELF(&_10$$15, "caseinsensitivecolumnmap", &_5, 502, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_10$$15, "caseinsensitivecolumnmap", &_5, 416, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_10$$15); } @@ -134508,7 +127606,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, toArray) object_init_ex(&_11$$17, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_12$$17); ZEPHIR_CONCAT_SVS(&_12$$17, "Column '", &attribute, "' doesn't make part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_11$$17, "__construct", &_8, 31, &_12$$17); + ZEPHIR_CALL_METHOD(NULL, &_11$$17, "__construct", &_8, 29, &_12$$17); zephir_check_call_status(); zephir_throw_exception_debug(&_11$$17, "phalcon/Mvc/Model.zep", 3153); ZEPHIR_MM_RESTORE(); @@ -134563,7 +127661,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, update) if (zephir_is_true(&_0)) { ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getreadconnection", NULL, 0); + ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getreadconnection", NULL, 427); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "has", NULL, 0, &metaData, &_2$$3); zephir_check_call_status(); @@ -135414,7 +128512,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowInsert) object_init_ex(&_3$$7, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_4$$7); ZEPHIR_CONCAT_SVS(&_4$$7, "Column '", &field, "' isn't part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", &_5, 31, &_4$$7); + ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", &_5, 29, &_4$$7); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 3604); ZEPHIR_MM_RESTORE(); @@ -135452,7 +128550,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowInsert) object_init_ex(&_12$$15, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_13$$15); ZEPHIR_CONCAT_SVS(&_13$$15, "Column '", &field, "' have not defined a bind data type"); - ZEPHIR_CALL_METHOD(NULL, &_12$$15, "__construct", &_5, 31, &_13$$15); + ZEPHIR_CALL_METHOD(NULL, &_12$$15, "__construct", &_5, 29, &_13$$15); zephir_check_call_status(); zephir_throw_exception_debug(&_12$$15, "phalcon/Mvc/Model.zep", 3639); ZEPHIR_MM_RESTORE(); @@ -135503,7 +128601,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowInsert) object_init_ex(&_20$$22, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_21$$22); ZEPHIR_CONCAT_SVS(&_21$$22, "Column '", &field, "' isn't part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_20$$22, "__construct", &_5, 31, &_21$$22); + ZEPHIR_CALL_METHOD(NULL, &_20$$22, "__construct", &_5, 29, &_21$$22); zephir_check_call_status(); zephir_throw_exception_debug(&_20$$22, "phalcon/Mvc/Model.zep", 3604); ZEPHIR_MM_RESTORE(); @@ -135541,7 +128639,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowInsert) object_init_ex(&_28$$30, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_29$$30); ZEPHIR_CONCAT_SVS(&_29$$30, "Column '", &field, "' have not defined a bind data type"); - ZEPHIR_CALL_METHOD(NULL, &_28$$30, "__construct", &_5, 31, &_29$$30); + ZEPHIR_CALL_METHOD(NULL, &_28$$30, "__construct", &_5, 29, &_29$$30); zephir_check_call_status(); zephir_throw_exception_debug(&_28$$30, "phalcon/Mvc/Model.zep", 3639); ZEPHIR_MM_RESTORE(); @@ -135594,7 +128692,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowInsert) object_init_ex(&_37$$38, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_38$$38); ZEPHIR_CONCAT_SVS(&_38$$38, "Identity column '", identityField, "' isn't part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_37$$38, "__construct", &_5, 31, &_38$$38); + ZEPHIR_CALL_METHOD(NULL, &_37$$38, "__construct", &_5, 29, &_38$$38); zephir_check_call_status(); zephir_throw_exception_debug(&_37$$38, "phalcon/Mvc/Model.zep", 3690); ZEPHIR_MM_RESTORE(); @@ -135624,7 +128722,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowInsert) object_init_ex(&_40$$45, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_41$$45); ZEPHIR_CONCAT_SVS(&_41$$45, "Identity column '", identityField, "' isn\'t part of the table columns"); - ZEPHIR_CALL_METHOD(NULL, &_40$$45, "__construct", &_5, 31, &_41$$45); + ZEPHIR_CALL_METHOD(NULL, &_40$$45, "__construct", &_5, 29, &_41$$45); zephir_check_call_status(); zephir_throw_exception_debug(&_40$$45, "phalcon/Mvc/Model.zep", 3719); ZEPHIR_MM_RESTORE(); @@ -135663,9 +128761,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowInsert) ZEPHIR_CALL_METHOD(&sequenceName, this_ptr, "getsequencename", NULL, 0); zephir_check_call_status(); } else { - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 506); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 420); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 505); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 419); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&sequenceName); if (ZEPHIR_IS_EMPTY(&schema)) { @@ -135679,7 +128777,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowInsert) zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_GLOBAL(orm).cast_last_insert_id_to_int)) { ZVAL_LONG(&_47$$55, 10); - ZEPHIR_CALL_FUNCTION(&_48$$55, "intval", NULL, 51, &lastInsertedId, &_47$$55); + ZEPHIR_CALL_FUNCTION(&_48$$55, "intval", NULL, 38, &lastInsertedId, &_47$$55); zephir_check_call_status(); ZEPHIR_CPY_WRT(&lastInsertedId, &_48$$55); } @@ -135877,7 +128975,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) object_init_ex(&_4$$10, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_5$$10); ZEPHIR_CONCAT_SVS(&_5$$10, "Column '", &field, "' isn't part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_4$$10, "__construct", &_6, 31, &_5$$10); + ZEPHIR_CALL_METHOD(NULL, &_4$$10, "__construct", &_6, 29, &_5$$10); zephir_check_call_status(); zephir_throw_exception_debug(&_4$$10, "phalcon/Mvc/Model.zep", 3862); ZEPHIR_MM_RESTORE(); @@ -135894,7 +128992,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) object_init_ex(&_7$$13, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_8$$13); ZEPHIR_CONCAT_SVS(&_8$$13, "Column '", &field, "' have not defined a bind data type"); - ZEPHIR_CALL_METHOD(NULL, &_7$$13, "__construct", &_6, 31, &_8$$13); + ZEPHIR_CALL_METHOD(NULL, &_7$$13, "__construct", &_6, 29, &_8$$13); zephir_check_call_status(); zephir_throw_exception_debug(&_7$$13, "phalcon/Mvc/Model.zep", 3876); ZEPHIR_MM_RESTORE(); @@ -135923,7 +129021,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) object_init_ex(&_9$$23, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_10$$23); ZEPHIR_CONCAT_SVS(&_10$$23, "Column '", &field, "' have not defined a data type"); - ZEPHIR_CALL_METHOD(NULL, &_9$$23, "__construct", &_6, 31, &_10$$23); + ZEPHIR_CALL_METHOD(NULL, &_9$$23, "__construct", &_6, 29, &_10$$23); zephir_check_call_status(); zephir_throw_exception_debug(&_9$$23, "phalcon/Mvc/Model.zep", 3915); ZEPHIR_MM_RESTORE(); @@ -136006,7 +129104,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) object_init_ex(&_20$$35, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_21$$35); ZEPHIR_CONCAT_SVS(&_21$$35, "Column '", &field, "' isn't part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_20$$35, "__construct", &_6, 31, &_21$$35); + ZEPHIR_CALL_METHOD(NULL, &_20$$35, "__construct", &_6, 29, &_21$$35); zephir_check_call_status(); zephir_throw_exception_debug(&_20$$35, "phalcon/Mvc/Model.zep", 3862); ZEPHIR_MM_RESTORE(); @@ -136023,7 +129121,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) object_init_ex(&_22$$38, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_23$$38); ZEPHIR_CONCAT_SVS(&_23$$38, "Column '", &field, "' have not defined a bind data type"); - ZEPHIR_CALL_METHOD(NULL, &_22$$38, "__construct", &_6, 31, &_23$$38); + ZEPHIR_CALL_METHOD(NULL, &_22$$38, "__construct", &_6, 29, &_23$$38); zephir_check_call_status(); zephir_throw_exception_debug(&_22$$38, "phalcon/Mvc/Model.zep", 3876); ZEPHIR_MM_RESTORE(); @@ -136052,7 +129150,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) object_init_ex(&_24$$48, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_25$$48); ZEPHIR_CONCAT_SVS(&_25$$48, "Column '", &field, "' have not defined a data type"); - ZEPHIR_CALL_METHOD(NULL, &_24$$48, "__construct", &_6, 31, &_25$$48); + ZEPHIR_CALL_METHOD(NULL, &_24$$48, "__construct", &_6, 29, &_25$$48); zephir_check_call_status(); zephir_throw_exception_debug(&_24$$48, "phalcon/Mvc/Model.zep", 3915); ZEPHIR_MM_RESTORE(); @@ -136154,7 +129252,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) object_init_ex(&_36$$63, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_37$$63); ZEPHIR_CONCAT_SVS(&_37$$63, "Column '", &field, "' isn't part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_36$$63, "__construct", &_6, 31, &_37$$63); + ZEPHIR_CALL_METHOD(NULL, &_36$$63, "__construct", &_6, 29, &_37$$63); zephir_check_call_status(); zephir_throw_exception_debug(&_36$$63, "phalcon/Mvc/Model.zep", 4021); ZEPHIR_MM_RESTORE(); @@ -136190,7 +129288,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) object_init_ex(&_38$$69, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_39$$69); ZEPHIR_CONCAT_SVS(&_39$$69, "Column '", &field, "' isn't part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_38$$69, "__construct", &_6, 31, &_39$$69); + ZEPHIR_CALL_METHOD(NULL, &_38$$69, "__construct", &_6, 29, &_39$$69); zephir_check_call_status(); zephir_throw_exception_debug(&_38$$69, "phalcon/Mvc/Model.zep", 4021); ZEPHIR_MM_RESTORE(); @@ -136359,7 +129457,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, has) object_init_ex(&_3$$9, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_4$$9); ZEPHIR_CONCAT_SVS(&_4$$9, "Column '", &field, "' isn't part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_3$$9, "__construct", &_5, 31, &_4$$9); + ZEPHIR_CALL_METHOD(NULL, &_3$$9, "__construct", &_5, 29, &_4$$9); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$9, "phalcon/Mvc/Model.zep", 4124); ZEPHIR_MM_RESTORE(); @@ -136390,7 +129488,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, has) object_init_ex(&_7$$14, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_8$$14); ZEPHIR_CONCAT_SVS(&_8$$14, "Column '", &field, "' isn't part of the table columns"); - ZEPHIR_CALL_METHOD(NULL, &_7$$14, "__construct", &_5, 31, &_8$$14); + ZEPHIR_CALL_METHOD(NULL, &_7$$14, "__construct", &_5, 29, &_8$$14); zephir_check_call_status(); zephir_throw_exception_debug(&_7$$14, "phalcon/Mvc/Model.zep", 4154); ZEPHIR_MM_RESTORE(); @@ -136421,7 +129519,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, has) object_init_ex(&_12$$17, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_13$$17); ZEPHIR_CONCAT_SVS(&_13$$17, "Column '", &field, "' isn't part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_12$$17, "__construct", &_5, 31, &_13$$17); + ZEPHIR_CALL_METHOD(NULL, &_12$$17, "__construct", &_5, 29, &_13$$17); zephir_check_call_status(); zephir_throw_exception_debug(&_12$$17, "phalcon/Mvc/Model.zep", 4124); ZEPHIR_MM_RESTORE(); @@ -136452,7 +129550,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, has) object_init_ex(&_15$$22, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_16$$22); ZEPHIR_CONCAT_SVS(&_16$$22, "Column '", &field, "' isn't part of the table columns"); - ZEPHIR_CALL_METHOD(NULL, &_15$$22, "__construct", &_5, 31, &_16$$22); + ZEPHIR_CALL_METHOD(NULL, &_15$$22, "__construct", &_5, 29, &_16$$22); zephir_check_call_status(); zephir_throw_exception_debug(&_15$$22, "phalcon/Mvc/Model.zep", 4154); ZEPHIR_MM_RESTORE(); @@ -136495,9 +129593,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, has) zephir_read_property(&_22$$27, this_ptr, ZEND_STRL("uniqueTypes"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&uniqueTypes, &_22$$27); } - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 505); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 419); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 506); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 420); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); @@ -136856,7 +129954,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, invokeFinder) object_init_ex(&_3$$7, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_4$$7); ZEPHIR_CONCAT_SVS(&_4$$7, "The static method '", &method, "' requires one argument"); - ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", NULL, 31, &_4$$7); + ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", NULL, 29, &_4$$7); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 4449); ZEPHIR_MM_RESTORE(); @@ -136876,7 +129974,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, invokeFinder) if (zephir_array_isset(&attributes, &extraMethod)) { ZEPHIR_CPY_WRT(&field, &extraMethod); } else { - ZEPHIR_CALL_FUNCTION(&extraMethodFirst, "lcfirst", NULL, 104, &extraMethod); + ZEPHIR_CALL_FUNCTION(&extraMethodFirst, "lcfirst", NULL, 73, &extraMethod); zephir_check_call_status(); if (zephir_array_isset(&attributes, &extraMethodFirst)) { ZEPHIR_CPY_WRT(&field, &extraMethodFirst); @@ -136888,7 +129986,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, invokeFinder) object_init_ex(&_5$$13, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_6$$13); ZEPHIR_CONCAT_SVS(&_6$$13, "Cannot resolve attribute '", &extraMethod, "' in the model"); - ZEPHIR_CALL_METHOD(NULL, &_5$$13, "__construct", NULL, 31, &_6$$13); + ZEPHIR_CALL_METHOD(NULL, &_5$$13, "__construct", NULL, 29, &_6$$13); zephir_check_call_status(); zephir_throw_exception_debug(&_5$$13, "phalcon/Mvc/Model.zep", 4486); ZEPHIR_MM_RESTORE(); @@ -137072,7 +130170,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, preSave) } } if (ZEPHIR_GLOBAL(orm).virtual_foreign_keys) { - ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "checkforeignkeysrestrict", NULL, 0); + ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "checkforeignkeysrestrict", NULL, 429); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&_3$$8)) { RETURN_MM_BOOL(0); @@ -137117,7 +130215,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, preSave) object_init_ex(&_6$$19, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_7$$19); ZEPHIR_CONCAT_SVS(&_7$$19, "Column '", &field, "' isn't part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_6$$19, "__construct", &_8, 31, &_7$$19); + ZEPHIR_CALL_METHOD(NULL, &_6$$19, "__construct", &_8, 29, &_7$$19); zephir_check_call_status(); zephir_throw_exception_debug(&_6$$19, "phalcon/Mvc/Model.zep", 4647); ZEPHIR_MM_RESTORE(); @@ -137205,7 +130303,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, preSave) object_init_ex(&_17$$39, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_18$$39); ZEPHIR_CONCAT_SVS(&_18$$39, "Column '", &field, "' isn't part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_17$$39, "__construct", &_8, 31, &_18$$39); + ZEPHIR_CALL_METHOD(NULL, &_17$$39, "__construct", &_8, 29, &_18$$39); zephir_check_call_status(); zephir_throw_exception_debug(&_17$$39, "phalcon/Mvc/Model.zep", 4647); ZEPHIR_MM_RESTORE(); @@ -137918,7 +131016,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) object_init_ex(&_15$$10, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_16$$10); ZEPHIR_CONCAT_SVS(&_16$$10, "The column '", &columns, "' needs to be present in the model"); - ZEPHIR_CALL_METHOD(NULL, &_15$$10, "__construct", &_17, 31, &_16$$10); + ZEPHIR_CALL_METHOD(NULL, &_15$$10, "__construct", &_17, 29, &_16$$10); zephir_check_call_status(); zephir_throw_exception_debug(&_15$$10, "phalcon/Mvc/Model.zep", 4992); ZEPHIR_MM_RESTORE(); @@ -138257,7 +131355,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) object_init_ex(&_68$$43, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_69$$43); ZEPHIR_CONCAT_SVSVS(&_69$$43, "There are no defined relations for the model '", &className, "' using alias '", &name, "'"); - ZEPHIR_CALL_METHOD(NULL, &_68$$43, "__construct", &_17, 31, &_69$$43); + ZEPHIR_CALL_METHOD(NULL, &_68$$43, "__construct", &_17, 29, &_69$$43); zephir_check_call_status(); zephir_throw_exception_debug(&_68$$43, "phalcon/Mvc/Model.zep", 5144); ZEPHIR_MM_RESTORE(); @@ -138340,7 +131438,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) object_init_ex(&_81$$51, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_82$$51); ZEPHIR_CONCAT_SVS(&_82$$51, "The column '", &columns, "' needs to be present in the model"); - ZEPHIR_CALL_METHOD(NULL, &_81$$51, "__construct", &_17, 31, &_82$$51); + ZEPHIR_CALL_METHOD(NULL, &_81$$51, "__construct", &_17, 29, &_82$$51); zephir_check_call_status(); zephir_throw_exception_debug(&_81$$51, "phalcon/Mvc/Model.zep", 4992); ZEPHIR_MM_RESTORE(); @@ -138679,7 +131777,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) object_init_ex(&_132$$84, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_133$$84); ZEPHIR_CONCAT_SVSVS(&_133$$84, "There are no defined relations for the model '", &className, "' using alias '", &name, "'"); - ZEPHIR_CALL_METHOD(NULL, &_132$$84, "__construct", &_17, 31, &_133$$84); + ZEPHIR_CALL_METHOD(NULL, &_132$$84, "__construct", &_17, 29, &_133$$84); zephir_check_call_status(); zephir_throw_exception_debug(&_132$$84, "phalcon/Mvc/Model.zep", 5144); ZEPHIR_MM_RESTORE(); @@ -139599,6 +132697,39 @@ static PHP_METHOD(Phalcon_Mvc_Model, caseInsensitiveColumnMap) RETURN_MM(); } +static PHP_METHOD(Phalcon_Mvc_Model, __serialize) +{ + zval *this_ptr = getThis(); + + + + array_init(return_value); + return; +} + +static PHP_METHOD(Phalcon_Mvc_Model, __unserialize) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *data_param = NULL; + zval data; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&data); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_ARRAY(data) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &data_param); + zephir_get_arrval(&data, data_param); + + +} + zend_object *zephir_init_properties_Phalcon_Mvc_Model(zend_class_entry *class_type) { zval _0, _2, _4, _6, _8, _10, _1$$3, _3$$4, _5$$5, _7$$6, _9$$7, _11$$8; @@ -139752,20 +132883,20 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Router) { ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Mvc, Router, phalcon, mvc_router, phalcon_di_abstractinjectionaware_ce, phalcon_mvc_router_method_entry, 0); - zend_declare_property_null(phalcon_mvc_router_ce, SL("action"), ZEND_ACC_PROTECTED); - zend_declare_property_null(phalcon_mvc_router_ce, SL("controller"), ZEND_ACC_PROTECTED); - zend_declare_property_null(phalcon_mvc_router_ce, SL("defaultAction"), ZEND_ACC_PROTECTED); - zend_declare_property_null(phalcon_mvc_router_ce, SL("defaultController"), ZEND_ACC_PROTECTED); - zend_declare_property_null(phalcon_mvc_router_ce, SL("defaultModule"), ZEND_ACC_PROTECTED); - zend_declare_property_null(phalcon_mvc_router_ce, SL("defaultNamespace"), ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_mvc_router_ce, SL("action"), "", ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_mvc_router_ce, SL("controller"), "", ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_mvc_router_ce, SL("defaultAction"), "", ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_mvc_router_ce, SL("defaultController"), "", ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_mvc_router_ce, SL("defaultModule"), "", ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_mvc_router_ce, SL("defaultNamespace"), "", ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_mvc_router_ce, SL("defaultParams"), ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_mvc_router_ce, SL("eventsManager"), ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_mvc_router_ce, SL("keyRouteNames"), ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_mvc_router_ce, SL("keyRouteIds"), ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_mvc_router_ce, SL("matchedRoute"), ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_mvc_router_ce, SL("matches"), ZEND_ACC_PROTECTED); - zend_declare_property_null(phalcon_mvc_router_ce, SL("module"), ZEND_ACC_PROTECTED); - zend_declare_property_null(phalcon_mvc_router_ce, SL("namespaceName"), ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_mvc_router_ce, SL("module"), "", ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_mvc_router_ce, SL("namespaceName"), "", ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_mvc_router_ce, SL("notFoundPaths"), ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_mvc_router_ce, SL("params"), ZEND_ACC_PROTECTED); zend_declare_property_bool(phalcon_mvc_router_ce, SL("removeExtraSlashes"), 0, ZEND_ACC_PROTECTED); @@ -139896,7 +133027,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, __construct) add_assoc_long_ex(&_1$$3, SL("controller"), 1); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "#^/([\\w0-9\\_\\-]+)[/]{0,1}$#u"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 129, &_2$$3, &_1$$3); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 96, &_2$$3, &_1$$3); zephir_check_call_status(); zephir_array_append(&routes, &_0$$3, PH_SEPARATE, "phalcon/Mvc/Router.zep", 171); ZEPHIR_INIT_NVAR(&_2$$3); @@ -139908,7 +133039,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, __construct) add_assoc_long_ex(&_3$$3, SL("params"), 3); ZEPHIR_INIT_VAR(&_4$$3); ZVAL_STRING(&_4$$3, "#^/([\\w0-9\\_\\-]+)/([\\w0-9\\.\\_]+)(/.*)*$#u"); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 129, &_4$$3, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 96, &_4$$3, &_3$$3); zephir_check_call_status(); zephir_array_append(&routes, &_2$$3, PH_SEPARATE, "phalcon/Mvc/Router.zep", 180); } @@ -139970,7 +133101,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, add) ZEPHIR_INIT_VAR(&route); object_init_ex(&route, phalcon_mvc_router_route_ce); - ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 129, &pattern, paths, httpMethods); + ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 96, &pattern, paths, httpMethods); zephir_check_call_status(); ZVAL_LONG(&_0, position); ZEPHIR_CALL_METHOD(NULL, this_ptr, "attach", NULL, 0, &route, &_0); @@ -140988,7 +134119,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle) ZVAL_LONG(&_0, 5); - ZEPHIR_CALL_FUNCTION(&_1, "parse_url", NULL, 130, &uri, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "parse_url", NULL, 97, &uri, &_0); zephir_check_call_status(); zephir_get_strval(&uri, &_1); zephir_read_property(&_0, this_ptr, ZEND_STRL("removeExtraSlashes"), PH_NOISY_CC | PH_READONLY); @@ -141183,7 +134314,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle) object_init_ex(&_28$$35, phalcon_mvc_router_exception_ce); ZEPHIR_INIT_NVAR(&_29$$35); ZEPHIR_CONCAT_SV(&_29$$35, "Wrong key in paths: ", &part); - ZEPHIR_CALL_METHOD(NULL, &_28$$35, "__construct", &_30, 31, &_29$$35); + ZEPHIR_CALL_METHOD(NULL, &_28$$35, "__construct", &_30, 29, &_29$$35); zephir_check_call_status(); zephir_throw_exception_debug(&_28$$35, "phalcon/Mvc/Router.zep", 824); ZEPHIR_MM_RESTORE(); @@ -141249,7 +134380,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle) object_init_ex(&_36$$46, phalcon_mvc_router_exception_ce); ZEPHIR_INIT_NVAR(&_37$$46); ZEPHIR_CONCAT_SV(&_37$$46, "Wrong key in paths: ", &part); - ZEPHIR_CALL_METHOD(NULL, &_36$$46, "__construct", &_30, 31, &_37$$46); + ZEPHIR_CALL_METHOD(NULL, &_36$$46, "__construct", &_30, 29, &_37$$46); zephir_check_call_status(); zephir_throw_exception_debug(&_36$$46, "phalcon/Mvc/Router.zep", 824); ZEPHIR_MM_RESTORE(); @@ -141461,7 +134592,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle) object_init_ex(&_63$$84, phalcon_mvc_router_exception_ce); ZEPHIR_INIT_NVAR(&_64$$84); ZEPHIR_CONCAT_SV(&_64$$84, "Wrong key in paths: ", &part); - ZEPHIR_CALL_METHOD(NULL, &_63$$84, "__construct", &_30, 31, &_64$$84); + ZEPHIR_CALL_METHOD(NULL, &_63$$84, "__construct", &_30, 29, &_64$$84); zephir_check_call_status(); zephir_throw_exception_debug(&_63$$84, "phalcon/Mvc/Router.zep", 824); ZEPHIR_MM_RESTORE(); @@ -141527,7 +134658,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle) object_init_ex(&_70$$95, phalcon_mvc_router_exception_ce); ZEPHIR_INIT_NVAR(&_71$$95); ZEPHIR_CONCAT_SV(&_71$$95, "Wrong key in paths: ", &part); - ZEPHIR_CALL_METHOD(NULL, &_70$$95, "__construct", &_30, 31, &_71$$95); + ZEPHIR_CALL_METHOD(NULL, &_70$$95, "__construct", &_30, 29, &_71$$95); zephir_check_call_status(); zephir_throw_exception_debug(&_70$$95, "phalcon/Mvc/Router.zep", 824); ZEPHIR_MM_RESTORE(); @@ -141995,6 +135126,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, setDefaultNamespace) static PHP_METHOD(Phalcon_Mvc_Router, setDefaults) { + zval _0$$3; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zval *defaults_param = NULL, namespaceName, module, controller, action, params; zval defaults; @@ -142006,6 +135138,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, setDefaults) ZVAL_UNDEF(&controller); ZVAL_UNDEF(&action); ZVAL_UNDEF(¶ms); + ZVAL_UNDEF(&_0$$3); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -142020,7 +135153,8 @@ static PHP_METHOD(Phalcon_Mvc_Router, setDefaults) if (zephir_array_isset_string_fetch(&namespaceName, &defaults, SL("namespace"), 1)) { - zephir_update_property_zval(this_ptr, ZEND_STRL("defaultNamespace"), &namespaceName); + zephir_cast_to_string(&_0$$3, &namespaceName); + zephir_update_property_zval(this_ptr, ZEND_STRL("defaultNamespace"), &_0$$3); } if (zephir_array_isset_string_fetch(&module, &defaults, SL("module"), 1)) { zephir_update_property_zval(this_ptr, ZEND_STRL("defaultModule"), &module); @@ -142401,7 +135535,7 @@ static PHP_METHOD(Phalcon_Mvc_Url, get) object_init_ex(&_12$$14, phalcon_mvc_url_exception_ce); ZEPHIR_INIT_VAR(&_13$$14); ZEPHIR_CONCAT_SVS(&_13$$14, "Cannot obtain a route using the name '", &routeName, "'"); - ZEPHIR_CALL_METHOD(NULL, &_12$$14, "__construct", NULL, 31, &_13$$14); + ZEPHIR_CALL_METHOD(NULL, &_12$$14, "__construct", NULL, 29, &_13$$14); zephir_check_call_status(); zephir_throw_exception_debug(&_12$$14, "phalcon/Mvc/Url.zep", 161); ZEPHIR_MM_RESTORE(); @@ -142424,11 +135558,11 @@ static PHP_METHOD(Phalcon_Mvc_Url, get) ZVAL_STRING(&_18$$15, "#(?= 80000 bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(4, 4) + ZEND_PARSE_PARAMETERS_START(3, 4) Z_PARAM_ZVAL(method) Z_PARAM_STR(routePattern) Z_PARAM_ZVAL(handler) - Z_PARAM_STR(name) + Z_PARAM_OPTIONAL + Z_PARAM_STR_OR_NULL(name) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 4, 0, &method, &routePattern_param, &handler, &name_param); + zephir_fetch_params(1, 3, 1, &method, &routePattern_param, &handler, &name_param); if (UNEXPECTED(Z_TYPE_P(routePattern_param) != IS_STRING && Z_TYPE_P(routePattern_param) != IS_NULL)) { zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'routePattern' must be of the type string")); RETURN_MM_NULL(); @@ -146121,7 +139256,11 @@ static PHP_METHOD(Phalcon_Mvc_Micro_Collection, addMap) } else { ZEPHIR_INIT_VAR(&routePattern); } - zephir_get_strval(&name, name_param); + if (!name_param) { + ZEPHIR_INIT_VAR(&name); + } else { + zephir_get_strval(&name, name_param); + } ZEPHIR_INIT_VAR(&_0); @@ -146337,7 +139476,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, callMethod) object_init_ex(&_1$$4, phalcon_mvc_micro_exception_ce); ZEPHIR_INIT_VAR(&_2$$4); ZEPHIR_CONCAT_SVS(&_2$$4, "Handler '", &definition, "' doesn't exist"); - ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 31, &_2$$4); + ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 29, &_2$$4); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$4, "phalcon/Mvc/Micro/LazyLoader.zep", 55); ZEPHIR_MM_RESTORE(); @@ -146954,16 +140093,16 @@ static PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection) ZEPHIR_INIT_VAR(&reflection); if (!ZEPHIR_IS_NULL(&methodName)) { object_init_ex(&reflection, zephir_get_internal_ce(SL("reflectionmethod"))); - ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 0, handler, &methodName); + ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 432, handler, &methodName); zephir_check_call_status(); } else { object_init_ex(&reflection, zephir_get_internal_ce(SL("reflectionfunction"))); - ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 173, handler); + ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 145, handler); zephir_check_call_status(); } zephir_read_property(&_0, this_ptr, ZEND_STRL("cache"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&cache, &_0); - ZEPHIR_CALL_METHOD(&methodParams, &reflection, "getparameters", NULL, 174); + ZEPHIR_CALL_METHOD(&methodParams, &reflection, "getparameters", NULL, 146); zephir_check_call_status(); ZEPHIR_INIT_VAR(¶msKeys); zephir_array_keys(¶msKeys, ¶ms); @@ -146996,7 +140135,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection) zephir_array_fetch(¶mValue, ¶ms, ¶mKey, PH_NOISY, "phalcon/Mvc/Model/Binder.zep", 179); ZEPHIR_INIT_NVAR(&_6$$5); ZVAL_STRING(&_6$$5, "Phalcon\\Mvc\\Model"); - ZEPHIR_CALL_FUNCTION(&_7$$5, "is_subclass_of", &_8, 0, &className, &_6$$5); + ZEPHIR_CALL_FUNCTION(&_7$$5, "is_subclass_of", &_8, 433, &className, &_6$$5); zephir_check_call_status(); if (ZEPHIR_IS_STRING(&className, "Phalcon\\Mvc\\Model")) { if (Z_TYPE_P(&realClasses) == IS_NULL) { @@ -147021,7 +140160,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection) object_init_ex(&_10$$14, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_11$$14); ZEPHIR_CONCAT_SVS(&_11$$14, "You should provide model class name for ", ¶mKey, " parameter"); - ZEPHIR_CALL_METHOD(NULL, &_10$$14, "__construct", &_12, 31, &_11$$14); + ZEPHIR_CALL_METHOD(NULL, &_10$$14, "__construct", &_12, 29, &_11$$14); zephir_check_call_status(); zephir_throw_exception_debug(&_10$$14, "phalcon/Mvc/Model/Binder.zep", 199); ZEPHIR_MM_RESTORE(); @@ -147078,7 +140217,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection) zephir_array_fetch(¶mValue, ¶ms, ¶mKey, PH_NOISY, "phalcon/Mvc/Model/Binder.zep", 179); ZEPHIR_INIT_NVAR(&_15$$19); ZVAL_STRING(&_15$$19, "Phalcon\\Mvc\\Model"); - ZEPHIR_CALL_FUNCTION(&_16$$19, "is_subclass_of", &_8, 0, &className, &_15$$19); + ZEPHIR_CALL_FUNCTION(&_16$$19, "is_subclass_of", &_8, 433, &className, &_15$$19); zephir_check_call_status(); if (ZEPHIR_IS_STRING(&className, "Phalcon\\Mvc\\Model")) { if (Z_TYPE_P(&realClasses) == IS_NULL) { @@ -147103,7 +140242,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection) object_init_ex(&_18$$28, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_19$$28); ZEPHIR_CONCAT_SVS(&_19$$28, "You should provide model class name for ", ¶mKey, " parameter"); - ZEPHIR_CALL_METHOD(NULL, &_18$$28, "__construct", &_12, 31, &_19$$28); + ZEPHIR_CALL_METHOD(NULL, &_18$$28, "__construct", &_12, 29, &_19$$28); zephir_check_call_status(); zephir_throw_exception_debug(&_18$$28, "phalcon/Mvc/Model/Binder.zep", 199); ZEPHIR_MM_RESTORE(); @@ -147894,19 +141033,19 @@ static PHP_METHOD(Phalcon_Mvc_Model_Criteria, fromInput) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 511, container); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 425, container); zephir_check_call_status(); if (zephir_fast_count_int(&conditions)) { ZEPHIR_INIT_VAR(&_16$$16); ZEPHIR_INIT_VAR(&_17$$16); ZEPHIR_CONCAT_SVS(&_17$$16, " ", &operator, " "); zephir_fast_join(&_16$$16, &_17$$16, &conditions); - ZEPHIR_CALL_METHOD(NULL, &criteria, "where", NULL, 0, &_16$$16); + ZEPHIR_CALL_METHOD(NULL, &criteria, "where", NULL, 434, &_16$$16); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &criteria, "bind", NULL, 0, &bind); + ZEPHIR_CALL_METHOD(NULL, &criteria, "bind", NULL, 435, &bind); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 0, &modelName); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 426, &modelName); zephir_check_call_status(); RETURN_CCTOR(&criteria); } @@ -148456,11 +141595,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Criteria, limit) ZVAL_LONG(&_0, limit); - ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 306, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 279, &_0); zephir_check_call_status(); limit = zephir_get_numberval(&_1); ZVAL_LONG(&_0, offset); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 306, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 279, &_0); zephir_check_call_status(); offset = zephir_get_numberval(&_2); if (UNEXPECTED(limit == 0)) { @@ -149382,7 +142521,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, load) object_init_ex(&_0$$3, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZEPHIR_CONCAT_SVS(&_1$$3, "Model '", &modelName, "' could not be loaded"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 31, &_1$$3); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 29, &_1$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/Model/Manager.zep", 349); ZEPHIR_MM_RESTORE(); @@ -149526,10 +142665,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, isVisibleModelProperty) array_init(&publicProperties); ZEPHIR_INIT_VAR(&classReflection); object_init_ex(&classReflection, zephir_get_internal_ce(SL("reflectionclass"))); - ZEPHIR_CALL_METHOD(NULL, &classReflection, "__construct", NULL, 179, &className); + ZEPHIR_CALL_METHOD(NULL, &classReflection, "__construct", NULL, 151, &className); zephir_check_call_status(); ZVAL_LONG(&_1$$3, 1); - ZEPHIR_CALL_METHOD(&reflectionProperties, &classReflection, "getproperties", NULL, 183, &_1$$3); + ZEPHIR_CALL_METHOD(&reflectionProperties, &classReflection, "getproperties", NULL, 155, &_1$$3); zephir_check_call_status(); zephir_is_iterable(&reflectionProperties, 0, "phalcon/Mvc/Model/Manager.zep", 434); if (Z_TYPE_P(&reflectionProperties) == IS_ARRAY) { @@ -150431,7 +143570,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasOne) ZEPHIR_INIT_VAR(&relation); object_init_ex(&relation, phalcon_mvc_model_relation_ce); ZVAL_LONG(&_2, 1); - ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 0, &_2, &referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 436, &_2, &referencedModel, fields, referencedFields, options); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, options, SL("alias"), 0)) { @@ -150563,9 +143702,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasOneThrough) ZEPHIR_INIT_VAR(&relation); object_init_ex(&relation, phalcon_mvc_model_relation_ce); ZVAL_LONG(&_1, 3); - ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 0, &_1, &referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 436, &_1, &referencedModel, fields, referencedFields, options); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 0, intermediateFields, &intermediateModel, intermediateReferencedFields); + ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 437, intermediateFields, &intermediateModel, intermediateReferencedFields); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, options, SL("alias"), 0)) { @@ -150672,7 +143811,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, addBelongsTo) ZEPHIR_INIT_VAR(&relation); object_init_ex(&relation, phalcon_mvc_model_relation_ce); ZVAL_LONG(&_2, 0); - ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 0, &_2, &referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 436, &_2, &referencedModel, fields, referencedFields, options); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, options, SL("alias"), 0)) { @@ -150780,7 +143919,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasMany) ZEPHIR_INIT_VAR(&relation); object_init_ex(&relation, phalcon_mvc_model_relation_ce); ZVAL_LONG(&_1, 2); - ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 0, &_1, &referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 436, &_1, &referencedModel, fields, referencedFields, options); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, options, SL("alias"), 0)) { @@ -150912,9 +144051,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasManyToMany) ZEPHIR_INIT_VAR(&relation); object_init_ex(&relation, phalcon_mvc_model_relation_ce); ZVAL_LONG(&_1, 4); - ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 0, &_1, &referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 436, &_1, &referencedModel, fields, referencedFields, options); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 0, intermediateFields, &intermediateModel, intermediateReferencedFields); + ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 437, intermediateFields, &intermediateModel, intermediateReferencedFields); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, options, SL("alias"), 0)) { @@ -151589,7 +144728,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, getRelationRecords) ZEPHIR_INIT_VAR(&_4$$3); ZEPHIR_CONCAT_SVSVSVSVS(&_4$$3, "[", &intermediateModel, "].[", &intermediateFields, "] = [", &referencedModel, "].[", &_3$$3, "]"); zephir_array_append(&joinConditions, &_4$$3, PH_SEPARATE, "phalcon/Mvc/Model/Manager.zep", 1452); - ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "_mergefindparameters", NULL, 0, &extraParameters, parameters); + ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "_mergefindparameters", NULL, 438, &extraParameters, parameters); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&builder, this_ptr, "createbuilder", NULL, 0, &_5$$3); zephir_check_call_status(); @@ -151720,10 +144859,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, getRelationRecords) ZEPHIR_CALL_METHOD(&_32, record, "getdi", NULL, 0); zephir_check_call_status(); zephir_array_update_string(&findParams, SL("di"), &_32, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&findArguments, this_ptr, "_mergefindparameters", NULL, 0, &findParams, parameters); + ZEPHIR_CALL_METHOD(&findArguments, this_ptr, "_mergefindparameters", NULL, 438, &findParams, parameters); zephir_check_call_status(); if (Z_TYPE_P(&extraParameters) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&findParams, this_ptr, "_mergefindparameters", NULL, 0, &extraParameters, &findArguments); + ZEPHIR_CALL_METHOD(&findParams, this_ptr, "_mergefindparameters", NULL, 438, &extraParameters, &findArguments); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&findParams, &findArguments); @@ -151881,7 +145020,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, hasBelongsTo) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "belongsTo"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 0, &_0, &modelName, &modelRelation); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 439, &_0, &modelName, &modelRelation); zephir_check_call_status(); RETURN_MM(); } @@ -151930,7 +145069,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, hasHasMany) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "hasMany"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 0, &_0, &modelName, &modelRelation); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 439, &_0, &modelName, &modelRelation); zephir_check_call_status(); RETURN_MM(); } @@ -151979,7 +145118,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, hasHasOne) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "hasOne"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 0, &_0, &modelName, &modelRelation); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 439, &_0, &modelName, &modelRelation); zephir_check_call_status(); RETURN_MM(); } @@ -152028,7 +145167,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, hasHasOneThrough) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "hasOneThrough"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 0, &_0, &modelName, &modelRelation); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 439, &_0, &modelName, &modelRelation); zephir_check_call_status(); RETURN_MM(); } @@ -152077,7 +145216,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, hasHasManyToMany) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "hasManyToMany"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 0, &_0, &modelName, &modelRelation); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 439, &_0, &modelName, &modelRelation); zephir_check_call_status(); RETURN_MM(); } @@ -153463,7 +146602,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData, getAttributes) ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_METHOD(&data, this_ptr, "readmetadataindex", NULL, 25, model, &_0); + ZEPHIR_CALL_METHOD(&data, this_ptr, "readmetadataindex", NULL, 23, model, &_0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&data) != IS_ARRAY)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The meta-data is invalid or is corrupt", "phalcon/Mvc/Model/MetaData.zep", 102); @@ -153495,7 +146634,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData, getAutomaticCreateAttributes) ZVAL_LONG(&_0, 10); - ZEPHIR_CALL_METHOD(&data, this_ptr, "readmetadataindex", NULL, 25, model, &_0); + ZEPHIR_CALL_METHOD(&data, this_ptr, "readmetadataindex", NULL, 23, model, &_0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&data) != IS_ARRAY)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The meta-data is invalid or is corrupt", "phalcon/Mvc/Model/MetaData.zep", 129); @@ -153527,7 +146666,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData, getAutomaticUpdateAttributes) ZVAL_LONG(&_0, 11); - ZEPHIR_CALL_METHOD(&data, this_ptr, "readmetadataindex", NULL, 25, model, &_0); + ZEPHIR_CALL_METHOD(&data, this_ptr, "readmetadataindex", NULL, 23, model, &_0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&data) != IS_ARRAY)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The meta-data is invalid or is corrupt", "phalcon/Mvc/Model/MetaData.zep", 156); @@ -153559,7 +146698,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData, getBindTypes) ZVAL_LONG(&_0, 9); - ZEPHIR_CALL_METHOD(&data, this_ptr, "readmetadataindex", NULL, 25, model, &_0); + ZEPHIR_CALL_METHOD(&data, this_ptr, "readmetadataindex", NULL, 23, model, &_0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&data) != IS_ARRAY)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The meta-data is invalid or is corrupt", "phalcon/Mvc/Model/MetaData.zep", 183); @@ -153592,7 +146731,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData, getColumnMap) ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_METHOD(&data, this_ptr, "readcolumnmapindex", NULL, 26, model, &_0); + ZEPHIR_CALL_METHOD(&data, this_ptr, "readcolumnmapindex", NULL, 24, model, &_0); zephir_check_call_status(); _1 = Z_TYPE_P(&data) != IS_NULL; if (_1) { @@ -153628,7 +146767,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData, getDefaultValues) ZVAL_LONG(&_0, 12); - ZEPHIR_CALL_METHOD(&data, this_ptr, "readmetadataindex", NULL, 25, model, &_0); + ZEPHIR_CALL_METHOD(&data, this_ptr, "readmetadataindex", NULL, 23, model, &_0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&data) != IS_ARRAY)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The meta-data is invalid or is corrupt", "phalcon/Mvc/Model/MetaData.zep", 231); @@ -153660,7 +146799,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData, getDataTypes) ZVAL_LONG(&_0, 4); - ZEPHIR_CALL_METHOD(&data, this_ptr, "readmetadataindex", NULL, 25, model, &_0); + ZEPHIR_CALL_METHOD(&data, this_ptr, "readmetadataindex", NULL, 23, model, &_0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&data) != IS_ARRAY)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The meta-data is invalid or is corrupt", "phalcon/Mvc/Model/MetaData.zep", 255); @@ -153692,7 +146831,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData, getDataTypesNumeric) ZVAL_LONG(&_0, 5); - ZEPHIR_CALL_METHOD(&data, this_ptr, "readmetadataindex", NULL, 25, model, &_0); + ZEPHIR_CALL_METHOD(&data, this_ptr, "readmetadataindex", NULL, 23, model, &_0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&data) != IS_ARRAY)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The meta-data is invalid or is corrupt", "phalcon/Mvc/Model/MetaData.zep", 282); @@ -153745,7 +146884,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData, getEmptyStringAttributes) ZVAL_LONG(&_0, 13); - ZEPHIR_CALL_METHOD(&data, this_ptr, "readmetadataindex", NULL, 25, model, &_0); + ZEPHIR_CALL_METHOD(&data, this_ptr, "readmetadataindex", NULL, 23, model, &_0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&data) != IS_ARRAY)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The meta-data is invalid or is corrupt", "phalcon/Mvc/Model/MetaData.zep", 327); @@ -153776,7 +146915,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData, getIdentityField) ZVAL_LONG(&_0, 8); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "readmetadataindex", NULL, 25, model, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "readmetadataindex", NULL, 23, model, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -153804,7 +146943,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData, getNonPrimaryKeyAttributes) ZVAL_LONG(&_0, 2); - ZEPHIR_CALL_METHOD(&data, this_ptr, "readmetadataindex", NULL, 25, model, &_0); + ZEPHIR_CALL_METHOD(&data, this_ptr, "readmetadataindex", NULL, 23, model, &_0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&data) != IS_ARRAY)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The meta-data is invalid or is corrupt", "phalcon/Mvc/Model/MetaData.zep", 367); @@ -153836,7 +146975,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData, getNotNullAttributes) ZVAL_LONG(&_0, 3); - ZEPHIR_CALL_METHOD(&data, this_ptr, "readmetadataindex", NULL, 25, model, &_0); + ZEPHIR_CALL_METHOD(&data, this_ptr, "readmetadataindex", NULL, 23, model, &_0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&data) != IS_ARRAY)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The meta-data is invalid or is corrupt", "phalcon/Mvc/Model/MetaData.zep", 391); @@ -153868,7 +147007,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData, getPrimaryKeyAttributes) ZVAL_LONG(&_0, 1); - ZEPHIR_CALL_METHOD(&data, this_ptr, "readmetadataindex", NULL, 25, model, &_0); + ZEPHIR_CALL_METHOD(&data, this_ptr, "readmetadataindex", NULL, 23, model, &_0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&data) != IS_ARRAY)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The meta-data is invalid or is corrupt", "phalcon/Mvc/Model/MetaData.zep", 415); @@ -153901,7 +147040,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData, getReverseColumnMap) ZVAL_LONG(&_0, 1); - ZEPHIR_CALL_METHOD(&data, this_ptr, "readcolumnmapindex", NULL, 26, model, &_0); + ZEPHIR_CALL_METHOD(&data, this_ptr, "readcolumnmapindex", NULL, 24, model, &_0); zephir_check_call_status(); _1 = Z_TYPE_P(&data) != IS_NULL; if (_1) { @@ -153973,7 +147112,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData, hasAttribute) if (Z_TYPE_P(&columnMap) == IS_ARRAY) { RETURN_MM_BOOL(zephir_array_isset(&columnMap, &attribute)); } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "readmetadata", NULL, 27, model); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "readmetadata", NULL, 25, model); zephir_check_call_status(); zephir_array_fetch_long(&_1, &_0, 4, PH_READONLY, "phalcon/Mvc/Model/MetaData.zep", 482); RETURN_MM_BOOL(zephir_array_isset(&_1, &attribute)); @@ -154066,7 +147205,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData, readColumnMap) ZVAL_NULL(&_1$$4); ZVAL_NULL(&_2$$4); ZVAL_NULL(&_3$$4); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "initialize", NULL, 28, model, &_1$$4, &_2$$4, &_3$$4); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "initialize", NULL, 26, model, &_1$$4, &_2$$4, &_3$$4); zephir_check_call_status(); zephir_read_property(&_1$$4, this_ptr, ZEND_STRL("columnMap"), PH_NOISY_CC | PH_READONLY); ZEPHIR_OBS_NVAR(&data); @@ -154115,7 +147254,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData, readColumnMapIndex) ZVAL_NULL(&_1$$4); ZVAL_NULL(&_2$$4); ZVAL_NULL(&_3$$4); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "initialize", NULL, 28, model, &_1$$4, &_2$$4, &_3$$4); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "initialize", NULL, 26, model, &_1$$4, &_2$$4, &_3$$4); zephir_check_call_status(); zephir_read_property(&_1$$4, this_ptr, ZEND_STRL("columnMap"), PH_NOISY_CC | PH_READONLY); ZEPHIR_OBS_NVAR(&columnMapModel); @@ -154165,7 +147304,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData, readMetaData) zephir_get_strval(&key, &_1); zephir_read_property(&_2, this_ptr, ZEND_STRL("metaData"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset(&_2, &key))) { - ZEPHIR_CALL_METHOD(NULL, this_ptr, "initialize", NULL, 28, model, &key, &source, &schema); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "initialize", NULL, 26, model, &key, &source, &schema); zephir_check_call_status(); } zephir_read_property(&_3, this_ptr, ZEND_STRL("metaData"), PH_NOISY_CC | PH_READONLY); @@ -154218,7 +147357,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData, readMetaDataIndex) zephir_read_property(&_2, this_ptr, ZEND_STRL("metaData"), PH_NOISY_CC | PH_READONLY); zephir_array_fetch(&_3, &_2, &key, PH_READONLY, "phalcon/Mvc/Model/MetaData.zep", 626); if (!(zephir_array_isset_long(&_3, index))) { - ZEPHIR_CALL_METHOD(NULL, this_ptr, "initialize", NULL, 28, model, &key, &source, &schema); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "initialize", NULL, 26, model, &key, &source, &schema); zephir_check_call_status(); } zephir_read_property(&_4, this_ptr, ZEND_STRL("metaData"), PH_NOISY_CC | PH_READONLY); @@ -154274,7 +147413,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData, setAutomaticCreateAttributes) ZVAL_LONG(&_0, 10); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "writemetadataindex", NULL, 29, model, &_0, &attributes); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "writemetadataindex", NULL, 27, model, &_0, &attributes); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -154305,7 +147444,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData, setAutomaticUpdateAttributes) ZVAL_LONG(&_0, 11); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "writemetadataindex", NULL, 29, model, &_0, &attributes); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "writemetadataindex", NULL, 27, model, &_0, &attributes); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -154336,7 +147475,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData, setEmptyStringAttributes) ZVAL_LONG(&_0, 13); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "writemetadataindex", NULL, 29, model, &_0, &attributes); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "writemetadataindex", NULL, 27, model, &_0, &attributes); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -154429,7 +147568,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData, write) ZEPHIR_CALL_METHOD(&result, &_0$$3, "set", NULL, 0, &key, &data); zephir_check_call_status_or_jump(try_end_1); if (ZEPHIR_IS_FALSE_IDENTICAL(&result)) { - ZEPHIR_CALL_METHOD(NULL, this_ptr, "throwwriteexception", NULL, 30, &option); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "throwwriteexception", NULL, 28, &option); zephir_check_call_status_or_jump(try_end_1); } @@ -154443,7 +147582,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData, write) if (zephir_is_instance_of(&_1, SL("Exception"))) { zend_clear_exception(); ZEPHIR_CPY_WRT(&_2, &_1); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "throwwriteexception", NULL, 30, &option); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "throwwriteexception", NULL, 28, &option); zephir_check_call_status(); } } @@ -154505,7 +147644,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData, writeMetaDataIndex) zephir_get_strval(&key, &_3); zephir_read_property(&_4, this_ptr, ZEND_STRL("metaData"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset(&_4, &key))) { - ZEPHIR_CALL_METHOD(NULL, this_ptr, "initialize", NULL, 28, model, &key, &source, &schema); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "initialize", NULL, 26, model, &key, &source, &schema); zephir_check_call_status(); } zephir_update_property_array_multi(this_ptr, SL("metaData"), data, SL("zl"), 2, &key, index); @@ -154578,7 +147717,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData, initialize) object_init_ex(&_2$$8, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_3$$8); ZEPHIR_CONCAT_SV(&_3$$8, "Invalid meta-data for model ", &className); - ZEPHIR_CALL_METHOD(NULL, &_2$$8, "__construct", NULL, 31, &_3$$8); + ZEPHIR_CALL_METHOD(NULL, &_2$$8, "__construct", NULL, 29, &_3$$8); zephir_check_call_status(); zephir_throw_exception_debug(&_2$$8, "phalcon/Mvc/Model/MetaData.zep", 817); ZEPHIR_MM_RESTORE(); @@ -154658,7 +147797,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData, throwWriteException) if (zephir_is_true(option)) { ZEPHIR_INIT_VAR(&_0$$3); object_init_ex(&_0$$3, phalcon_mvc_model_exception_ce); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 31, &message); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 29, &message); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/Model/MetaData.zep", 901); ZEPHIR_MM_RESTORE(); @@ -155130,13 +148269,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, execute) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "Phalcon\\Cache\\CacheInterface"); - ZEPHIR_CALL_FUNCTION(&_3$$3, "is_a", NULL, 114, &cache, &_2$$3); + ZEPHIR_CALL_FUNCTION(&_3$$3, "is_a", NULL, 83, &cache, &_2$$3); zephir_check_call_status(); _4$$3 = !ZEPHIR_IS_TRUE_IDENTICAL(&_3$$3); if (_4$$3) { ZEPHIR_INIT_NVAR(&_2$$3); ZVAL_STRING(&_2$$3, "Psr\\SimpleCache\\CacheInterface"); - ZEPHIR_CALL_FUNCTION(&_5$$3, "is_a", NULL, 114, &cache, &_2$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "is_a", NULL, 83, &cache, &_2$$3); zephir_check_call_status(); _4$$3 = !ZEPHIR_IS_TRUE_IDENTICAL(&_5$$3); } @@ -155145,7 +148284,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, execute) object_init_ex(&_6$$8, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_7$$8); ZEPHIR_CONCAT_SS(&_7$$8, "Cache service must be an object implementing ", "Phalcon\\Cache\\CacheInterface or Psr\\SimpleCache\\CacheInterface"); - ZEPHIR_CALL_METHOD(NULL, &_6$$8, "__construct", NULL, 31, &_7$$8); + ZEPHIR_CALL_METHOD(NULL, &_6$$8, "__construct", NULL, 29, &_7$$8); zephir_check_call_status(); zephir_throw_exception_debug(&_6$$8, "phalcon/Mvc/Model/Query.zep", 306); ZEPHIR_MM_RESTORE(); @@ -155189,22 +148328,22 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, execute) ZEPHIR_CPY_WRT(&type, &_0); do { if (ZEPHIR_IS_LONG(&type, 309)) { - ZEPHIR_CALL_METHOD(&result, this_ptr, "executeselect", NULL, 0, &intermediate, &mergedParams, &mergedTypes); + ZEPHIR_CALL_METHOD(&result, this_ptr, "executeselect", NULL, 441, &intermediate, &mergedParams, &mergedTypes); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(&type, 306)) { - ZEPHIR_CALL_METHOD(&result, this_ptr, "executeinsert", NULL, 0, &intermediate, &mergedParams, &mergedTypes); + ZEPHIR_CALL_METHOD(&result, this_ptr, "executeinsert", NULL, 442, &intermediate, &mergedParams, &mergedTypes); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(&type, 300)) { - ZEPHIR_CALL_METHOD(&result, this_ptr, "executeupdate", NULL, 0, &intermediate, &mergedParams, &mergedTypes); + ZEPHIR_CALL_METHOD(&result, this_ptr, "executeupdate", NULL, 443, &intermediate, &mergedParams, &mergedTypes); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(&type, 303)) { - ZEPHIR_CALL_METHOD(&result, this_ptr, "executedelete", NULL, 0, &intermediate, &mergedParams, &mergedTypes); + ZEPHIR_CALL_METHOD(&result, this_ptr, "executedelete", NULL, 444, &intermediate, &mergedParams, &mergedTypes); zephir_check_call_status(); break; } @@ -155212,7 +148351,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, execute) object_init_ex(&_9$$19, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_10$$19); ZEPHIR_CONCAT_SV(&_10$$19, "Unknown statement ", &type); - ZEPHIR_CALL_METHOD(NULL, &_9$$19, "__construct", NULL, 31, &_10$$19); + ZEPHIR_CALL_METHOD(NULL, &_9$$19, "__construct", NULL, 29, &_10$$19); zephir_check_call_status(); zephir_throw_exception_debug(&_9$$19, "phalcon/Mvc/Model/Query.zep", 398); ZEPHIR_MM_RESTORE(); @@ -155364,7 +148503,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSql) zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("bindParams"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_2$$3, this_ptr, ZEND_STRL("bindTypes"), PH_NOISY_CC | PH_READONLY); ZVAL_BOOL(&_3$$3, 1); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "executeselect", NULL, 0, &intermediate, &_1$$3, &_2$$3, &_3$$3); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "executeselect", NULL, 441, &intermediate, &_1$$3, &_2$$3, &_3$$3); zephir_check_call_status(); RETURN_MM(); } @@ -155445,22 +148584,22 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, parse) zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &type); do { if (ZEPHIR_IS_LONG(&type, 309)) { - ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareselect", NULL, 0); + ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareselect", NULL, 445); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(&type, 306)) { - ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareinsert", NULL, 0); + ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareinsert", NULL, 446); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(&type, 300)) { - ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareupdate", NULL, 0); + ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareupdate", NULL, 447); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(&type, 303)) { - ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_preparedelete", NULL, 0); + ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_preparedelete", NULL, 448); zephir_check_call_status(); break; } @@ -155468,7 +148607,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, parse) object_init_ex(&_4$$13, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_5$$13); ZEPHIR_CONCAT_SVSV(&_5$$13, "Unknown statement ", &type, ", when preparing: ", &phql); - ZEPHIR_CALL_METHOD(NULL, &_4$$13, "__construct", NULL, 31, &_5$$13); + ZEPHIR_CALL_METHOD(NULL, &_4$$13, "__construct", NULL, 29, &_5$$13); zephir_check_call_status(); zephir_throw_exception_debug(&_4$$13, "phalcon/Mvc/Model/Query.zep", 604); ZEPHIR_MM_RESTORE(); @@ -155810,12 +148949,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeDelete) ZEPHIR_CALL_METHOD(&model, &_1$$4, "load", NULL, 0, &modelName); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&records, this_ptr, "getrelatedrecords", NULL, 0, &model, &intermediate, &bindParams, &bindTypes); + ZEPHIR_CALL_METHOD(&records, this_ptr, "getrelatedrecords", NULL, 449, &model, &intermediate, &bindParams, &bindTypes); zephir_check_call_status(); if (!(zephir_fast_count_int(&records))) { object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZVAL_BOOL(&_2$$5, 1); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 0, &_2$$5); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 450, &_2$$5); zephir_check_call_status(); RETURN_MM(); } @@ -155840,7 +148979,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeDelete) zephir_check_call_status(); object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZVAL_BOOL(&_7$$7, 0); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 0, &_7$$7, &record); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 450, &_7$$7, &record); zephir_check_call_status(); RETURN_MM(); } @@ -155851,7 +148990,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeDelete) zephir_check_call_status(); object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZVAL_BOOL(&_9, 1); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 0, &_9); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 450, &_9); zephir_check_call_status(); RETURN_MM(); } @@ -156009,7 +149148,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) object_init_ex(&_12$$12, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_13$$12); ZEPHIR_CONCAT_SVS(&_13$$12, "Bound parameter '", &wildcard, "' cannot be replaced because it isn't in the placeholders list"); - ZEPHIR_CALL_METHOD(NULL, &_12$$12, "__construct", &_14, 31, &_13$$12); + ZEPHIR_CALL_METHOD(NULL, &_12$$12, "__construct", &_14, 29, &_13$$12); zephir_check_call_status(); zephir_throw_exception_debug(&_12$$12, "phalcon/Mvc/Model/Query.zep", 917); ZEPHIR_MM_RESTORE(); @@ -156021,7 +149160,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) object_init_ex(&insertValue, phalcon_db_rawvalue_ce); ZEPHIR_CALL_METHOD(&_15$$13, &dialect, "getsqlexpression", &_16, 0, &exprValue); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &insertValue, "__construct", &_17, 34, &_15$$13); + ZEPHIR_CALL_METHOD(NULL, &insertValue, "__construct", &_17, 32, &_15$$13); zephir_check_call_status(); break; } while(0); @@ -156039,7 +149178,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) object_init_ex(&_19$$15, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_20$$15); ZEPHIR_CONCAT_SVS(&_20$$15, "Column '", &fieldName, "' isn't part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_19$$15, "__construct", &_14, 31, &_20$$15); + ZEPHIR_CALL_METHOD(NULL, &_19$$15, "__construct", &_14, 29, &_20$$15); zephir_check_call_status(); zephir_throw_exception_debug(&_19$$15, "phalcon/Mvc/Model/Query.zep", 940); ZEPHIR_MM_RESTORE(); @@ -156092,7 +149231,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) object_init_ex(&_27$$21, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_28$$21); ZEPHIR_CONCAT_SVS(&_28$$21, "Bound parameter '", &wildcard, "' cannot be replaced because it isn't in the placeholders list"); - ZEPHIR_CALL_METHOD(NULL, &_27$$21, "__construct", &_14, 31, &_28$$21); + ZEPHIR_CALL_METHOD(NULL, &_27$$21, "__construct", &_14, 29, &_28$$21); zephir_check_call_status(); zephir_throw_exception_debug(&_27$$21, "phalcon/Mvc/Model/Query.zep", 917); ZEPHIR_MM_RESTORE(); @@ -156104,7 +149243,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) object_init_ex(&insertValue, phalcon_db_rawvalue_ce); ZEPHIR_CALL_METHOD(&_29$$22, &dialect, "getsqlexpression", &_30, 0, &exprValue); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &insertValue, "__construct", &_17, 34, &_29$$22); + ZEPHIR_CALL_METHOD(NULL, &insertValue, "__construct", &_17, 32, &_29$$22); zephir_check_call_status(); break; } while(0); @@ -156122,7 +149261,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) object_init_ex(&_32$$24, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_33$$24); ZEPHIR_CONCAT_SVS(&_33$$24, "Column '", &fieldName, "' isn't part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_32$$24, "__construct", &_14, 31, &_33$$24); + ZEPHIR_CALL_METHOD(NULL, &_32$$24, "__construct", &_14, 29, &_33$$24); zephir_check_call_status(); zephir_throw_exception_debug(&_32$$24, "phalcon/Mvc/Model/Query.zep", 940); ZEPHIR_MM_RESTORE(); @@ -156145,7 +149284,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZEPHIR_CALL_METHOD(&_34, &insertModel, "create", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 0, &_34, &insertModel); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 450, &_34, &insertModel); zephir_check_call_status(); RETURN_MM(); } @@ -157017,7 +150156,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) object_init_ex(&_91$$98, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_92$$98); ZEPHIR_CONCAT_SVS(&_92$$98, "Resultset class \"", &resultsetClassName, "\" not found"); - ZEPHIR_CALL_METHOD(NULL, &_91$$98, "__construct", NULL, 31, &_92$$98); + ZEPHIR_CALL_METHOD(NULL, &_91$$98, "__construct", NULL, 29, &_92$$98); zephir_check_call_status(); zephir_throw_exception_debug(&_91$$98, "phalcon/Mvc/Model/Query.zep", 1298); ZEPHIR_MM_RESTORE(); @@ -157025,14 +150164,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) } ZEPHIR_INIT_VAR(&_93$$97); ZVAL_STRING(&_93$$97, "Phalcon\\Mvc\\Model\\ResultsetInterface"); - ZEPHIR_CALL_FUNCTION(&_94$$97, "is_subclass_of", NULL, 0, &resultsetClassName, &_93$$97); + ZEPHIR_CALL_FUNCTION(&_94$$97, "is_subclass_of", NULL, 433, &resultsetClassName, &_93$$97); zephir_check_call_status(); if (UNEXPECTED(!zephir_is_true(&_94$$97))) { ZEPHIR_INIT_VAR(&_95$$99); object_init_ex(&_95$$99, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_96$$99); ZEPHIR_CONCAT_SVS(&_96$$99, "Resultset class \"", &resultsetClassName, "\" must be an implementation of Phalcon\\Mvc\\Model\\ResultsetInterface"); - ZEPHIR_CALL_METHOD(NULL, &_95$$99, "__construct", NULL, 31, &_96$$99); + ZEPHIR_CALL_METHOD(NULL, &_95$$99, "__construct", NULL, 29, &_96$$99); zephir_check_call_status(); zephir_throw_exception_debug(&_95$$99, "phalcon/Mvc/Model/Query.zep", 1304); ZEPHIR_MM_RESTORE(); @@ -157058,12 +150197,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) } else { ZVAL_BOOL(&_98$$83, 0); } - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 0, &simpleColumnMap, &resultObject, &resultData, &cache, &_98$$83); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 451, &simpleColumnMap, &resultObject, &resultData, &cache, &_98$$83); zephir_check_call_status(); RETURN_MM(); } object_init_ex(return_value, phalcon_mvc_model_resultset_complex_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 0, &columns1, &resultData, &cache); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 452, &columns1, &resultData, &cache); zephir_check_call_status(); RETURN_MM(); } @@ -157217,7 +150356,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) object_init_ex(&_12$$11, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_13$$11); ZEPHIR_CONCAT_SVS(&_13$$11, "Bound parameter '", &wildcard, "' cannot be replaced because it's not in the placeholders list"); - ZEPHIR_CALL_METHOD(NULL, &_12$$11, "__construct", &_14, 31, &_13$$11); + ZEPHIR_CALL_METHOD(NULL, &_12$$11, "__construct", &_14, 29, &_13$$11); zephir_check_call_status(); zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 1427); ZEPHIR_MM_RESTORE(); @@ -157235,7 +150374,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) object_init_ex(&updateValue, phalcon_db_rawvalue_ce); ZEPHIR_CALL_METHOD(&_15$$13, &dialect, "getsqlexpression", &_16, 0, &exprValue); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &updateValue, "__construct", &_17, 34, &_15$$13); + ZEPHIR_CALL_METHOD(NULL, &updateValue, "__construct", &_17, 32, &_15$$13); zephir_check_call_status(); break; } while(0); @@ -157293,7 +150432,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) object_init_ex(&_24$$20, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_25$$20); ZEPHIR_CONCAT_SVS(&_25$$20, "Bound parameter '", &wildcard, "' cannot be replaced because it's not in the placeholders list"); - ZEPHIR_CALL_METHOD(NULL, &_24$$20, "__construct", &_14, 31, &_25$$20); + ZEPHIR_CALL_METHOD(NULL, &_24$$20, "__construct", &_14, 29, &_25$$20); zephir_check_call_status(); zephir_throw_exception_debug(&_24$$20, "phalcon/Mvc/Model/Query.zep", 1427); ZEPHIR_MM_RESTORE(); @@ -157311,7 +150450,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) object_init_ex(&updateValue, phalcon_db_rawvalue_ce); ZEPHIR_CALL_METHOD(&_26$$22, &dialect, "getsqlexpression", &_27, 0, &exprValue); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &updateValue, "__construct", &_17, 34, &_26$$22); + ZEPHIR_CALL_METHOD(NULL, &updateValue, "__construct", &_17, 32, &_26$$22); zephir_check_call_status(); break; } while(0); @@ -157323,12 +150462,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) } ZEPHIR_INIT_NVAR(&field); ZEPHIR_INIT_NVAR(&number); - ZEPHIR_CALL_METHOD(&records, this_ptr, "getrelatedrecords", NULL, 0, &model, &intermediate, &selectBindParams, &selectBindTypes); + ZEPHIR_CALL_METHOD(&records, this_ptr, "getrelatedrecords", NULL, 449, &model, &intermediate, &selectBindParams, &selectBindTypes); zephir_check_call_status(); if (!(zephir_fast_count_int(&records))) { object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZVAL_BOOL(&_28$$23, 1); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 0, &_28$$23); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 450, &_28$$23); zephir_check_call_status(); RETURN_MM(); } @@ -157355,7 +150494,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) zephir_check_call_status(); object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZVAL_BOOL(&_33$$25, 0); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 0, &_33$$25, &record); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 450, &_33$$25, &record); zephir_check_call_status(); RETURN_MM(); } @@ -157366,7 +150505,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) zephir_check_call_status(); object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZVAL_BOOL(&_35, 1); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 0, &_35); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 450, &_35); zephir_check_call_status(); RETURN_MM(); } @@ -157400,7 +150539,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getCallArgument) add_assoc_stringl_ex(return_value, SL("type"), SL("all")); RETURN_MM(); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getexpression", NULL, 0, &argument); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getexpression", NULL, 453, &argument); zephir_check_call_status(); RETURN_MM(); } @@ -157462,11 +150601,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression) zephir_create_array(&_3$$4, 3, 0); add_assoc_stringl_ex(&_3$$4, SL("type"), SL("when")); zephir_array_fetch_string(&_5$$4, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1536); - ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 0, &_5$$4); + ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 453, &_5$$4); zephir_check_call_status(); zephir_array_update_string(&_3$$4, SL("expr"), &_4$$4, PH_COPY | PH_SEPARATE); zephir_array_fetch_string(&_7$$4, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1537); - ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 0, &_7$$4); + ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 453, &_7$$4); zephir_check_call_status(); zephir_array_update_string(&_3$$4, SL("then"), &_4$$4, PH_COPY | PH_SEPARATE); zephir_array_append(&whenClauses, &_3$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1538); @@ -157475,7 +150614,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression) zephir_create_array(&_8$$5, 2, 0); add_assoc_stringl_ex(&_8$$5, SL("type"), SL("else")); zephir_array_fetch_string(&_10$$5, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1542); - ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "getexpression", &_6, 0, &_10$$5); + ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "getexpression", &_6, 453, &_10$$5); zephir_check_call_status(); zephir_array_update_string(&_8$$5, SL("expr"), &_9$$5, PH_COPY | PH_SEPARATE); zephir_array_append(&whenClauses, &_8$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1543); @@ -157497,11 +150636,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression) zephir_create_array(&_11$$7, 3, 0); add_assoc_stringl_ex(&_11$$7, SL("type"), SL("when")); zephir_array_fetch_string(&_13$$7, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1536); - ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 0, &_13$$7); + ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 453, &_13$$7); zephir_check_call_status(); zephir_array_update_string(&_11$$7, SL("expr"), &_12$$7, PH_COPY | PH_SEPARATE); zephir_array_fetch_string(&_14$$7, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1537); - ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 0, &_14$$7); + ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 453, &_14$$7); zephir_check_call_status(); zephir_array_update_string(&_11$$7, SL("then"), &_12$$7, PH_COPY | PH_SEPARATE); zephir_array_append(&whenClauses, &_11$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1538); @@ -157510,7 +150649,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression) zephir_create_array(&_15$$8, 2, 0); add_assoc_stringl_ex(&_15$$8, SL("type"), SL("else")); zephir_array_fetch_string(&_17$$8, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1542); - ZEPHIR_CALL_METHOD(&_16$$8, this_ptr, "getexpression", &_6, 0, &_17$$8); + ZEPHIR_CALL_METHOD(&_16$$8, this_ptr, "getexpression", &_6, 453, &_17$$8); zephir_check_call_status(); zephir_array_update_string(&_15$$8, SL("expr"), &_16$$8, PH_COPY | PH_SEPARATE); zephir_array_append(&whenClauses, &_15$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1543); @@ -157523,7 +150662,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression) zephir_create_array(return_value, 3, 0); add_assoc_stringl_ex(return_value, SL("type"), SL("case")); zephir_array_fetch_string(&_19, &expr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1549); - ZEPHIR_CALL_METHOD(&_18, this_ptr, "getexpression", &_6, 0, &_19); + ZEPHIR_CALL_METHOD(&_18, this_ptr, "getexpression", &_6, 453, &_19); zephir_check_call_status(); zephir_array_update_string(return_value, SL("expr"), &_18, PH_COPY | PH_SEPARATE); zephir_array_update_string(return_value, SL("when-clauses"), &whenClauses, PH_COPY | PH_SEPARATE); @@ -157679,7 +150818,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) } else { ZVAL_BOOL(&_0$$5, 0); } - ZEPHIR_CALL_METHOD(&left, this_ptr, "getexpression", NULL, 0, &exprLeft, &_0$$5); + ZEPHIR_CALL_METHOD(&left, this_ptr, "getexpression", NULL, 453, &exprLeft, &_0$$5); zephir_check_call_status(); } ZEPHIR_OBS_VAR(&exprRight); @@ -157689,7 +150828,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) } else { ZVAL_BOOL(&_1$$6, 0); } - ZEPHIR_CALL_METHOD(&right, this_ptr, "getexpression", NULL, 0, &exprRight, &_1$$6); + ZEPHIR_CALL_METHOD(&right, this_ptr, "getexpression", NULL, 453, &exprRight, &_1$$6); zephir_check_call_status(); } } @@ -157774,7 +150913,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) break; } if (ZEPHIR_IS_LONG(&exprType, 355)) { - ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "getqualified", NULL, 0, &expr); + ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "getqualified", NULL, 454, &expr); zephir_check_call_status(); break; } @@ -158036,7 +151175,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) object_init_ex(&_50$$44, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_51$$44); ZEPHIR_CONCAT_SV(&_51$$44, "Bind value is required for array type placeholder: ", &name); - ZEPHIR_CALL_METHOD(NULL, &_50$$44, "__construct", NULL, 31, &_51$$44); + ZEPHIR_CALL_METHOD(NULL, &_50$$44, "__construct", NULL, 29, &_51$$44); zephir_check_call_status(); zephir_throw_exception_debug(&_50$$44, "phalcon/Mvc/Model/Query.zep", 1903); ZEPHIR_MM_RESTORE(); @@ -158047,7 +151186,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) object_init_ex(&_52$$45, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_53$$45); ZEPHIR_CONCAT_SV(&_53$$45, "Bind type requires an array in placeholder: ", &name); - ZEPHIR_CALL_METHOD(NULL, &_52$$45, "__construct", NULL, 31, &_53$$45); + ZEPHIR_CALL_METHOD(NULL, &_52$$45, "__construct", NULL, 29, &_53$$45); zephir_check_call_status(); zephir_throw_exception_debug(&_52$$45, "phalcon/Mvc/Model/Query.zep", 1909); ZEPHIR_MM_RESTORE(); @@ -158058,7 +151197,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) object_init_ex(&_54$$46, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_55$$46); ZEPHIR_CONCAT_SV(&_55$$46, "At least one value must be bound in placeholder: ", &name); - ZEPHIR_CALL_METHOD(NULL, &_54$$46, "__construct", NULL, 31, &_55$$46); + ZEPHIR_CALL_METHOD(NULL, &_54$$46, "__construct", NULL, 29, &_55$$46); zephir_check_call_status(); zephir_throw_exception_debug(&_54$$46, "phalcon/Mvc/Model/Query.zep", 1915); ZEPHIR_MM_RESTORE(); @@ -158079,7 +151218,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) object_init_ex(&_58$$47, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_59$$47); ZEPHIR_CONCAT_SV(&_59$$47, "Unknown bind type: ", &bindType); - ZEPHIR_CALL_METHOD(NULL, &_58$$47, "__construct", NULL, 31, &_59$$47); + ZEPHIR_CALL_METHOD(NULL, &_58$$47, "__construct", NULL, 29, &_59$$47); zephir_check_call_status(); zephir_throw_exception_debug(&_58$$47, "phalcon/Mvc/Model/Query.zep", 1930); ZEPHIR_MM_RESTORE(); @@ -158269,12 +151408,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) break; } if (ZEPHIR_IS_LONG(&exprType, 350)) { - ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "getfunctioncall", NULL, 0, &expr); + ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "getfunctioncall", NULL, 455, &expr); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(&exprType, 409)) { - ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "getcaseexpression", NULL, 0, &expr); + ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "getcaseexpression", NULL, 456, &expr); zephir_check_call_status(); break; } @@ -158283,7 +151422,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) zephir_create_array(&_81$$69, 2, 0); add_assoc_stringl_ex(&_81$$69, SL("type"), SL("select")); ZVAL_BOOL(&_83$$69, 1); - ZEPHIR_CALL_METHOD(&_82$$69, this_ptr, "_prepareselect", NULL, 0, &expr, &_83$$69); + ZEPHIR_CALL_METHOD(&_82$$69, this_ptr, "_prepareselect", NULL, 445, &expr, &_83$$69); zephir_check_call_status(); zephir_array_update_string(&_81$$69, SL("value"), &_82$$69, PH_COPY | PH_SEPARATE); ZEPHIR_CPY_WRT(&exprReturn, &_81$$69); @@ -158293,7 +151432,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) object_init_ex(&_84$$70, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_85$$70); ZEPHIR_CONCAT_SV(&_85$$70, "Unknown expression type ", &exprType); - ZEPHIR_CALL_METHOD(NULL, &_84$$70, "__construct", NULL, 31, &_85$$70); + ZEPHIR_CALL_METHOD(NULL, &_84$$70, "__construct", NULL, 29, &_85$$70); zephir_check_call_status(); zephir_throw_exception_debug(&_84$$70, "phalcon/Mvc/Model/Query.zep", 2129); ZEPHIR_MM_RESTORE(); @@ -158303,7 +151442,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) RETURN_CCTOR(&exprReturn); } if (zephir_array_isset_string(&expr, SL("domain"))) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualified", NULL, 0, &expr); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualified", NULL, 454, &expr); zephir_check_call_status(); RETURN_MM(); } @@ -158316,7 +151455,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) { ZEPHIR_INIT_NVAR(&exprListItem); ZVAL_COPY(&exprListItem, _86$$72); - ZEPHIR_CALL_METHOD(&_88$$73, this_ptr, "getexpression", NULL, 0, &exprListItem); + ZEPHIR_CALL_METHOD(&_88$$73, this_ptr, "getexpression", NULL, 453, &exprListItem); zephir_check_call_status(); zephir_array_append(&listItems, &_88$$73, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2149); } ZEND_HASH_FOREACH_END(); @@ -158331,7 +151470,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) } ZEPHIR_CALL_METHOD(&exprListItem, &expr, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_89$$74, this_ptr, "getexpression", NULL, 0, &exprListItem); + ZEPHIR_CALL_METHOD(&_89$$74, this_ptr, "getexpression", NULL, 453, &exprListItem); zephir_check_call_status(); zephir_array_append(&listItems, &_89$$74, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2149); ZEPHIR_CALL_METHOD(NULL, &expr, "next", NULL, 0); @@ -158399,7 +151538,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) { ZEPHIR_INIT_NVAR(&argument); ZVAL_COPY(&argument, _0$$6); - ZEPHIR_CALL_METHOD(&_2$$7, this_ptr, "getcallargument", &_3, 0, &argument); + ZEPHIR_CALL_METHOD(&_2$$7, this_ptr, "getcallargument", &_3, 457, &argument); zephir_check_call_status(); zephir_array_append(&functionArgs, &_2$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2182); } ZEND_HASH_FOREACH_END(); @@ -158414,7 +151553,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) } ZEPHIR_CALL_METHOD(&argument, &arguments, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_4$$8, this_ptr, "getcallargument", &_3, 0, &argument); + ZEPHIR_CALL_METHOD(&_4$$8, this_ptr, "getcallargument", &_3, 457, &argument); zephir_check_call_status(); zephir_array_append(&functionArgs, &_4$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2182); ZEPHIR_CALL_METHOD(NULL, &arguments, "next", NULL, 0); @@ -158425,7 +151564,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) } else { ZEPHIR_INIT_VAR(&_5$$9); zephir_create_array(&_5$$9, 1, 0); - ZEPHIR_CALL_METHOD(&_6$$9, this_ptr, "getcallargument", &_3, 0, &arguments); + ZEPHIR_CALL_METHOD(&_6$$9, this_ptr, "getcallargument", &_3, 457, &arguments); zephir_check_call_status(); zephir_array_fast_append(&_5$$9, &_6$$9); ZEPHIR_CPY_WRT(&functionArgs, &_5$$9); @@ -158498,7 +151637,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getGroupClause) { ZEPHIR_INIT_NVAR(&groupItem); ZVAL_COPY(&groupItem, _0$$3); - ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "getexpression", &_3, 0, &groupItem); + ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "getexpression", &_3, 453, &groupItem); zephir_check_call_status(); zephir_array_append(&groupParts, &_2$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2228); } ZEND_HASH_FOREACH_END(); @@ -158513,7 +151652,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getGroupClause) } ZEPHIR_CALL_METHOD(&groupItem, &group, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_4$$5, this_ptr, "getexpression", &_3, 0, &groupItem); + ZEPHIR_CALL_METHOD(&_4$$5, this_ptr, "getexpression", &_3, 453, &groupItem); zephir_check_call_status(); zephir_array_append(&groupParts, &_4$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2228); ZEPHIR_CALL_METHOD(NULL, &group, "next", NULL, 0); @@ -158524,7 +151663,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getGroupClause) } else { ZEPHIR_INIT_VAR(&_5$$6); zephir_create_array(&_5$$6, 1, 0); - ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "getexpression", &_3, 0, &group); + ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "getexpression", &_3, 453, &group); zephir_check_call_status(); zephir_array_fast_append(&_5$$6, &_6$$6); ZEPHIR_CPY_WRT(&groupParts, &_5$$6); @@ -158563,13 +151702,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getLimitClause) array_init(&limit); ZEPHIR_OBS_VAR(&number); if (zephir_array_isset_string_fetch(&number, &limitClause, SL("number"), 0)) { - ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "getexpression", NULL, 0, &number); + ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "getexpression", NULL, 453, &number); zephir_check_call_status(); zephir_array_update_string(&limit, SL("number"), &_0$$3, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(&offset); if (zephir_array_isset_string_fetch(&offset, &limitClause, SL("offset"), 0)) { - ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "getexpression", NULL, 0, &offset); + ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "getexpression", NULL, 453, &offset); zephir_check_call_status(); zephir_array_update_string(&limit, SL("offset"), &_1$$4, PH_COPY | PH_SEPARATE); } @@ -158684,7 +151823,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoinType) zephir_read_property(&_1, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_2); ZEPHIR_CONCAT_SVSV(&_2, "Unknown join type ", &type, ", when preparing: ", &_1); - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 31, &_2); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 29, &_2); zephir_check_call_status(); zephir_throw_exception_debug(&_0, "phalcon/Mvc/Model/Query.zep", 2315); ZEPHIR_MM_RESTORE(); @@ -158879,7 +152018,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) { ZEPHIR_INIT_NVAR(&joinItem); ZVAL_COPY(&joinItem, _1); - ZEPHIR_CALL_METHOD(&joinData, this_ptr, "getjoin", &_3, 0, &manager, &joinItem); + ZEPHIR_CALL_METHOD(&joinData, this_ptr, "getjoin", &_3, 458, &manager, &joinItem); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&source); zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2373); @@ -158893,7 +152032,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&completeSource, 2, 0); zephir_array_fast_append(&completeSource, &source); zephir_array_fast_append(&completeSource, &schema); - ZEPHIR_CALL_METHOD(&joinType, this_ptr, "getjointype", &_4, 0, &joinItem); + ZEPHIR_CALL_METHOD(&joinType, this_ptr, "getjointype", &_4, 459, &joinItem); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&aliasExpr); if (zephir_array_isset_string_fetch(&aliasExpr, &joinItem, SL("alias"), 0)) { @@ -158905,7 +152044,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_read_property(&_6$$9, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_7$$9); ZEPHIR_CONCAT_SVSV(&_7$$9, "Cannot use '", &alias, "' as join alias because it was already used, when preparing: ", &_6$$9); - ZEPHIR_CALL_METHOD(NULL, &_5$$9, "__construct", &_8, 31, &_7$$9); + ZEPHIR_CALL_METHOD(NULL, &_5$$9, "__construct", &_8, 29, &_7$$9); zephir_check_call_status(); zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model/Query.zep", 2396); ZEPHIR_MM_RESTORE(); @@ -158928,7 +152067,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_read_property(&_10$$11, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_11$$11); ZEPHIR_CONCAT_SVSV(&_11$$11, "Cannot use '", &realModelName, "' as join alias because it was already used, when preparing: ", &_10$$11); - ZEPHIR_CALL_METHOD(NULL, &_9$$11, "__construct", &_8, 31, &_11$$11); + ZEPHIR_CALL_METHOD(NULL, &_9$$11, "__construct", &_8, 29, &_11$$11); zephir_check_call_status(); zephir_throw_exception_debug(&_9$$11, "phalcon/Mvc/Model/Query.zep", 2455); ZEPHIR_MM_RESTORE(); @@ -158957,7 +152096,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_CALL_METHOD(&joinItem, &selectJoins, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&joinData, this_ptr, "getjoin", &_3, 0, &manager, &joinItem); + ZEPHIR_CALL_METHOD(&joinData, this_ptr, "getjoin", &_3, 458, &manager, &joinItem); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&source); zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2373); @@ -158972,7 +152111,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_array_fast_append(&_12$$12, &source); zephir_array_fast_append(&_12$$12, &schema); ZEPHIR_CPY_WRT(&completeSource, &_12$$12); - ZEPHIR_CALL_METHOD(&joinType, this_ptr, "getjointype", &_4, 0, &joinItem); + ZEPHIR_CALL_METHOD(&joinType, this_ptr, "getjointype", &_4, 459, &joinItem); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&aliasExpr); if (zephir_array_isset_string_fetch(&aliasExpr, &joinItem, SL("alias"), 0)) { @@ -158984,7 +152123,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_read_property(&_14$$14, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_15$$14); ZEPHIR_CONCAT_SVSV(&_15$$14, "Cannot use '", &alias, "' as join alias because it was already used, when preparing: ", &_14$$14); - ZEPHIR_CALL_METHOD(NULL, &_13$$14, "__construct", &_8, 31, &_15$$14); + ZEPHIR_CALL_METHOD(NULL, &_13$$14, "__construct", &_8, 29, &_15$$14); zephir_check_call_status(); zephir_throw_exception_debug(&_13$$14, "phalcon/Mvc/Model/Query.zep", 2396); ZEPHIR_MM_RESTORE(); @@ -159007,7 +152146,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_read_property(&_17$$16, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_18$$16); ZEPHIR_CONCAT_SVSV(&_18$$16, "Cannot use '", &realModelName, "' as join alias because it was already used, when preparing: ", &_17$$16); - ZEPHIR_CALL_METHOD(NULL, &_16$$16, "__construct", &_8, 31, &_18$$16); + ZEPHIR_CALL_METHOD(NULL, &_16$$16, "__construct", &_8, 29, &_18$$16); zephir_check_call_status(); zephir_throw_exception_debug(&_16$$16, "phalcon/Mvc/Model/Query.zep", 2455); ZEPHIR_MM_RESTORE(); @@ -159049,7 +152188,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZVAL_COPY(&joinItem, _19); ZEPHIR_OBS_NVAR(&joinExpr); if (zephir_array_isset_string_fetch(&joinExpr, &joinItem, SL("conditions"), 0)) { - ZEPHIR_CALL_METHOD(&_23$$18, this_ptr, "getexpression", &_24, 0, &joinExpr); + ZEPHIR_CALL_METHOD(&_23$$18, this_ptr, "getexpression", &_24, 453, &joinExpr); zephir_check_call_status(); zephir_array_update_zval(&joinPreCondition, &joinAliasName, &_23$$18, PH_COPY | PH_SEPARATE); } @@ -159069,7 +152208,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_check_call_status(); ZEPHIR_OBS_NVAR(&joinExpr); if (zephir_array_isset_string_fetch(&joinExpr, &joinItem, SL("conditions"), 0)) { - ZEPHIR_CALL_METHOD(&_25$$20, this_ptr, "getexpression", &_24, 0, &joinExpr); + ZEPHIR_CALL_METHOD(&_25$$20, this_ptr, "getexpression", &_24, 453, &joinExpr); zephir_check_call_status(); zephir_array_update_zval(&joinPreCondition, &joinAliasName, &_25$$20, PH_COPY | PH_SEPARATE); } @@ -159224,7 +152363,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_read_property(&_53$$31, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_54$$31); ZEPHIR_CONCAT_SVSVSV(&_54$$31, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_53$$31); - ZEPHIR_CALL_METHOD(NULL, &_52$$31, "__construct", &_8, 31, &_54$$31); + ZEPHIR_CALL_METHOD(NULL, &_52$$31, "__construct", &_8, 29, &_54$$31); zephir_check_call_status(); zephir_throw_exception_debug(&_52$$31, "phalcon/Mvc/Model/Query.zep", 2602); ZEPHIR_MM_RESTORE(); @@ -159240,10 +152379,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&_55$$32, &relation, "isthrough", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(&_55$$32))) { - ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 0, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); + ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 460, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); zephir_check_call_status(); } else { - ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 0, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); + ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 461, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { @@ -159330,7 +152469,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_read_property(&_67$$45, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_68$$45); ZEPHIR_CONCAT_SVSVSV(&_68$$45, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_67$$45); - ZEPHIR_CALL_METHOD(NULL, &_66$$45, "__construct", &_8, 31, &_68$$45); + ZEPHIR_CALL_METHOD(NULL, &_66$$45, "__construct", &_8, 29, &_68$$45); zephir_check_call_status(); zephir_throw_exception_debug(&_66$$45, "phalcon/Mvc/Model/Query.zep", 2602); ZEPHIR_MM_RESTORE(); @@ -159346,10 +152485,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&_69$$46, &relation, "isthrough", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(&_69$$46))) { - ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 0, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); + ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 460, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); zephir_check_call_status(); } else { - ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 0, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); + ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 461, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { @@ -159454,7 +152593,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_read_property(&_83$$60, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_84$$60); ZEPHIR_CONCAT_SVSVSV(&_84$$60, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_83$$60); - ZEPHIR_CALL_METHOD(NULL, &_82$$60, "__construct", &_8, 31, &_84$$60); + ZEPHIR_CALL_METHOD(NULL, &_82$$60, "__construct", &_8, 29, &_84$$60); zephir_check_call_status(); zephir_throw_exception_debug(&_82$$60, "phalcon/Mvc/Model/Query.zep", 2602); ZEPHIR_MM_RESTORE(); @@ -159470,10 +152609,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&_85$$61, &relation, "isthrough", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(&_85$$61))) { - ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 0, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); + ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 460, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); zephir_check_call_status(); } else { - ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 0, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); + ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 461, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { @@ -159560,7 +152699,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_read_property(&_95$$74, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_96$$74); ZEPHIR_CONCAT_SVSVSV(&_96$$74, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_95$$74); - ZEPHIR_CALL_METHOD(NULL, &_94$$74, "__construct", &_8, 31, &_96$$74); + ZEPHIR_CALL_METHOD(NULL, &_94$$74, "__construct", &_8, 29, &_96$$74); zephir_check_call_status(); zephir_throw_exception_debug(&_94$$74, "phalcon/Mvc/Model/Query.zep", 2602); ZEPHIR_MM_RESTORE(); @@ -159576,10 +152715,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&_97$$75, &relation, "isthrough", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(&_97$$75))) { - ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 0, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); + ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 460, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); zephir_check_call_status(); } else { - ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 0, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); + ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 461, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { @@ -159773,7 +152912,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin) zephir_read_property(&_6$$5, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_7$$5); ZEPHIR_CONCAT_SVSVSV(&_7$$5, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_6$$5); - ZEPHIR_CALL_METHOD(NULL, &_5$$5, "__construct", &_8, 31, &_7$$5); + ZEPHIR_CALL_METHOD(NULL, &_5$$5, "__construct", &_8, 29, &_7$$5); zephir_check_call_status(); zephir_throw_exception_debug(&_5$$5, "phalcon/Mvc/Model/Query.zep", 2761); ZEPHIR_MM_RESTORE(); @@ -159790,7 +152929,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin) add_assoc_long_ex(&_10$$4, SL("type"), 355); zephir_array_update_string(&_10$$4, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_10$$4, SL("name"), &field, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "getqualified", &_11, 0, &_10$$4); + ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "getqualified", &_11, 454, &_10$$4); zephir_check_call_status(); zephir_array_update_string(&sqlEqualsJoinCondition, SL("left"), &_9$$4, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_12$$4); @@ -159798,7 +152937,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin) add_assoc_stringl_ex(&_12$$4, SL("type"), SL("qualified")); zephir_array_update_string(&_12$$4, SL("domain"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_12$$4, SL("name"), &referencedFields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "getqualified", &_11, 0, &_12$$4); + ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "getqualified", &_11, 454, &_12$$4); zephir_check_call_status(); zephir_array_update_string(&sqlEqualsJoinCondition, SL("right"), &_9$$4, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -159821,7 +152960,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin) zephir_read_property(&_14$$7, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_15$$7); ZEPHIR_CONCAT_SVSVSV(&_15$$7, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_14$$7); - ZEPHIR_CALL_METHOD(NULL, &_13$$7, "__construct", &_8, 31, &_15$$7); + ZEPHIR_CALL_METHOD(NULL, &_13$$7, "__construct", &_8, 29, &_15$$7); zephir_check_call_status(); zephir_throw_exception_debug(&_13$$7, "phalcon/Mvc/Model/Query.zep", 2761); ZEPHIR_MM_RESTORE(); @@ -159838,7 +152977,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin) add_assoc_long_ex(&_18$$6, SL("type"), 355); zephir_array_update_string(&_18$$6, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_18$$6, SL("name"), &field, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_17$$6, this_ptr, "getqualified", &_11, 0, &_18$$6); + ZEPHIR_CALL_METHOD(&_17$$6, this_ptr, "getqualified", &_11, 454, &_18$$6); zephir_check_call_status(); zephir_array_update_string(&_16$$6, SL("left"), &_17$$6, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_19$$6); @@ -159846,7 +152985,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin) add_assoc_stringl_ex(&_19$$6, SL("type"), SL("qualified")); zephir_array_update_string(&_19$$6, SL("domain"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_19$$6, SL("name"), &referencedFields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_17$$6, this_ptr, "getqualified", &_11, 0, &_19$$6); + ZEPHIR_CALL_METHOD(&_17$$6, this_ptr, "getqualified", &_11, 454, &_19$$6); zephir_check_call_status(); zephir_array_update_string(&_16$$6, SL("right"), &_17$$6, PH_COPY | PH_SEPARATE); ZEPHIR_CPY_WRT(&sqlEqualsJoinCondition, &_16$$6); @@ -159878,7 +153017,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin) add_assoc_long_ex(&_25$$8, SL("type"), 355); zephir_array_update_string(&_25$$8, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_25$$8, SL("name"), &fields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 0, &_25$$8); + ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 454, &_25$$8); zephir_check_call_status(); zephir_array_update_string(&_23$$8, SL("left"), &_24$$8, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_VAR(&_26$$8); @@ -159886,7 +153025,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin) add_assoc_stringl_ex(&_26$$8, SL("type"), SL("qualified")); zephir_array_update_string(&_26$$8, SL("domain"), &intermediateModelName, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_26$$8, SL("name"), &intermediateFields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 0, &_26$$8); + ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 454, &_26$$8); zephir_check_call_status(); zephir_array_update_string(&_23$$8, SL("right"), &_24$$8, PH_COPY | PH_SEPARATE); zephir_array_fast_append(&_22$$8, &_23$$8); @@ -159907,7 +153046,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin) add_assoc_long_ex(&_27$$8, SL("type"), 355); zephir_array_update_string(&_27$$8, SL("domain"), &intermediateModelName, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_27$$8, SL("name"), &intermediateReferencedFields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 0, &_27$$8); + ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 454, &_27$$8); zephir_check_call_status(); zephir_array_update_string(&_23$$8, SL("left"), &_24$$8, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_VAR(&_28$$8); @@ -159915,7 +153054,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin) add_assoc_stringl_ex(&_28$$8, SL("type"), SL("qualified")); zephir_array_update_string(&_28$$8, SL("domain"), &referencedModelName, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_28$$8, SL("name"), &referencedFields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 0, &_28$$8); + ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 454, &_28$$8); zephir_check_call_status(); zephir_array_update_string(&_23$$8, SL("right"), &_24$$8, PH_COPY | PH_SEPARATE); zephir_array_fast_append(&_22$$8, &_23$$8); @@ -159982,7 +153121,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause) ZEPHIR_INIT_NVAR(&orderItem); ZVAL_COPY(&orderItem, _0); zephir_array_fetch_string(&_2$$5, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2885); - ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 0, &_2$$5); + ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 453, &_2$$5); zephir_check_call_status(); if (zephir_array_isset_string_fetch(&orderSort, &orderItem, SL("sort"), 1)) { if (ZEPHIR_IS_LONG(&orderSort, 327)) { @@ -160021,7 +153160,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause) ZEPHIR_CALL_METHOD(&orderItem, &orderColumns, "current", NULL, 0); zephir_check_call_status(); zephir_array_fetch_string(&_8$$10, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2885); - ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 0, &_8$$10); + ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 453, &_8$$10); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&orderSort); if (zephir_array_isset_string_fetch(&orderSort, &orderItem, SL("sort"), 0)) { @@ -160172,7 +153311,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) zephir_read_property(&_9$$7, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_10$$7); ZEPHIR_CONCAT_SVSV(&_10$$7, "Unknown model or alias '", &columnDomain, "' (11), when preparing: ", &_9$$7); - ZEPHIR_CALL_METHOD(NULL, &_8$$7, "__construct", NULL, 31, &_10$$7); + ZEPHIR_CALL_METHOD(NULL, &_8$$7, "__construct", NULL, 29, &_10$$7); zephir_check_call_status(); zephir_throw_exception_debug(&_8$$7, "phalcon/Mvc/Model/Query.zep", 2951); ZEPHIR_MM_RESTORE(); @@ -160188,7 +153327,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) zephir_read_property(&_13$$9, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_14$$9); ZEPHIR_CONCAT_SVSV(&_14$$9, "There is no model related to model or alias '", &columnDomain, "', when executing: ", &_13$$9); - ZEPHIR_CALL_METHOD(NULL, &_12$$9, "__construct", NULL, 31, &_14$$9); + ZEPHIR_CALL_METHOD(NULL, &_12$$9, "__construct", NULL, 29, &_14$$9); zephir_check_call_status(); zephir_throw_exception_debug(&_12$$9, "phalcon/Mvc/Model/Query.zep", 2970); ZEPHIR_MM_RESTORE(); @@ -160208,7 +153347,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) zephir_read_property(&_16$$12, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_17$$12); ZEPHIR_CONCAT_SVSVSV(&_17$$12, "Column '", &columnName, "' doesn't belong to the model or alias '", &columnDomain, "', when executing: ", &_16$$12); - ZEPHIR_CALL_METHOD(NULL, &_15$$12, "__construct", NULL, 31, &_17$$12); + ZEPHIR_CALL_METHOD(NULL, &_15$$12, "__construct", NULL, 29, &_17$$12); zephir_check_call_status(); zephir_throw_exception_debug(&_15$$12, "phalcon/Mvc/Model/Query.zep", 2982); ZEPHIR_MM_RESTORE(); @@ -160238,7 +153377,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) zephir_read_property(&_24$$17, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_25$$17); ZEPHIR_CONCAT_SVSV(&_25$$17, "The column '", &columnName, "' is ambiguous, when preparing: ", &_24$$17); - ZEPHIR_CALL_METHOD(NULL, &_23$$17, "__construct", NULL, 31, &_25$$17); + ZEPHIR_CALL_METHOD(NULL, &_23$$17, "__construct", NULL, 29, &_25$$17); zephir_check_call_status(); zephir_throw_exception_debug(&_23$$17, "phalcon/Mvc/Model/Query.zep", 3005); ZEPHIR_MM_RESTORE(); @@ -160268,7 +153407,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) zephir_read_property(&_29$$20, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_30$$20); ZEPHIR_CONCAT_SVSV(&_30$$20, "The column '", &columnName, "' is ambiguous, when preparing: ", &_29$$20); - ZEPHIR_CALL_METHOD(NULL, &_28$$20, "__construct", NULL, 31, &_30$$20); + ZEPHIR_CALL_METHOD(NULL, &_28$$20, "__construct", NULL, 29, &_30$$20); zephir_check_call_status(); zephir_throw_exception_debug(&_28$$20, "phalcon/Mvc/Model/Query.zep", 3005); ZEPHIR_MM_RESTORE(); @@ -160287,7 +153426,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) zephir_read_property(&_32$$21, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_33$$21); ZEPHIR_CONCAT_SVSV(&_33$$21, "Column '", &columnName, "' doesn't belong to any of the selected models (1), when preparing: ", &_32$$21); - ZEPHIR_CALL_METHOD(NULL, &_31$$21, "__construct", NULL, 31, &_33$$21); + ZEPHIR_CALL_METHOD(NULL, &_31$$21, "__construct", NULL, 29, &_33$$21); zephir_check_call_status(); zephir_throw_exception_debug(&_31$$21, "phalcon/Mvc/Model/Query.zep", 3019); ZEPHIR_MM_RESTORE(); @@ -160308,7 +153447,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) zephir_read_property(&_36$$23, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_37$$23); ZEPHIR_CONCAT_SVSV(&_37$$23, "Can't obtain model's source from models list: '", &className, "', when preparing: ", &_36$$23); - ZEPHIR_CALL_METHOD(NULL, &_35$$23, "__construct", NULL, 31, &_37$$23); + ZEPHIR_CALL_METHOD(NULL, &_35$$23, "__construct", NULL, 29, &_37$$23); zephir_check_call_status(); zephir_throw_exception_debug(&_35$$23, "phalcon/Mvc/Model/Query.zep", 3041); ZEPHIR_MM_RESTORE(); @@ -160329,7 +153468,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) zephir_read_property(&_39$$27, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_40$$27); ZEPHIR_CONCAT_SVSV(&_40$$27, "Column '", &columnName, "' doesn't belong to any of the selected models (3), when preparing: ", &_39$$27); - ZEPHIR_CALL_METHOD(NULL, &_38$$27, "__construct", NULL, 31, &_40$$27); + ZEPHIR_CALL_METHOD(NULL, &_38$$27, "__construct", NULL, 29, &_40$$27); zephir_check_call_status(); zephir_throw_exception_debug(&_38$$27, "phalcon/Mvc/Model/Query.zep", 3060); ZEPHIR_MM_RESTORE(); @@ -160495,17 +153634,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getRelatedRecords) } ZEPHIR_INIT_VAR(&query); object_init_ex(&query, phalcon_mvc_model_query_ce); - ZEPHIR_CALL_METHOD(NULL, &query, "__construct", NULL, 0); + ZEPHIR_CALL_METHOD(NULL, &query, "__construct", NULL, 462); zephir_check_call_status(); zephir_read_property(&_5, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, &query, "setdi", NULL, 0, &_5); + ZEPHIR_CALL_METHOD(NULL, &query, "setdi", NULL, 463, &_5); zephir_check_call_status(); ZVAL_LONG(&_6, 309); - ZEPHIR_CALL_METHOD(NULL, &query, "settype", NULL, 0, &_6); + ZEPHIR_CALL_METHOD(NULL, &query, "settype", NULL, 464, &_6); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &query, "setintermediate", NULL, 0, &selectIr); + ZEPHIR_CALL_METHOD(NULL, &query, "setintermediate", NULL, 465, &selectIr); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(&query, "execute", NULL, 0, &bindParams, &bindTypes); + ZEPHIR_RETURN_CALL_METHOD(&query, "execute", NULL, 466, &bindParams, &bindTypes); zephir_check_call_status(); RETURN_MM(); } @@ -160594,7 +153733,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) add_assoc_stringl_ex(&sqlColumn, SL("type"), SL("object")); zephir_array_update_string(&sqlColumn, SL("model"), &modelName, PH_COPY | PH_SEPARATE); zephir_array_update_string(&sqlColumn, SL("column"), &source, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_FUNCTION(&_5$$5, "lcfirst", &_6, 104, &modelName); + ZEPHIR_CALL_FUNCTION(&_5$$5, "lcfirst", &_6, 73, &modelName); zephir_check_call_status(); zephir_array_update_string(&sqlColumn, SL("balias"), &_5$$5, PH_COPY | PH_SEPARATE); if (Z_TYPE_P(&eager) != IS_NULL) { @@ -160622,7 +153761,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) add_assoc_stringl_ex(&_8$$7, SL("type"), SL("object")); zephir_array_update_string(&_8$$7, SL("model"), &modelName, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_8$$7, SL("column"), &source, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_FUNCTION(&_9$$7, "lcfirst", &_6, 104, &modelName); + ZEPHIR_CALL_FUNCTION(&_9$$7, "lcfirst", &_6, 73, &modelName); zephir_check_call_status(); zephir_array_update_string(&_8$$7, SL("balias"), &_9$$7, PH_COPY | PH_SEPARATE); ZEPHIR_CPY_WRT(&sqlColumn, &_8$$7); @@ -160656,7 +153795,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) zephir_read_property(&_13$$11, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_14$$11); ZEPHIR_CONCAT_SVSV(&_14$$11, "Unknown model or alias '", &columnDomain, "' (2), when preparing: ", &_13$$11); - ZEPHIR_CALL_METHOD(NULL, &_12$$11, "__construct", NULL, 31, &_14$$11); + ZEPHIR_CALL_METHOD(NULL, &_12$$11, "__construct", NULL, 29, &_14$$11); zephir_check_call_status(); zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 3227); ZEPHIR_MM_RESTORE(); @@ -160671,7 +153810,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) zephir_array_fetch(&modelName, &sqlAliasesModels, &columnDomain, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3241); if (Z_TYPE_P(&preparedAlias) != IS_STRING) { if (ZEPHIR_IS_EQUAL(&columnDomain, &modelName)) { - ZEPHIR_CALL_FUNCTION(&preparedAlias, "lcfirst", &_6, 104, &modelName); + ZEPHIR_CALL_FUNCTION(&preparedAlias, "lcfirst", &_6, 73, &modelName); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&preparedAlias, &columnDomain); @@ -160699,7 +153838,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) ZEPHIR_CPY_WRT(&sqlColumn, &_17$$16); ZEPHIR_OBS_VAR(&columnData); zephir_array_fetch_string(&columnData, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3285); - ZEPHIR_CALL_METHOD(&sqlExprColumn, this_ptr, "getexpression", NULL, 0, &columnData); + ZEPHIR_CALL_METHOD(&sqlExprColumn, this_ptr, "getexpression", NULL, 453, &columnData); zephir_check_call_status(); ZEPHIR_OBS_VAR(&balias); if (zephir_array_isset_string_fetch(&balias, &sqlExprColumn, SL("balias"), 0)) { @@ -160719,7 +153858,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) object_init_ex(&_19, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_20); ZEPHIR_CONCAT_SV(&_20, "Unknown type of column ", &columnType); - ZEPHIR_CALL_METHOD(NULL, &_19, "__construct", NULL, 31, &_20); + ZEPHIR_CALL_METHOD(NULL, &_19, "__construct", NULL, 29, &_20); zephir_check_call_status(); zephir_throw_exception_debug(&_19, "phalcon/Mvc/Model/Query.zep", 3307); ZEPHIR_MM_RESTORE(); @@ -160815,7 +153954,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) add_assoc_long_ex(&_3$$3, SL("type"), 355); zephir_array_update_string(&_3$$3, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_3$$3, SL("name"), &fields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getqualified", NULL, 0, &_3$$3); + ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getqualified", NULL, 454, &_3$$3); zephir_check_call_status(); zephir_array_update_string(&_1$$3, SL("left"), &_2$$3, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_VAR(&_4$$3); @@ -160823,7 +153962,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) add_assoc_stringl_ex(&_4$$3, SL("type"), SL("qualified")); zephir_array_update_string(&_4$$3, SL("domain"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_4$$3, SL("name"), &referencedFields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getqualified", NULL, 0, &_4$$3); + ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getqualified", NULL, 454, &_4$$3); zephir_check_call_status(); zephir_array_update_string(&_1$$3, SL("right"), &_2$$3, PH_COPY | PH_SEPARATE); zephir_array_fast_append(&_0$$3, &_1$$3); @@ -160850,7 +153989,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) zephir_read_property(&_10$$6, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_11$$6); ZEPHIR_CONCAT_SVSVSV(&_11$$6, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_10$$6); - ZEPHIR_CALL_METHOD(NULL, &_9$$6, "__construct", &_12, 31, &_11$$6); + ZEPHIR_CALL_METHOD(NULL, &_9$$6, "__construct", &_12, 29, &_11$$6); zephir_check_call_status(); zephir_throw_exception_debug(&_9$$6, "phalcon/Mvc/Model/Query.zep", 3369); ZEPHIR_MM_RESTORE(); @@ -160865,7 +154004,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) add_assoc_long_ex(&_15$$5, SL("type"), 355); zephir_array_update_string(&_15$$5, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_15$$5, SL("name"), &field, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_14$$5, this_ptr, "getqualified", NULL, 0, &_15$$5); + ZEPHIR_CALL_METHOD(&_14$$5, this_ptr, "getqualified", NULL, 454, &_15$$5); zephir_check_call_status(); zephir_array_update_string(&_13$$5, SL("left"), &_14$$5, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_16$$5); @@ -160873,7 +154012,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) add_assoc_stringl_ex(&_16$$5, SL("type"), SL("qualified")); zephir_array_update_string(&_16$$5, SL("domain"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_16$$5, SL("name"), &referencedField, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_14$$5, this_ptr, "getqualified", NULL, 0, &_16$$5); + ZEPHIR_CALL_METHOD(&_14$$5, this_ptr, "getqualified", NULL, 454, &_16$$5); zephir_check_call_status(); zephir_array_update_string(&_13$$5, SL("right"), &_14$$5, PH_COPY | PH_SEPARATE); zephir_array_append(&sqlJoinPartialConditions, &_13$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3394); @@ -160898,7 +154037,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) zephir_read_property(&_18$$8, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_19$$8); ZEPHIR_CONCAT_SVSVSV(&_19$$8, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_18$$8); - ZEPHIR_CALL_METHOD(NULL, &_17$$8, "__construct", &_12, 31, &_19$$8); + ZEPHIR_CALL_METHOD(NULL, &_17$$8, "__construct", &_12, 29, &_19$$8); zephir_check_call_status(); zephir_throw_exception_debug(&_17$$8, "phalcon/Mvc/Model/Query.zep", 3369); ZEPHIR_MM_RESTORE(); @@ -160913,7 +154052,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) add_assoc_long_ex(&_22$$7, SL("type"), 355); zephir_array_update_string(&_22$$7, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_22$$7, SL("name"), &field, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_21$$7, this_ptr, "getqualified", NULL, 0, &_22$$7); + ZEPHIR_CALL_METHOD(&_21$$7, this_ptr, "getqualified", NULL, 454, &_22$$7); zephir_check_call_status(); zephir_array_update_string(&_20$$7, SL("left"), &_21$$7, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_23$$7); @@ -160921,7 +154060,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) add_assoc_stringl_ex(&_23$$7, SL("type"), SL("qualified")); zephir_array_update_string(&_23$$7, SL("domain"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_23$$7, SL("name"), &referencedField, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_21$$7, this_ptr, "getqualified", NULL, 0, &_23$$7); + ZEPHIR_CALL_METHOD(&_21$$7, this_ptr, "getqualified", NULL, 454, &_23$$7); zephir_check_call_status(); zephir_array_update_string(&_20$$7, SL("right"), &_21$$7, PH_COPY | PH_SEPARATE); zephir_array_append(&sqlJoinPartialConditions, &_20$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3394); @@ -161251,13 +154390,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) ZEPHIR_OBS_VAR(&where); if (zephir_array_isset_string_fetch(&where, &ast, SL("where"), 0)) { ZVAL_BOOL(&_10$$17, 1); - ZEPHIR_CALL_METHOD(&_9$$17, this_ptr, "getexpression", NULL, 0, &where, &_10$$17); + ZEPHIR_CALL_METHOD(&_9$$17, this_ptr, "getexpression", NULL, 453, &where, &_10$$17); zephir_check_call_status(); zephir_array_update_string(&sqlDelete, SL("where"), &_9$$17, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(&limit); if (zephir_array_isset_string_fetch(&limit, &ast, SL("limit"), 0)) { - ZEPHIR_CALL_METHOD(&_11$$18, this_ptr, "getlimitclause", NULL, 0, &limit); + ZEPHIR_CALL_METHOD(&_11$$18, this_ptr, "getlimitclause", NULL, 467, &limit); zephir_check_call_status(); zephir_array_update_string(&sqlDelete, SL("limit"), &_11$$18, PH_COPY | PH_SEPARATE); } @@ -161367,7 +154506,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) } else { ZVAL_BOOL(&_8$$7, 0); } - ZEPHIR_CALL_METHOD(&_7$$7, this_ptr, "getexpression", &_9, 0, &exprValue, &_8$$7); + ZEPHIR_CALL_METHOD(&_7$$7, this_ptr, "getexpression", &_9, 453, &exprValue, &_8$$7); zephir_check_call_status(); zephir_array_update_string(&_5$$7, SL("value"), &_7$$7, PH_COPY | PH_SEPARATE); zephir_array_append(&exprValues, &_5$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3610); @@ -161393,7 +154532,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) } else { ZVAL_BOOL(&_13$$8, 0); } - ZEPHIR_CALL_METHOD(&_12$$8, this_ptr, "getexpression", &_9, 0, &exprValue, &_13$$8); + ZEPHIR_CALL_METHOD(&_12$$8, this_ptr, "getexpression", &_9, 453, &exprValue, &_13$$8); zephir_check_call_status(); zephir_array_update_string(&_10$$8, SL("value"), &_12$$8, PH_COPY | PH_SEPARATE); zephir_array_append(&exprValues, &_10$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3610); @@ -161428,7 +154567,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) zephir_read_property(&_19$$11, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_20$$11); ZEPHIR_CONCAT_SVSVSV(&_20$$11, "The model '", &modelName, "' doesn't have the attribute '", &name, "', when preparing: ", &_19$$11); - ZEPHIR_CALL_METHOD(NULL, &_18$$11, "__construct", &_21, 31, &_20$$11); + ZEPHIR_CALL_METHOD(NULL, &_18$$11, "__construct", &_21, 29, &_20$$11); zephir_check_call_status(); zephir_throw_exception_debug(&_18$$11, "phalcon/Mvc/Model/Query.zep", 3630); ZEPHIR_MM_RESTORE(); @@ -161457,7 +154596,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) zephir_read_property(&_25$$13, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_26$$13); ZEPHIR_CONCAT_SVSVSV(&_26$$13, "The model '", &modelName, "' doesn't have the attribute '", &name, "', when preparing: ", &_25$$13); - ZEPHIR_CALL_METHOD(NULL, &_24$$13, "__construct", &_21, 31, &_26$$13); + ZEPHIR_CALL_METHOD(NULL, &_24$$13, "__construct", &_21, 29, &_26$$13); zephir_check_call_status(); zephir_throw_exception_debug(&_24$$13, "phalcon/Mvc/Model/Query.zep", 3630); ZEPHIR_MM_RESTORE(); @@ -161754,7 +154893,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_read_property(&_6$$17, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_7$$17); ZEPHIR_CONCAT_SVSV(&_7$$17, "Alias '", &alias, "' is used more than once, when preparing: ", &_6$$17); - ZEPHIR_CALL_METHOD(NULL, &_5$$17, "__construct", &_8, 31, &_7$$17); + ZEPHIR_CALL_METHOD(NULL, &_5$$17, "__construct", &_8, 29, &_7$$17); zephir_check_call_status(); zephir_throw_exception_debug(&_5$$17, "phalcon/Mvc/Model/Query.zep", 3784); ZEPHIR_MM_RESTORE(); @@ -161825,7 +154964,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_read_property(&_18$$27, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_19$$27); ZEPHIR_CONCAT_SVSVSV(&_19$$27, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_18$$27); - ZEPHIR_CALL_METHOD(NULL, &_17$$27, "__construct", &_8, 31, &_19$$27); + ZEPHIR_CALL_METHOD(NULL, &_17$$27, "__construct", &_8, 29, &_19$$27); zephir_check_call_status(); zephir_throw_exception_debug(&_17$$27, "phalcon/Mvc/Model/Query.zep", 3842); ZEPHIR_MM_RESTORE(); @@ -161902,7 +155041,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_read_property(&_30$$31, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_31$$31); ZEPHIR_CONCAT_SVSVSV(&_31$$31, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_30$$31); - ZEPHIR_CALL_METHOD(NULL, &_29$$31, "__construct", &_8, 31, &_31$$31); + ZEPHIR_CALL_METHOD(NULL, &_29$$31, "__construct", &_8, 29, &_31$$31); zephir_check_call_status(); zephir_throw_exception_debug(&_29$$31, "phalcon/Mvc/Model/Query.zep", 3842); ZEPHIR_MM_RESTORE(); @@ -161988,7 +155127,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_read_property(&_39$$36, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_40$$36); ZEPHIR_CONCAT_SVSV(&_40$$36, "Alias '", &alias, "' is used more than once, when preparing: ", &_39$$36); - ZEPHIR_CALL_METHOD(NULL, &_38$$36, "__construct", &_8, 31, &_40$$36); + ZEPHIR_CALL_METHOD(NULL, &_38$$36, "__construct", &_8, 29, &_40$$36); zephir_check_call_status(); zephir_throw_exception_debug(&_38$$36, "phalcon/Mvc/Model/Query.zep", 3784); ZEPHIR_MM_RESTORE(); @@ -162060,7 +155199,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_read_property(&_51$$46, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_52$$46); ZEPHIR_CONCAT_SVSVSV(&_52$$46, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_51$$46); - ZEPHIR_CALL_METHOD(NULL, &_50$$46, "__construct", &_8, 31, &_52$$46); + ZEPHIR_CALL_METHOD(NULL, &_50$$46, "__construct", &_8, 29, &_52$$46); zephir_check_call_status(); zephir_throw_exception_debug(&_50$$46, "phalcon/Mvc/Model/Query.zep", 3842); ZEPHIR_MM_RESTORE(); @@ -162137,7 +155276,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_read_property(&_63$$50, this_ptr, ZEND_STRL("phql"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_64$$50); ZEPHIR_CONCAT_SVSVSV(&_64$$50, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_63$$50); - ZEPHIR_CALL_METHOD(NULL, &_62$$50, "__construct", &_8, 31, &_64$$50); + ZEPHIR_CALL_METHOD(NULL, &_62$$50, "__construct", &_8, 29, &_64$$50); zephir_check_call_status(); zephir_throw_exception_debug(&_62$$50, "phalcon/Mvc/Model/Query.zep", 3842); ZEPHIR_MM_RESTORE(); @@ -162247,12 +155386,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_string(&select, SL("joins"), &automaticJoins, PH_COPY | PH_SEPARATE); } } - ZEPHIR_CALL_METHOD(&sqlJoins, this_ptr, "getjoins", NULL, 0, &select); + ZEPHIR_CALL_METHOD(&sqlJoins, this_ptr, "getjoins", NULL, 468, &select); zephir_check_call_status(); } else { if (zephir_fast_count_int(&automaticJoins)) { zephir_array_update_string(&select, SL("joins"), &automaticJoins, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&sqlJoins, this_ptr, "getjoins", NULL, 0, &select); + ZEPHIR_CALL_METHOD(&sqlJoins, this_ptr, "getjoins", NULL, 468, &select); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&sqlJoins); @@ -162268,7 +155407,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) { ZEPHIR_INIT_NVAR(&column); ZVAL_COPY(&column, _82); - ZEPHIR_CALL_METHOD(&_84$$60, this_ptr, "getselectcolumn", &_85, 0, &column); + ZEPHIR_CALL_METHOD(&_84$$60, this_ptr, "getselectcolumn", &_85, 469, &column); zephir_check_call_status(); zephir_is_iterable(&_84$$60, 0, "phalcon/Mvc/Model/Query.zep", 3960); if (Z_TYPE_P(&_84$$60) == IS_ARRAY) { @@ -162353,7 +155492,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) } ZEPHIR_CALL_METHOD(&column, &selectColumns, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_94$$75, this_ptr, "getselectcolumn", &_85, 0, &column); + ZEPHIR_CALL_METHOD(&_94$$75, this_ptr, "getselectcolumn", &_85, 469, &column); zephir_check_call_status(); zephir_is_iterable(&_94$$75, 0, "phalcon/Mvc/Model/Query.zep", 3960); if (Z_TYPE_P(&_94$$75) == IS_ARRAY) { @@ -162448,31 +155587,31 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) } ZEPHIR_OBS_VAR(&where); if (zephir_array_isset_string_fetch(&where, ast, SL("where"), 0)) { - ZEPHIR_CALL_METHOD(&_104$$92, this_ptr, "getexpression", NULL, 0, &where); + ZEPHIR_CALL_METHOD(&_104$$92, this_ptr, "getexpression", NULL, 453, &where); zephir_check_call_status(); zephir_array_update_string(&sqlSelect, SL("where"), &_104$$92, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(&groupBy); if (zephir_array_isset_string_fetch(&groupBy, ast, SL("groupBy"), 0)) { - ZEPHIR_CALL_METHOD(&_105$$93, this_ptr, "getgroupclause", NULL, 0, &groupBy); + ZEPHIR_CALL_METHOD(&_105$$93, this_ptr, "getgroupclause", NULL, 470, &groupBy); zephir_check_call_status(); zephir_array_update_string(&sqlSelect, SL("group"), &_105$$93, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(&having); if (zephir_array_isset_string_fetch(&having, ast, SL("having"), 0)) { - ZEPHIR_CALL_METHOD(&_106$$94, this_ptr, "getexpression", NULL, 0, &having); + ZEPHIR_CALL_METHOD(&_106$$94, this_ptr, "getexpression", NULL, 453, &having); zephir_check_call_status(); zephir_array_update_string(&sqlSelect, SL("having"), &_106$$94, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(&order); if (zephir_array_isset_string_fetch(&order, ast, SL("orderBy"), 0)) { - ZEPHIR_CALL_METHOD(&_107$$95, this_ptr, "getorderclause", NULL, 0, &order); + ZEPHIR_CALL_METHOD(&_107$$95, this_ptr, "getorderclause", NULL, 471, &order); zephir_check_call_status(); zephir_array_update_string(&sqlSelect, SL("order"), &_107$$95, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(&limit); if (zephir_array_isset_string_fetch(&limit, ast, SL("limit"), 0)) { - ZEPHIR_CALL_METHOD(&_108$$96, this_ptr, "getlimitclause", NULL, 0, &limit); + ZEPHIR_CALL_METHOD(&_108$$96, this_ptr, "getlimitclause", NULL, 467, &limit); zephir_check_call_status(); zephir_array_update_string(&sqlSelect, SL("limit"), &_108$$96, PH_COPY | PH_SEPARATE); } @@ -162724,7 +155863,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } else { ZVAL_BOOL(&_13$$20, 0); } - ZEPHIR_CALL_METHOD(&_11$$20, this_ptr, "getexpression", &_14, 0, &_12$$20, &_13$$20); + ZEPHIR_CALL_METHOD(&_11$$20, this_ptr, "getexpression", &_14, 453, &_12$$20, &_13$$20); zephir_check_call_status(); zephir_array_append(&sqlFields, &_11$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4129); ZEPHIR_OBS_NVAR(&exprColumn); @@ -162739,7 +155878,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } else { ZVAL_BOOL(&_18$$20, 0); } - ZEPHIR_CALL_METHOD(&_17$$20, this_ptr, "getexpression", &_14, 0, &exprColumn, &_18$$20); + ZEPHIR_CALL_METHOD(&_17$$20, this_ptr, "getexpression", &_14, 453, &exprColumn, &_18$$20); zephir_check_call_status(); zephir_array_update_string(&_15$$20, SL("value"), &_17$$20, PH_COPY | PH_SEPARATE); zephir_array_append(&sqlValues, &_15$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4134); @@ -162761,7 +155900,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } else { ZVAL_BOOL(&_21$$21, 0); } - ZEPHIR_CALL_METHOD(&_19$$21, this_ptr, "getexpression", &_14, 0, &_20$$21, &_21$$21); + ZEPHIR_CALL_METHOD(&_19$$21, this_ptr, "getexpression", &_14, 453, &_20$$21, &_21$$21); zephir_check_call_status(); zephir_array_append(&sqlFields, &_19$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4129); ZEPHIR_OBS_NVAR(&exprColumn); @@ -162776,7 +155915,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } else { ZVAL_BOOL(&_25$$21, 0); } - ZEPHIR_CALL_METHOD(&_24$$21, this_ptr, "getexpression", &_14, 0, &exprColumn, &_25$$21); + ZEPHIR_CALL_METHOD(&_24$$21, this_ptr, "getexpression", &_14, 453, &exprColumn, &_25$$21); zephir_check_call_status(); zephir_array_update_string(&_22$$21, SL("value"), &_24$$21, PH_COPY | PH_SEPARATE); zephir_array_append(&sqlValues, &_22$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4134); @@ -162794,13 +155933,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_OBS_VAR(&where); if (zephir_array_isset_string_fetch(&where, &ast, SL("where"), 0)) { ZVAL_BOOL(&_27$$22, 1); - ZEPHIR_CALL_METHOD(&_26$$22, this_ptr, "getexpression", &_14, 0, &where, &_27$$22); + ZEPHIR_CALL_METHOD(&_26$$22, this_ptr, "getexpression", &_14, 453, &where, &_27$$22); zephir_check_call_status(); zephir_array_update_string(&sqlUpdate, SL("where"), &_26$$22, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(&limit); if (zephir_array_isset_string_fetch(&limit, &ast, SL("limit"), 0)) { - ZEPHIR_CALL_METHOD(&_28$$23, this_ptr, "getlimitclause", NULL, 0, &limit); + ZEPHIR_CALL_METHOD(&_28$$23, this_ptr, "getlimitclause", NULL, 467, &limit); zephir_check_call_status(); zephir_array_update_string(&sqlUpdate, SL("limit"), &_28$$23, PH_COPY | PH_SEPARATE); } @@ -163462,13 +156601,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset, __construct) if (Z_TYPE_P(cache) != IS_NULL) { ZEPHIR_INIT_VAR(&_2$$4); ZVAL_STRING(&_2$$4, "Phalcon\\Cache\\CacheInterface"); - ZEPHIR_CALL_FUNCTION(&_3$$4, "is_a", NULL, 114, cache, &_2$$4); + ZEPHIR_CALL_FUNCTION(&_3$$4, "is_a", NULL, 83, cache, &_2$$4); zephir_check_call_status(); _4$$4 = !ZEPHIR_IS_TRUE_IDENTICAL(&_3$$4); if (_4$$4) { ZEPHIR_INIT_NVAR(&_2$$4); ZVAL_STRING(&_2$$4, "Psr\\SimpleCache\\CacheInterface"); - ZEPHIR_CALL_FUNCTION(&_5$$4, "is_a", NULL, 114, cache, &_2$$4); + ZEPHIR_CALL_FUNCTION(&_5$$4, "is_a", NULL, 83, cache, &_2$$4); zephir_check_call_status(); _4$$4 = !ZEPHIR_IS_TRUE_IDENTICAL(&_5$$4); } @@ -163477,9 +156616,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset, __construct) object_init_ex(&_6$$5, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_7$$5); ZEPHIR_CONCAT_SS(&_7$$5, "Cache service must be an object implementing ", "Phalcon\\Cache\\CacheInterface or Psr\\SimpleCache\\CacheInterface"); - ZEPHIR_CALL_METHOD(NULL, &_6$$5, "__construct", NULL, 31, &_7$$5); + ZEPHIR_CALL_METHOD(NULL, &_6$$5, "__construct", NULL, 29, &_7$$5); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$5, "phalcon/Mvc/Model/Resultset.zep", 164); + zephir_throw_exception_debug(&_6$$5, "phalcon/Mvc/Model/Resultset.zep", 165); ZEPHIR_MM_RESTORE(); return; } @@ -163568,7 +156707,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset, delete) ZVAL_NULL(&connection); result = 1; transaction = 0; - ZEPHIR_CALL_METHOD(NULL, this_ptr, "rewind", NULL, 120); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "rewind", NULL, 87); zephir_check_call_status(); while (1) { ZEPHIR_CALL_METHOD(&_0, this_ptr, "valid", &_1, 0); @@ -163580,7 +156719,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset, delete) zephir_check_call_status(); if (transaction == 0) { if (UNEXPECTED(!((zephir_method_exists_ex(&record, ZEND_STRL("getwriteconnection")) == SUCCESS)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The returned record is not valid", "phalcon/Mvc/Model/Resultset.zep", 238); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The returned record is not valid", "phalcon/Mvc/Model/Resultset.zep", 239); return; } ZEPHIR_CALL_METHOD(&connection, &record, "getwriteconnection", NULL, 0); @@ -163654,7 +156793,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset, filter) ZEPHIR_INIT_VAR(&records); array_init(&records); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "rewind", NULL, 120); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "rewind", NULL, 87); zephir_check_call_status(); while (1) { ZEPHIR_CALL_METHOD(&_0, this_ptr, "valid", &_1, 0); @@ -163679,7 +156818,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset, filter) zephir_check_call_status(); continue; } - zephir_array_append(&records, &processedRecord, PH_SEPARATE, "phalcon/Mvc/Model/Resultset.zep", 332); + zephir_array_append(&records, &processedRecord, PH_SEPARATE, "phalcon/Mvc/Model/Resultset.zep", 333); ZEPHIR_CALL_METHOD(NULL, this_ptr, "next", &_5, 0); zephir_check_call_status(); } @@ -163713,7 +156852,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset, getFirst) RETURN_MM_NULL(); } ZVAL_LONG(&_1, 0); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "seek", NULL, 121, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "seek", NULL, 88, &_1); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "current", NULL, 0); zephir_check_call_status(); @@ -163748,7 +156887,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset, getLast) RETURN_MM_NULL(); } ZVAL_LONG(&_0, (zephir_get_numberval(&count) - 1)); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "seek", NULL, 121, &_0); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "seek", NULL, 88, &_0); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "current", NULL, 0); zephir_check_call_status(); @@ -163816,7 +156955,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset, jsonSerialize) ZEPHIR_INIT_VAR(&records); array_init(&records); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "rewind", NULL, 120); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "rewind", NULL, 87); zephir_check_call_status(); while (1) { ZEPHIR_CALL_METHOD(&_0, this_ptr, "valid", &_1, 0); @@ -163833,9 +156972,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset, jsonSerialize) if (_3$$3) { ZEPHIR_CALL_METHOD(&_4$$4, ¤t, "jsonserialize", NULL, 0); zephir_check_call_status(); - zephir_array_append(&records, &_4$$4, PH_SEPARATE, "phalcon/Mvc/Model/Resultset.zep", 457); + zephir_array_append(&records, &_4$$4, PH_SEPARATE, "phalcon/Mvc/Model/Resultset.zep", 458); } else { - zephir_array_append(&records, ¤t, PH_SEPARATE, "phalcon/Mvc/Model/Resultset.zep", 459); + zephir_array_append(&records, ¤t, PH_SEPARATE, "phalcon/Mvc/Model/Resultset.zep", 460); } ZEPHIR_CALL_METHOD(NULL, this_ptr, "next", &_5, 0); zephir_check_call_status(); @@ -163878,7 +157017,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset, next) zephir_read_property(&_0, this_ptr, ZEND_STRL("pointer"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_1, (zephir_get_numberval(&_0) + 1)); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "seek", NULL, 121, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "seek", NULL, 88, &_1); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -163887,7 +157026,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset, offsetGet) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *index, index_sub, _0; + zval index_sub, _0; + zval *index; zval *this_ptr = getThis(); ZVAL_UNDEF(&index_sub); @@ -163906,10 +157046,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset, offsetGet) zephir_read_property(&_0, this_ptr, ZEND_STRL("count"), PH_NOISY_CC | PH_READONLY); if (UNEXPECTED(ZEPHIR_GE(index, &_0))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The index does not exist in the cursor", "phalcon/Mvc/Model/Resultset.zep", 497); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The index does not exist in the cursor", "phalcon/Mvc/Model/Resultset.zep", 498); return; } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "seek", NULL, 121, index); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "seek", NULL, 88, index); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "current", NULL, 0); zephir_check_call_status(); @@ -163957,7 +157097,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset, offsetSet) zephir_fetch_params_without_memory_grow(2, 0, &index, &value); - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Cursor is an immutable ArrayAccess object", "phalcon/Mvc/Model/Resultset.zep", 524); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Cursor is an immutable ArrayAccess object", "phalcon/Mvc/Model/Resultset.zep", 525); return; } @@ -163978,7 +157118,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset, offsetUnset) zephir_fetch_params_without_memory_grow(1, 0, &offset); - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Cursor is an immutable ArrayAccess object", "phalcon/Mvc/Model/Resultset.zep", 532); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Cursor is an immutable ArrayAccess object", "phalcon/Mvc/Model/Resultset.zep", 533); return; } @@ -163995,7 +157135,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset, rewind) ZEPHIR_MM_GROW(); ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "seek", NULL, 121, &_0); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "seek", NULL, 88, &_0); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -164187,7 +157327,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset, update) ZEPHIR_INIT_VAR(&connection); ZVAL_NULL(&connection); transaction = 0; - ZEPHIR_CALL_METHOD(NULL, this_ptr, "rewind", NULL, 120); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "rewind", NULL, 87); zephir_check_call_status(); while (1) { ZEPHIR_CALL_METHOD(&_0, this_ptr, "valid", &_1, 0); @@ -164199,7 +157339,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset, update) zephir_check_call_status(); if (transaction == 0) { if (UNEXPECTED(!((zephir_method_exists_ex(&record, ZEND_STRL("getwriteconnection")) == SUCCESS)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The returned record is not valid", "phalcon/Mvc/Model/Resultset.zep", 649); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The returned record is not valid", "phalcon/Mvc/Model/Resultset.zep", 650); return; } ZEPHIR_CALL_METHOD(&connection, &record, "getwriteconnection", NULL, 0); @@ -164352,11 +157492,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Row, jsonSerialize) static PHP_METHOD(Phalcon_Mvc_Model_Row, offsetGet) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *index, index_sub, value; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval index_sub, _0, _1; + zval *index; zval *this_ptr = getThis(); ZVAL_UNDEF(&index_sub); - ZVAL_UNDEF(&value); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -164369,17 +157512,21 @@ static PHP_METHOD(Phalcon_Mvc_Model_Row, offsetGet) zephir_fetch_params(1, 1, 0, &index); - ZEPHIR_OBS_VAR(&value); - if (UNEXPECTED(!(zephir_fetch_property_zval(&value, this_ptr, index, PH_SILENT_CC)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The index does not exist in the row", "phalcon/Mvc/Model/Row.zep", 46); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "offsetexists", NULL, 0, index); + zephir_check_call_status(); + if (!(zephir_is_true(&_0))) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The index does not exist in the row", "phalcon/Mvc/Model/Row.zep", 42); return; } - RETURN_CCTOR(&value); + ZEPHIR_OBS_VAR(&_1); + zephir_read_property_zval(&_1, this_ptr, index, PH_NOISY_CC); + RETURN_CCTOR(&_1); } static PHP_METHOD(Phalcon_Mvc_Model_Row, offsetExists) { - zval *index, index_sub; + zval index_sub; + zval *index; zval *this_ptr = getThis(); ZVAL_UNDEF(&index_sub); @@ -164399,7 +157546,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Row, offsetExists) static PHP_METHOD(Phalcon_Mvc_Model_Row, offsetSet) { - zval *index, index_sub, *value, value_sub; + zval index_sub, value_sub; + zval *index, *value; zval *this_ptr = getThis(); ZVAL_UNDEF(&index_sub); @@ -164416,13 +157564,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Row, offsetSet) zephir_fetch_params_without_memory_grow(2, 0, &index, &value); - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Row is an immutable ArrayAccess object", "phalcon/Mvc/Model/Row.zep", 70); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Row is an immutable ArrayAccess object", "phalcon/Mvc/Model/Row.zep", 66); return; } static PHP_METHOD(Phalcon_Mvc_Model_Row, offsetUnset) { - zval *offset, offset_sub; + zval offset_sub; + zval *offset; zval *this_ptr = getThis(); ZVAL_UNDEF(&offset_sub); @@ -164437,7 +157586,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Row, offsetUnset) zephir_fetch_params_without_memory_grow(1, 0, &offset); - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Row is an immutable ArrayAccess object", "phalcon/Mvc/Model/Row.zep", 80); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Row is an immutable ArrayAccess object", "phalcon/Mvc/Model/Row.zep", 76); return; } @@ -164509,7 +157658,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Row, toArray) ZEPHIR_MM_GROW(); - ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 508, this_ptr); + ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 422, this_ptr); zephir_check_call_status(); RETURN_MM(); } @@ -164688,7 +157837,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Transaction, getConnection) zephir_read_property(&_0, this_ptr, ZEND_STRL("rollbackOnAbort"), PH_NOISY_CC | PH_READONLY); if (zephir_is_true(&_0)) { - ZEPHIR_CALL_FUNCTION(&_1$$3, "connection_aborted", NULL, 0); + ZEPHIR_CALL_FUNCTION(&_1$$3, "connection_aborted", NULL, 476); zephir_check_call_status(); if (zephir_is_true(&_1$$3)) { ZEPHIR_INIT_VAR(&_2$$4); @@ -164807,7 +157956,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Transaction, rollback) ZEPHIR_INIT_VAR(&_3$$7); object_init_ex(&_3$$7, phalcon_mvc_model_transaction_failed_ce); zephir_read_property(&_4$$7, this_ptr, ZEND_STRL("rollbackRecord"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", NULL, 0, &rollbackMessage, &_4$$7); + ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", NULL, 477, &rollbackMessage, &_4$$7); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model/Transaction.zep", 215); ZEPHIR_MM_RESTORE(); @@ -165322,7 +158471,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Behavior_Timestampable, notify) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The option 'field' is required", "phalcon/Mvc/Model/Behavior/Timestampable.zep", 50); return; } - ZEPHIR_CALL_METHOD(×tamp, this_ptr, "gettimestamp", NULL, 0, &options); + ZEPHIR_CALL_METHOD(×tamp, this_ptr, "gettimestamp", NULL, 430, &options); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&field) == IS_ARRAY)) { zephir_is_iterable(&field, 0, "phalcon/Mvc/Model/Behavior/Timestampable.zep", 63); @@ -165386,7 +158535,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Behavior_Timestampable, getTimestamp) ZEPHIR_OBS_VAR(&format); if (zephir_array_isset_string_fetch(&format, &options, SL("format"), 0)) { - ZEPHIR_RETURN_CALL_FUNCTION("date", NULL, 0, &format); + ZEPHIR_RETURN_CALL_FUNCTION("date", NULL, 431, &format); zephir_check_call_status(); RETURN_MM(); } @@ -165972,7 +159121,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData_Stream, write) ZEPHIR_CONCAT_SVS(&_5$$3, "= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_ARRAY(data) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &data_param); + zephir_get_arrval(&data, data_param); + + +} + @@ -181174,7 +174356,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) object_init_ex(&_10$$10, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_11$$10); ZEPHIR_CONCAT_SVS(&_11$$10, "Column '", &key, "' is not part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_10$$10, "__construct", &_12, 31, &_11$$10); + ZEPHIR_CALL_METHOD(NULL, &_10$$10, "__construct", &_12, 29, &_11$$10); zephir_check_call_status(); zephir_throw_exception_debug(&_10$$10, "phalcon/Mvc/Model/Resultset/Simple.zep", 221); ZEPHIR_MM_RESTORE(); @@ -181187,7 +174369,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) object_init_ex(&_13$$12, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_14$$12); ZEPHIR_CONCAT_SVS(&_14$$12, "Column '", &key, "' is not part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_13$$12, "__construct", &_12, 31, &_14$$12); + ZEPHIR_CALL_METHOD(NULL, &_13$$12, "__construct", &_12, 29, &_14$$12); zephir_check_call_status(); zephir_throw_exception_debug(&_13$$12, "phalcon/Mvc/Model/Resultset/Simple.zep", 228); ZEPHIR_MM_RESTORE(); @@ -181215,7 +174397,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) object_init_ex(&_15$$14, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_16$$14); ZEPHIR_CONCAT_SVS(&_16$$14, "Column '", &key, "' is not part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_15$$14, "__construct", &_12, 31, &_16$$14); + ZEPHIR_CALL_METHOD(NULL, &_15$$14, "__construct", &_12, 29, &_16$$14); zephir_check_call_status(); zephir_throw_exception_debug(&_15$$14, "phalcon/Mvc/Model/Resultset/Simple.zep", 221); ZEPHIR_MM_RESTORE(); @@ -181228,7 +174410,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) object_init_ex(&_17$$16, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_18$$16); ZEPHIR_CONCAT_SVS(&_18$$16, "Column '", &key, "' is not part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_17$$16, "__construct", &_12, 31, &_18$$16); + ZEPHIR_CALL_METHOD(NULL, &_17$$16, "__construct", &_12, 29, &_18$$16); zephir_check_call_status(); zephir_throw_exception_debug(&_17$$16, "phalcon/Mvc/Model/Resultset/Simple.zep", 228); ZEPHIR_MM_RESTORE(); @@ -181275,7 +174457,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) object_init_ex(&_23$$19, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_24$$19); ZEPHIR_CONCAT_SVS(&_24$$19, "Column '", &key, "' is not part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_23$$19, "__construct", &_12, 31, &_24$$19); + ZEPHIR_CALL_METHOD(NULL, &_23$$19, "__construct", &_12, 29, &_24$$19); zephir_check_call_status(); zephir_throw_exception_debug(&_23$$19, "phalcon/Mvc/Model/Resultset/Simple.zep", 221); ZEPHIR_MM_RESTORE(); @@ -181288,7 +174470,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) object_init_ex(&_25$$21, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_26$$21); ZEPHIR_CONCAT_SVS(&_26$$21, "Column '", &key, "' is not part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_25$$21, "__construct", &_12, 31, &_26$$21); + ZEPHIR_CALL_METHOD(NULL, &_25$$21, "__construct", &_12, 29, &_26$$21); zephir_check_call_status(); zephir_throw_exception_debug(&_25$$21, "phalcon/Mvc/Model/Resultset/Simple.zep", 228); ZEPHIR_MM_RESTORE(); @@ -181316,7 +174498,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) object_init_ex(&_27$$23, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_28$$23); ZEPHIR_CONCAT_SVS(&_28$$23, "Column '", &key, "' is not part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_27$$23, "__construct", &_12, 31, &_28$$23); + ZEPHIR_CALL_METHOD(NULL, &_27$$23, "__construct", &_12, 29, &_28$$23); zephir_check_call_status(); zephir_throw_exception_debug(&_27$$23, "phalcon/Mvc/Model/Resultset/Simple.zep", 221); ZEPHIR_MM_RESTORE(); @@ -181329,7 +174511,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) object_init_ex(&_29$$25, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_NVAR(&_30$$25); ZEPHIR_CONCAT_SVS(&_30$$25, "Column '", &key, "' is not part of the column map"); - ZEPHIR_CALL_METHOD(NULL, &_29$$25, "__construct", &_12, 31, &_30$$25); + ZEPHIR_CALL_METHOD(NULL, &_29$$25, "__construct", &_12, 29, &_30$$25); zephir_check_call_status(); zephir_throw_exception_debug(&_29$$25, "phalcon/Mvc/Model/Resultset/Simple.zep", 228); ZEPHIR_MM_RESTORE(); @@ -181509,6 +174691,39 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, unserialize) ZEPHIR_MM_RESTORE(); } +static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, __serialize) +{ + zval *this_ptr = getThis(); + + + + array_init(return_value); + return; +} + +static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, __unserialize) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *data_param = NULL; + zval data; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&data); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_ARRAY(data) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &data_param); + zephir_get_arrval(&data, data_param); + + +} + @@ -181846,7 +175061,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Transaction_Manager, get) ZEPHIR_INIT_VAR(&_3$$4); ZVAL_STRING(&_3$$4, "rollbackPendent"); zephir_array_fast_append(&_2$$4, &_3$$4); - ZEPHIR_CALL_FUNCTION(NULL, "register_shutdown_function", NULL, 0, &_2$$4); + ZEPHIR_CALL_FUNCTION(NULL, "register_shutdown_function", NULL, 478, &_2$$4); zephir_check_call_status(); } if (1) { @@ -181973,9 +175188,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Transaction_Manager, getOrCreateTransaction) } else { ZVAL_BOOL(&_7, 0); } - ZEPHIR_CALL_METHOD(NULL, &transaction, "__construct", NULL, 0, &container, &_7, &_6); + ZEPHIR_CALL_METHOD(NULL, &transaction, "__construct", NULL, 479, &container, &_7, &_6); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &transaction, "settransactionmanager", NULL, 0, this_ptr); + ZEPHIR_CALL_METHOD(NULL, &transaction, "settransactionmanager", NULL, 480, this_ptr); zephir_check_call_status(); zephir_update_property_array_append(this_ptr, SL("transactions"), &transaction); RETURN_ON_FAILURE(zephir_property_incr(this_ptr, SL("number"))); @@ -182611,7 +175826,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) ZVAL_STRING(&_1, "annotations"); ZEPHIR_CALL_METHOD(&annotationsService, &container, "getshared", NULL, 0, &_1); zephir_check_call_status(); - zephir_is_iterable(&handlers, 0, "phalcon/Mvc/Router/Annotations.zep", 249); + zephir_is_iterable(&handlers, 0, "phalcon/Mvc/Router/Annotations.zep", 250); if (Z_TYPE_P(&handlers) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&handlers), _2) { @@ -182625,9 +175840,9 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) if (!(ZEPHIR_IS_EMPTY(&prefix))) { ZEPHIR_INIT_NVAR(&route); object_init_ex(&route, phalcon_mvc_router_route_ce); - ZEPHIR_CALL_METHOD(NULL, &route, "__construct", &_4, 129, &prefix); + ZEPHIR_CALL_METHOD(NULL, &route, "__construct", &_4, 96, &prefix); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_5$$6, &route, "getcompiledpattern", &_6, 0); + ZEPHIR_CALL_METHOD(&_5$$6, &route, "getcompiledpattern", &_6, 481); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_7$$6); ZVAL_STRING(&_7$$6, "$#"); @@ -182662,6 +175877,14 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) ZEPHIR_OBS_NVAR(&moduleName); zephir_array_isset_long_fetch(&moduleName, &scope, 2, 0); ZEPHIR_INIT_NVAR(&_11$$4); + if (Z_TYPE_P(&moduleName) != IS_NULL) { + ZEPHIR_CPY_WRT(&_11$$4, &moduleName); + } else { + ZEPHIR_INIT_NVAR(&_11$$4); + ZVAL_STRING(&_11$$4, ""); + } + ZEPHIR_CPY_WRT(&moduleName, &_11$$4); + ZEPHIR_INIT_NVAR(&_11$$4); ZEPHIR_CONCAT_VV(&_11$$4, &controllerName, &controllerSuffix); zephir_get_strval(&sufixed, &_11$$4); if (Z_TYPE_P(&namespaceName) != IS_NULL) { @@ -182680,7 +175903,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) ZEPHIR_CALL_METHOD(&annotations, &classAnnotations, "getannotations", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&annotations) == IS_ARRAY) { - zephir_is_iterable(&annotations, 0, "phalcon/Mvc/Router/Annotations.zep", 217); + zephir_is_iterable(&annotations, 0, "phalcon/Mvc/Router/Annotations.zep", 218); if (Z_TYPE_P(&annotations) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&annotations), _14$$15) { @@ -182714,7 +175937,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) if (Z_TYPE_P(&methodAnnotations) == IS_ARRAY) { ZEPHIR_INIT_NVAR(&lowerControllerName); zephir_uncamelize(&lowerControllerName, &controllerName, NULL ); - zephir_is_iterable(&methodAnnotations, 0, "phalcon/Mvc/Router/Annotations.zep", 243); + zephir_is_iterable(&methodAnnotations, 0, "phalcon/Mvc/Router/Annotations.zep", 244); if (Z_TYPE_P(&methodAnnotations) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&methodAnnotations), _19$$18, _20$$18, _17$$18) { @@ -182731,7 +175954,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) } ZEPHIR_CALL_METHOD(&_21$$19, &collection, "getannotations", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&_21$$19, 0, "phalcon/Mvc/Router/Annotations.zep", 242); + zephir_is_iterable(&_21$$19, 0, "phalcon/Mvc/Router/Annotations.zep", 243); if (Z_TYPE_P(&_21$$19) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_21$$19), _22$$19) { @@ -182777,7 +176000,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) } ZEPHIR_CALL_METHOD(&_25$$23, &collection, "getannotations", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&_25$$23, 0, "phalcon/Mvc/Router/Annotations.zep", 242); + zephir_is_iterable(&_25$$23, 0, "phalcon/Mvc/Router/Annotations.zep", 243); if (Z_TYPE_P(&_25$$23) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_25$$23), _26$$23) { @@ -182831,9 +176054,9 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) if (!(ZEPHIR_IS_EMPTY(&prefix))) { ZEPHIR_INIT_NVAR(&route); object_init_ex(&route, phalcon_mvc_router_route_ce); - ZEPHIR_CALL_METHOD(NULL, &route, "__construct", &_4, 129, &prefix); + ZEPHIR_CALL_METHOD(NULL, &route, "__construct", &_4, 96, &prefix); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_28$$29, &route, "getcompiledpattern", &_6, 0); + ZEPHIR_CALL_METHOD(&_28$$29, &route, "getcompiledpattern", &_6, 481); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_29$$29); ZVAL_STRING(&_29$$29, "$#"); @@ -182868,6 +176091,14 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) ZEPHIR_OBS_NVAR(&moduleName); zephir_array_isset_long_fetch(&moduleName, &scope, 2, 0); ZEPHIR_INIT_NVAR(&_33$$27); + if (Z_TYPE_P(&moduleName) != IS_NULL) { + ZEPHIR_CPY_WRT(&_33$$27, &moduleName); + } else { + ZEPHIR_INIT_NVAR(&_33$$27); + ZVAL_STRING(&_33$$27, ""); + } + ZEPHIR_CPY_WRT(&moduleName, &_33$$27); + ZEPHIR_INIT_NVAR(&_33$$27); ZEPHIR_CONCAT_VV(&_33$$27, &controllerName, &controllerSuffix); zephir_get_strval(&sufixed, &_33$$27); if (Z_TYPE_P(&namespaceName) != IS_NULL) { @@ -182886,7 +176117,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) ZEPHIR_CALL_METHOD(&annotations, &classAnnotations, "getannotations", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&annotations) == IS_ARRAY) { - zephir_is_iterable(&annotations, 0, "phalcon/Mvc/Router/Annotations.zep", 217); + zephir_is_iterable(&annotations, 0, "phalcon/Mvc/Router/Annotations.zep", 218); if (Z_TYPE_P(&annotations) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&annotations), _36$$38) { @@ -182920,7 +176151,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) if (Z_TYPE_P(&methodAnnotations) == IS_ARRAY) { ZEPHIR_INIT_NVAR(&lowerControllerName); zephir_uncamelize(&lowerControllerName, &controllerName, NULL ); - zephir_is_iterable(&methodAnnotations, 0, "phalcon/Mvc/Router/Annotations.zep", 243); + zephir_is_iterable(&methodAnnotations, 0, "phalcon/Mvc/Router/Annotations.zep", 244); if (Z_TYPE_P(&methodAnnotations) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&methodAnnotations), _40$$41, _41$$41, _38$$41) { @@ -182937,7 +176168,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) } ZEPHIR_CALL_METHOD(&_42$$42, &collection, "getannotations", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&_42$$42, 0, "phalcon/Mvc/Router/Annotations.zep", 242); + zephir_is_iterable(&_42$$42, 0, "phalcon/Mvc/Router/Annotations.zep", 243); if (Z_TYPE_P(&_42$$42) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_42$$42), _43$$42) { @@ -182983,7 +176214,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) } ZEPHIR_CALL_METHOD(&_45$$46, &collection, "getannotations", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&_45$$46, 0, "phalcon/Mvc/Router/Annotations.zep", 242); + zephir_is_iterable(&_45$$46, 0, "phalcon/Mvc/Router/Annotations.zep", 243); if (Z_TYPE_P(&_45$$46) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_45$$46), _46$$46) { @@ -183152,7 +176383,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, processActionAnnotation) zephir_read_property(&_2, this_ptr, ZEND_STRL("actionPreformatCallback"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_2) != IS_NULL) { zephir_read_property(&_3$$6, this_ptr, ZEND_STRL("actionPreformatCallback"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_4$$6, "call_user_func", NULL, 206, &_3$$6, &proxyActionName); + ZEPHIR_CALL_FUNCTION(&_4$$6, "call_user_func", NULL, 178, &_3$$6, &proxyActionName); zephir_check_call_status(); ZEPHIR_CPY_WRT(&proxyActionName, &_4$$6); } @@ -183213,7 +176444,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, processActionAnnotation) ZEPHIR_CALL_METHOD(&converts, annotation, "getnamedargument", NULL, 0, &_5); zephir_check_call_status(); if (Z_TYPE_P(&converts) == IS_ARRAY) { - zephir_is_iterable(&converts, 0, "phalcon/Mvc/Router/Annotations.zep", 372); + zephir_is_iterable(&converts, 0, "phalcon/Mvc/Router/Annotations.zep", 373); if (Z_TYPE_P(&converts) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&converts), _11$$18, _12$$18, _9$$18) { @@ -183255,7 +176486,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, processActionAnnotation) ZEPHIR_CALL_METHOD(&converts, annotation, "getnamedargument", NULL, 0, &_5); zephir_check_call_status(); if (Z_TYPE_P(&converts) == IS_ARRAY) { - zephir_is_iterable(&converts, 0, "phalcon/Mvc/Router/Annotations.zep", 383); + zephir_is_iterable(&converts, 0, "phalcon/Mvc/Router/Annotations.zep", 384); if (Z_TYPE_P(&converts) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&converts), _17$$21, _18$$21, _15$$21) { @@ -183425,10 +176656,10 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, setActionPreformatCallback) } else if (Z_TYPE_P(callback) == IS_NULL) { ZEPHIR_INIT_VAR(&_0$$4); ZEPHIR_INIT_NVAR(&_0$$4); - zephir_create_closure_ex(&_0$$4, NULL, phalcon_12__closure_ce, SL("__invoke")); + zephir_create_closure_ex(&_0$$4, NULL, phalcon_10__closure_ce, SL("__invoke")); zephir_update_property_zval(this_ptr, ZEND_STRL("actionPreformatCallback"), &_0$$4); } else { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "The 'callback' parameter must be either a callable or NULL.", "phalcon/Mvc/Router/Annotations.zep", 462); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "The 'callback' parameter must be either a callable or NULL.", "phalcon/Mvc/Router/Annotations.zep", 463); return; } ZEPHIR_MM_RESTORE(); @@ -184368,10 +177599,10 @@ static PHP_METHOD(Phalcon_Mvc_Router_Group, addRoute) zephir_read_property(&_1, this_ptr, ZEND_STRL("prefix"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_2); ZEPHIR_CONCAT_VV(&_2, &_1, &pattern); - ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 129, &_2, &mergedPaths, httpMethods); + ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 96, &_2, &mergedPaths, httpMethods); zephir_check_call_status(); zephir_update_property_array_append(this_ptr, SL("routes"), &route); - ZEPHIR_CALL_METHOD(NULL, &route, "setgroup", NULL, 0, this_ptr); + ZEPHIR_CALL_METHOD(NULL, &route, "setgroup", NULL, 482, this_ptr); zephir_check_call_status(); RETURN_CCTOR(&route); } @@ -185063,7 +178294,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Route, getReversedPaths) ZEPHIR_MM_GROW(); zephir_read_property(&_0, this_ptr, ZEND_STRL("paths"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_FUNCTION("array_flip", NULL, 128, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("array_flip", NULL, 95, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -186089,7 +179320,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, partial) } - ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 466); + ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 381); zephir_check_call_status(); if (Z_TYPE_P(params) == IS_ARRAY) { zephir_read_property(&_0$$3, this_ptr, ZEND_STRL("viewParams"), PH_NOISY_CC | PH_READONLY); @@ -186102,12 +179333,12 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, partial) } else { ZEPHIR_CPY_WRT(&mergedParams, params); } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "internalrender", NULL, 0, &partialPath, &mergedParams); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "internalrender", NULL, 504, &partialPath, &mergedParams); zephir_check_call_status(); if (Z_TYPE_P(params) == IS_ARRAY) { zephir_update_property_zval(this_ptr, ZEND_STRL("viewParams"), &viewParams); } - ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 0); + ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 484); zephir_check_call_status(); zephir_read_property(&_2, this_ptr, ZEND_STRL("content"), PH_NOISY_CC | PH_READONLY); zend_print_zval(&_2, 0); @@ -186186,15 +179417,15 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, render) ZEPHIR_INIT_VAR(&_0); ZEPHIR_CREATE_SYMBOL_TABLE(); - ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 466); + ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 381); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("viewParams"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&viewParams, &_1); ZEPHIR_INIT_VAR(&mergedParams); zephir_fast_array_merge(&mergedParams, &viewParams, ¶ms); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "internalrender", NULL, 0, &path, &mergedParams); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "internalrender", NULL, 504, &path, &mergedParams); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 0); + ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 484); zephir_check_call_status(); RETURN_MM_MEMBER(getThis(), "content"); } @@ -186396,7 +179627,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, setViewsDir) } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdirseparator", NULL, 0, &viewsDir); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdirseparator", NULL, 505, &viewsDir); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("viewsDir"), &_0); ZEPHIR_MM_RESTORE(); @@ -186449,7 +179680,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, loadTemplateEngines) if (Z_TYPE_P(®isteredEngines) != IS_ARRAY) { ZEPHIR_INIT_VAR(&_2$$4); object_init_ex(&_2$$4, phalcon_mvc_view_engine_php_ce); - ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 0, this_ptr, &di); + ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 487, this_ptr, &di); zephir_check_call_status(); zephir_array_update_string(&engines, SL(".phtml"), &_2$$4, PH_COPY | PH_SEPARATE); } else { @@ -186475,7 +179706,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, loadTemplateEngines) ZEPHIR_CALL_CE_STATIC(&_7$$9, _8$$9, "bind", &_9, 0, &engineService, &di); zephir_check_call_status(); ZEPHIR_CPY_WRT(&engineService, &_7$$9); - ZEPHIR_CALL_FUNCTION(&engineObject, "call_user_func", &_10, 206, &engineService, this_ptr); + ZEPHIR_CALL_FUNCTION(&engineObject, "call_user_func", &_10, 178, &engineService, this_ptr); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&engineObject, &engineService); @@ -186491,7 +179722,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, loadTemplateEngines) object_init_ex(&_12$$12, phalcon_mvc_view_exception_ce); ZEPHIR_INIT_NVAR(&_13$$12); ZEPHIR_CONCAT_SV(&_13$$12, "Invalid template engine registration for extension: ", &extension); - ZEPHIR_CALL_METHOD(NULL, &_12$$12, "__construct", &_14, 31, &_13$$12); + ZEPHIR_CALL_METHOD(NULL, &_12$$12, "__construct", &_14, 29, &_13$$12); zephir_check_call_status(); zephir_throw_exception_debug(&_12$$12, "phalcon/Mvc/View/Simple.zep", 477); ZEPHIR_MM_RESTORE(); @@ -186518,7 +179749,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, loadTemplateEngines) ZEPHIR_CALL_CE_STATIC(&_15$$15, _16$$15, "bind", &_9, 0, &engineService, &di); zephir_check_call_status(); ZEPHIR_CPY_WRT(&engineService, &_15$$15); - ZEPHIR_CALL_FUNCTION(&engineObject, "call_user_func", &_10, 206, &engineService, this_ptr); + ZEPHIR_CALL_FUNCTION(&engineObject, "call_user_func", &_10, 178, &engineService, this_ptr); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&engineObject, &engineService); @@ -186534,7 +179765,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, loadTemplateEngines) object_init_ex(&_18$$18, phalcon_mvc_view_exception_ce); ZEPHIR_INIT_NVAR(&_19$$18); ZEPHIR_CONCAT_SV(&_19$$18, "Invalid template engine registration for extension: ", &extension); - ZEPHIR_CALL_METHOD(NULL, &_18$$18, "__construct", &_14, 31, &_19$$18); + ZEPHIR_CALL_METHOD(NULL, &_18$$18, "__construct", &_14, 29, &_19$$18); zephir_check_call_status(); zephir_throw_exception_debug(&_18$$18, "phalcon/Mvc/View/Simple.zep", 477); ZEPHIR_MM_RESTORE(); @@ -186765,7 +179996,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, internalRender) object_init_ex(&_30$$20, phalcon_mvc_view_exception_ce); ZEPHIR_INIT_VAR(&_31$$20); ZEPHIR_CONCAT_SVS(&_31$$20, "View '", &viewsDirPath, "' was not found in the views directory"); - ZEPHIR_CALL_METHOD(NULL, &_30$$20, "__construct", NULL, 31, &_31$$20); + ZEPHIR_CALL_METHOD(NULL, &_30$$20, "__construct", NULL, 29, &_31$$20); zephir_check_call_status(); zephir_throw_exception_debug(&_30$$20, "phalcon/Mvc/View/Simple.zep", 576); ZEPHIR_MM_RESTORE(); @@ -187058,7 +180289,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Php, render) if (mustClean) { - ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 0); + ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 489); zephir_check_call_status(); } if (Z_TYPE_P(params) == IS_ARRAY) { @@ -187108,7 +180339,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Php, render) } if (mustClean) { zephir_read_property(&_6$$7, this_ptr, ZEND_STRL("view"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_7$$7, "ob_get_contents", NULL, 0); + ZEPHIR_CALL_FUNCTION(&_7$$7, "ob_get_contents", NULL, 488); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_6$$7, "setcontent", NULL, 0, &_7$$7); zephir_check_call_status(); @@ -187191,13 +180422,13 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, callMacro) object_init_ex(&_1$$3, phalcon_mvc_view_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZEPHIR_CONCAT_SVS(&_2$$3, "Macro '", &name, "' does not exist"); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 31, &_2$$3); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_2$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Mvc/View/Engine/Volt.zep", 59); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_RETURN_CALL_FUNCTION("call_user_func", NULL, 206, ¯o, &arguments); + ZEPHIR_RETURN_CALL_FUNCTION("call_user_func", NULL, 178, ¯o, &arguments); zephir_check_call_status(); RETURN_MM(); } @@ -187252,7 +180483,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, convertEncoding) _0 = ZEPHIR_IS_STRING_IDENTICAL(&to, "utf8"); } if (_0) { - ZEPHIR_RETURN_CALL_FUNCTION("utf8_encode", NULL, 0, &text); + ZEPHIR_RETURN_CALL_FUNCTION("utf8_encode", NULL, 490, &text); zephir_check_call_status(); RETURN_MM(); } @@ -187261,12 +180492,12 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, convertEncoding) _1 = ZEPHIR_IS_STRING_IDENTICAL(&from, "utf8"); } if (_1) { - ZEPHIR_RETURN_CALL_FUNCTION("utf8_decode", NULL, 307, &text); + ZEPHIR_RETURN_CALL_FUNCTION("utf8_decode", NULL, 280, &text); zephir_check_call_status(); RETURN_MM(); } if ((zephir_function_exists_ex(ZEND_STRL("mb_convert_encoding")) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 351, &text, &from, &to); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 324, &text, &from, &to); zephir_check_call_status(); RETURN_MM(); } @@ -187297,18 +180528,18 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, getCompiler) ZEPHIR_INIT_NVAR(&compiler); object_init_ex(&compiler, phalcon_mvc_view_engine_volt_compiler_ce); zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("view"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, &compiler, "__construct", NULL, 0, &_1$$3); + ZEPHIR_CALL_METHOD(NULL, &compiler, "__construct", NULL, 491, &_1$$3); zephir_check_call_status(); zephir_read_property(&_2$$3, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&container, &_2$$3); if (Z_TYPE_P(&container) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(NULL, &compiler, "setdi", NULL, 0, &container); + ZEPHIR_CALL_METHOD(NULL, &compiler, "setdi", NULL, 492, &container); zephir_check_call_status(); } zephir_read_property(&_2$$3, this_ptr, ZEND_STRL("options"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&options, &_2$$3); if (Z_TYPE_P(&options) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, &compiler, "setoptions", NULL, 0, &options); + ZEPHIR_CALL_METHOD(NULL, &compiler, "setoptions", NULL, 493, &options); zephir_check_call_status(); } zephir_update_property_zval(this_ptr, ZEND_STRL("compiler"), &compiler); @@ -187363,7 +180594,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, isIncluded) } if (Z_TYPE_P(haystack) == IS_STRING) { if ((zephir_function_exists_ex(ZEND_STRL("mb_strpos")) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&_0$$5, "mb_strpos", NULL, 113, haystack, needle); + ZEPHIR_CALL_FUNCTION(&_0$$5, "mb_strpos", NULL, 82, haystack, needle); zephir_check_call_status(); RETURN_MM_BOOL(!ZEPHIR_IS_FALSE_IDENTICAL(&_0$$5)); } @@ -187404,7 +180635,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, length) RETURN_MM_LONG(zephir_fast_count_int(item)); } if ((zephir_function_exists_ex(ZEND_STRL("mb_strlen")) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_strlen", NULL, 254, item); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strlen", NULL, 227, item); zephir_check_call_status(); RETURN_MM(); } @@ -187492,7 +180723,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, preload) zephir_fast_str_replace(&_5$$5, &_6$$5, &_7$$5, &href); ZEPHIR_INIT_VAR(&_8$$5); ZVAL_STRING(&_8$$5, "preload"); - ZEPHIR_CALL_METHOD(NULL, &link, "__construct", NULL, 0, &_8$$5, &_5$$5, &attributes); + ZEPHIR_CALL_METHOD(NULL, &link, "__construct", NULL, 494, &_8$$5, &_5$$5, &attributes); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_8$$5); object_init_ex(&_8$$5, phalcon_html_link_serializer_header_ce); @@ -187504,7 +180735,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, preload) ZEPHIR_INIT_VAR(&_10$$5); zephir_create_array(&_10$$5, 1, 0); zephir_array_fast_append(&_10$$5, &link); - ZEPHIR_CALL_METHOD(&_9$$5, &_8$$5, "serialize", NULL, 0, &_10$$5); + ZEPHIR_CALL_METHOD(&_9$$5, &_8$$5, "serialize", NULL, 495, &_10$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(&header); ZEPHIR_CONCAT_SV(&header, "Link: ", &_9$$5); @@ -187572,7 +180803,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render) if (mustClean) { - ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 0); + ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 489); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&compiler, this_ptr, "getcompiler", NULL, 0); @@ -187648,7 +180879,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render) } if (mustClean) { zephir_read_property(&_11$$11, this_ptr, ZEND_STRL("view"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_12$$11, "ob_get_contents", NULL, 0); + ZEPHIR_CALL_FUNCTION(&_12$$11, "ob_get_contents", NULL, 488); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_11$$11, "setcontent", NULL, 0, &_12$$11); zephir_check_call_status(); @@ -187788,19 +181019,19 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, slice) } if (Z_TYPE_P(value) == IS_ARRAY) { ZVAL_LONG(&_5$$9, start); - ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 0, value, &_5$$9, &length); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 496, value, &_5$$9, &length); zephir_check_call_status(); RETURN_MM(); } if ((zephir_function_exists_ex(ZEND_STRL("mb_substr")) == SUCCESS)) { if (Z_TYPE_P(&length) != IS_NULL) { ZVAL_LONG(&_6$$11, start); - ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", NULL, 248, value, &_6$$11, &length); + ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", NULL, 221, value, &_6$$11, &length); zephir_check_call_status(); RETURN_MM(); } ZVAL_LONG(&_7$$10, start); - ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", NULL, 248, value, &_7$$10); + ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", NULL, 221, value, &_7$$10); zephir_check_call_status(); RETURN_MM(); } @@ -187837,7 +181068,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, sort) ZEPHIR_MAKE_REF(&value); - ZEPHIR_CALL_FUNCTION(NULL, "asort", NULL, 0, &value); + ZEPHIR_CALL_FUNCTION(NULL, "asort", NULL, 497, &value); ZEPHIR_UNREF(&value); zephir_check_call_status(); RETURN_CTOR(&value); @@ -188122,7 +181353,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, attributeReader) } } } else { - ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", NULL, 0, &left); + ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", NULL, 498, &left); zephir_check_call_status(); ZEPHIR_OBS_VAR(&leftType); zephir_array_fetch_string(&leftType, &left, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 243); @@ -188144,7 +181375,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, attributeReader) zephir_array_fetch_string(&_11$$11, &right, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 257); zephir_concat_self(&exprCode, &_11$$11); } else { - ZEPHIR_CALL_METHOD(&_12$$12, this_ptr, "expression", NULL, 0, &right); + ZEPHIR_CALL_METHOD(&_12$$12, this_ptr, "expression", NULL, 498, &right); zephir_check_call_status(); zephir_concat_self(&exprCode, &_12$$12); } @@ -188336,7 +181567,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compile) } if (Z_TYPE_P(&compiledPath) == IS_STRING) { if (!(ZEPHIR_IS_EMPTY(&compiledPath))) { - ZEPHIR_CALL_FUNCTION(&_10$$22, "realpath", NULL, 102, &templatePath); + ZEPHIR_CALL_FUNCTION(&_10$$22, "realpath", NULL, 71, &templatePath); zephir_check_call_status(); ZEPHIR_INIT_VAR(&templateSepPath); zephir_prepare_virtual_path(&templateSepPath, &_10$$22, &compiledSeparator); @@ -188400,7 +181631,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compile) object_init_ex(&_17$$35, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_18$$35); ZEPHIR_CONCAT_SVS(&_18$$35, "Extends compilation file ", &compiledTemplatePath, " could not be opened"); - ZEPHIR_CALL_METHOD(NULL, &_17$$35, "__construct", NULL, 0, &_18$$35); + ZEPHIR_CALL_METHOD(NULL, &_17$$35, "__construct", NULL, 499, &_18$$35); zephir_check_call_status(); zephir_throw_exception_debug(&_17$$35, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 477); ZEPHIR_MM_RESTORE(); @@ -188465,7 +181696,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileAutoEscape) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_CALL_METHOD(&compilation, this_ptr, "statementlist", NULL, 0, &_0, &_1); + ZEPHIR_CALL_METHOD(&compilation, this_ptr, "statementlist", NULL, 500, &_0, &_1); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("autoescape"), &oldAutoescape); RETURN_CCTOR(&compilation); @@ -188540,13 +181771,13 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileCase) object_init_ex(&_0$$4, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$4); ZVAL_STRING(&_1$$4, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 0, &_1$$4, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 499, &_1$$4, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$4, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 567); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 0, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 498, &expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -188581,7 +181812,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileDo) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 591); return; } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 0, &expr); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 498, &expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -188624,13 +181855,13 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileEcho) object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 0, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 499, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 615); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 0, &expr); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 498, &expr); zephir_check_call_status(); zephir_array_fetch_string(&_2, &expr, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 623); if (ZEPHIR_IS_LONG(&_2, 350)) { @@ -188684,13 +181915,13 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileElseIf) object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 0, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 499, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 662); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 0, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 498, &expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -188763,7 +181994,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileFile) object_init_ex(&_0$$4, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$4); ZEPHIR_CONCAT_SVS(&_1$$4, "Template file ", &path, " does not exist"); - ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 0, &_1$$4); + ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 499, &_1$$4); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$4, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 702); ZEPHIR_MM_RESTORE(); @@ -188776,7 +182007,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileFile) object_init_ex(&_2$$5, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_3$$5); ZEPHIR_CONCAT_SVS(&_3$$5, "Template file ", &path, " could not be opened"); - ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 0, &_3$$5); + ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 499, &_3$$5); zephir_check_call_status(); zephir_throw_exception_debug(&_2$$5, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 714); ZEPHIR_MM_RESTORE(); @@ -188893,7 +182124,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) ZEPHIR_CONCAT_VV(&prefixLevel, &prefix, &level); ZEPHIR_OBS_VAR(&expr); zephir_array_fetch_string(&expr, &statement, SL("expr"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 780); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 0, &expr); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 498, &expr); zephir_check_call_status(); ZEPHIR_OBS_VAR(&blockStatements); zephir_array_fetch_string(&blockStatements, &statement, SL("block_statements"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 787); @@ -188953,7 +182184,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) } else { ZVAL_BOOL(&_4, 0); } - ZEPHIR_CALL_METHOD(&code, this_ptr, "statementlist", NULL, 0, &blockStatements, &_4); + ZEPHIR_CALL_METHOD(&code, this_ptr, "statementlist", NULL, 500, &blockStatements, &_4); zephir_check_call_status(); ZEPHIR_OBS_VAR(&loopContext); zephir_read_property(&loopContext, this_ptr, ZEND_STRL("loopPointers"), PH_NOISY_CC); @@ -189004,7 +182235,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) } ZEPHIR_OBS_VAR(&ifExpr); if (zephir_array_isset_string_fetch(&ifExpr, &statement, SL("if_expr"), 0)) { - ZEPHIR_CALL_METHOD(&_16$$15, this_ptr, "expression", NULL, 0, &ifExpr); + ZEPHIR_CALL_METHOD(&_16$$15, this_ptr, "expression", NULL, 498, &ifExpr); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_17$$15); ZEPHIR_CONCAT_SVS(&_17$$15, "if (", &_16$$15, ") { ?>"); @@ -189132,13 +182363,13 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 0, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 499, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 942); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 0, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 498, &expr); zephir_check_call_status(); zephir_array_fetch_string(&_4, &statement, SL("true_statements"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 948); if (extendsMode) { @@ -189146,7 +182377,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) } else { ZVAL_BOOL(&_5, 0); } - ZEPHIR_CALL_METHOD(&_3, this_ptr, "statementlist", NULL, 0, &_4, &_5); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "statementlist", NULL, 500, &_4, &_5); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6); ZEPHIR_CONCAT_SVSV(&_6, "", &_3); @@ -189158,7 +182389,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) } else { ZVAL_BOOL(&_8$$4, 0); } - ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "statementlist", NULL, 0, &blockStatements, &_8$$4); + ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "statementlist", NULL, 500, &blockStatements, &_8$$4); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_9$$4); ZEPHIR_CONCAT_SV(&_9$$4, "", &_7$$4); @@ -189228,14 +182459,14 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileInclude) RETURN_CCTOR(&compilation); } } - ZEPHIR_CALL_METHOD(&path, this_ptr, "expression", NULL, 0, &pathExpr); + ZEPHIR_CALL_METHOD(&path, this_ptr, "expression", NULL, 498, &pathExpr); zephir_check_call_status(); ZEPHIR_OBS_VAR(¶ms); if (!(zephir_array_isset_string_fetch(¶ms, &statement, SL("params"), 0))) { ZEPHIR_CONCAT_SVS(return_value, "partial(", &path, "); ?>"); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&_3, this_ptr, "expression", NULL, 0, ¶ms); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "expression", NULL, 498, ¶ms); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "partial(", &path, ", ", &_3, "); ?>"); RETURN_MM(); @@ -189315,7 +182546,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro) object_init_ex(&_1$$4, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_2$$4); ZEPHIR_CONCAT_SVS(&_2$$4, "Macro '", &name, "' is already defined"); - ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 0, &_2$$4); + ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 499, &_2$$4); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$4, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1064); ZEPHIR_MM_RESTORE(); @@ -189366,7 +182597,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro) zephir_concat_self_str(&code, " } else { ", sizeof(" } else { ") - 1); ZEPHIR_OBS_NVAR(&defaultValue); if (EXPECTED(zephir_array_isset_string_fetch(&defaultValue, ¶meter, SL("default"), 0))) { - ZEPHIR_CALL_METHOD(&_14$$8, this_ptr, "expression", &_15, 0, &defaultValue); + ZEPHIR_CALL_METHOD(&_14$$8, this_ptr, "expression", &_15, 498, &defaultValue); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$8); ZEPHIR_CONCAT_SVSVS(&_16$$8, "$", &variableName, " = ", &_14$$8, ";"); @@ -189409,7 +182640,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro) zephir_concat_self_str(&code, " } else { ", sizeof(" } else { ") - 1); ZEPHIR_OBS_NVAR(&defaultValue); if (EXPECTED(zephir_array_isset_string_fetch(&defaultValue, ¶meter, SL("default"), 0))) { - ZEPHIR_CALL_METHOD(&_22$$11, this_ptr, "expression", &_15, 0, &defaultValue); + ZEPHIR_CALL_METHOD(&_22$$11, this_ptr, "expression", &_15, 498, &defaultValue); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_23$$11); ZEPHIR_CONCAT_SVSVS(&_23$$11, "$", &variableName, " = ", &_22$$11, ";"); @@ -189435,7 +182666,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro) } else { ZVAL_BOOL(&_26$$13, 0); } - ZEPHIR_CALL_METHOD(&_25$$13, this_ptr, "statementlist", NULL, 0, &blockStatements, &_26$$13); + ZEPHIR_CALL_METHOD(&_25$$13, this_ptr, "statementlist", NULL, 500, &blockStatements, &_26$$13); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_27$$13); ZEPHIR_CONCAT_VS(&_27$$13, &_25$$13, ""); RETURN_MM(); @@ -189544,10 +182775,10 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSet) ZEPHIR_INIT_NVAR(&assignment); ZVAL_COPY(&assignment, _0); zephir_array_fetch_string(&_2$$4, &assignment, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1177); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_3, 0, &_2$$4); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_3, 498, &_2$$4); zephir_check_call_status(); zephir_array_fetch_string(&_4$$4, &assignment, SL("variable"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1184); - ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_3, 0, &_4$$4); + ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_3, 498, &_4$$4); zephir_check_call_status(); zephir_array_fetch_string(&_5$$4, &assignment, SL("op"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1190); do { @@ -189594,10 +182825,10 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSet) ZEPHIR_CALL_METHOD(&assignment, &assignments, "current", NULL, 0); zephir_check_call_status(); zephir_array_fetch_string(&_11$$10, &assignment, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1177); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_3, 0, &_11$$10); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_3, 498, &_11$$10); zephir_check_call_status(); zephir_array_fetch_string(&_12$$10, &assignment, SL("variable"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1184); - ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_3, 0, &_12$$10); + ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_3, 498, &_12$$10); zephir_check_call_status(); zephir_array_fetch_string(&_13$$10, &assignment, SL("op"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1190); do { @@ -189741,13 +182972,13 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSwitch) object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 0, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 499, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1256); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 0, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 498, &expr); zephir_check_call_status(); ZEPHIR_INIT_VAR(&compilation); ZEPHIR_CONCAT_SVS(&compilation, ""); @@ -189758,14 +182989,14 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSwitch) } else { ZVAL_BOOL(&_3$$4, 0); } - ZEPHIR_CALL_METHOD(&lines, this_ptr, "statementlist", NULL, 0, &caseClauses, &_3$$4); + ZEPHIR_CALL_METHOD(&lines, this_ptr, "statementlist", NULL, 500, &caseClauses, &_3$$4); zephir_check_call_status(); if (zephir_fast_strlen_ev(&lines) != 0) { ZEPHIR_INIT_VAR(&_4$$5); ZVAL_STRING(&_4$$5, "/(*ANYCRLF)^\\h+|\\h+$|(\\h){2,}/mu"); ZEPHIR_INIT_VAR(&_5$$5); ZVAL_STRING(&_5$$5, ""); - ZEPHIR_CALL_FUNCTION(&_6$$5, "preg_replace", NULL, 50, &_4$$5, &_5$$5, &lines); + ZEPHIR_CALL_FUNCTION(&_6$$5, "preg_replace", NULL, 37, &_4$$5, &_5$$5, &lines); zephir_check_call_status(); ZEPHIR_CPY_WRT(&lines, &_6$$5); } @@ -189846,7 +183077,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) zephir_array_fast_append(&_1$$4, &expr); ZEPHIR_INIT_NVAR(&_2$$4); ZVAL_STRING(&_2$$4, "resolveExpression"); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "fireextensionevent", &_3, 0, &_2$$4, &_1$$4); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "fireextensionevent", &_3, 501, &_2$$4, &_1$$4); zephir_check_call_status(); if (Z_TYPE_P(&exprCode) == IS_STRING) { break; @@ -189863,7 +183094,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) ZEPHIR_INIT_NVAR(&singleExpr); ZVAL_COPY(&singleExpr, _4$$6); zephir_array_fetch_string(&_6$$7, &singleExpr, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1344); - ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_7, 0, &_6$$7); + ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_7, 498, &_6$$7); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); if (zephir_array_isset_string_fetch(&name, &singleExpr, SL("name"), 0)) { @@ -189886,7 +183117,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) ZEPHIR_CALL_METHOD(&singleExpr, &expr, "current", NULL, 0); zephir_check_call_status(); zephir_array_fetch_string(&_9$$10, &singleExpr, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1344); - ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_7, 0, &_9$$10); + ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_7, 498, &_9$$10); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); if (zephir_array_isset_string_fetch(&name, &singleExpr, SL("name"), 0)) { @@ -189912,7 +183143,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) } ZEPHIR_OBS_NVAR(&left); if (zephir_array_isset_string_fetch(&left, &expr, SL("left"), 0)) { - ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_7, 0, &left); + ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_7, 498, &left); zephir_check_call_status(); } if (ZEPHIR_IS_LONG(&type, 311)) { @@ -189923,13 +183154,13 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) } if (ZEPHIR_IS_LONG(&type, 124)) { zephir_array_fetch_string(&_14$$16, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1391); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "resolvefilter", &_15, 0, &_14$$16, &leftCode); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "resolvefilter", &_15, 502, &_14$$16, &leftCode); zephir_check_call_status(); break; } ZEPHIR_OBS_NVAR(&right); if (zephir_array_isset_string_fetch(&right, &expr, SL("right"), 0)) { - ZEPHIR_CALL_METHOD(&rightCode, this_ptr, "expression", &_7, 0, &right); + ZEPHIR_CALL_METHOD(&rightCode, this_ptr, "expression", &_7, 498, &right); zephir_check_call_status(); } ZEPHIR_INIT_NVAR(&exprCode); @@ -190105,7 +183336,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) if (ZEPHIR_IS_LONG(&type, 365)) { ZEPHIR_OBS_NVAR(&start); if (zephir_array_isset_string_fetch(&start, &expr, SL("start"), 0)) { - ZEPHIR_CALL_METHOD(&startCode, this_ptr, "expression", &_7, 0, &start); + ZEPHIR_CALL_METHOD(&startCode, this_ptr, "expression", &_7, 498, &start); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&startCode); @@ -190113,7 +183344,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) } ZEPHIR_OBS_NVAR(&end); if (zephir_array_isset_string_fetch(&end, &expr, SL("end"), 0)) { - ZEPHIR_CALL_METHOD(&endCode, this_ptr, "expression", &_7, 0, &end); + ZEPHIR_CALL_METHOD(&endCode, this_ptr, "expression", &_7, 498, &end); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&endCode); @@ -190205,7 +183436,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) } if (ZEPHIR_IS_LONG(&type, 366)) { zephir_array_fetch_string(&_23$$72, &expr, SL("ternary"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1625); - ZEPHIR_CALL_METHOD(&_22$$72, this_ptr, "expression", &_7, 0, &_23$$72); + ZEPHIR_CALL_METHOD(&_22$$72, this_ptr, "expression", &_7, 498, &_23$$72); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&exprCode); ZEPHIR_CONCAT_SVSVSVS(&exprCode, "(", &_22$$72, " ? ", &leftCode, " : ", &rightCode, ")"); @@ -190232,7 +183463,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) zephir_array_fetch_string(&_26$$76, &expr, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1643); ZEPHIR_INIT_NVAR(&_27$$76); ZEPHIR_CONCAT_SVSVSV(&_27$$76, "Unknown expression ", &type, " in ", &_25$$76, " on line ", &_26$$76); - ZEPHIR_CALL_METHOD(NULL, &_24$$76, "__construct", &_28, 0, &_27$$76); + ZEPHIR_CALL_METHOD(NULL, &_24$$76, "__construct", &_28, 499, &_27$$76); zephir_check_call_status(); zephir_throw_exception_debug(&_24$$76, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1643); ZEPHIR_MM_RESTORE(); @@ -190433,7 +183664,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) ZVAL_NULL(&funcArguments); ZEPHIR_OBS_NVAR(&funcArguments); if (zephir_array_isset_string_fetch(&funcArguments, &expr, SL("arguments"), 0)) { - ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 0, &funcArguments); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 498, &funcArguments); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&arguments); @@ -190456,7 +183687,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) zephir_array_fast_append(&_1$$6, &funcArguments); ZEPHIR_INIT_VAR(&_2$$6); ZVAL_STRING(&_2$$6, "compileFunction"); - ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 0, &_2$$6, &_1$$6); + ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 501, &_2$$6, &_1$$6); zephir_check_call_status(); if (Z_TYPE_P(&code) == IS_STRING) { RETURN_CCTOR(&code); @@ -190488,7 +183719,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) zephir_array_fetch_string(&_6$$9, &expr, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1775); ZEPHIR_INIT_VAR(&_7$$9); ZEPHIR_CONCAT_SVSVSV(&_7$$9, "Invalid definition for user function '", &name, "' in ", &_5$$9, " on line ", &_6$$9); - ZEPHIR_CALL_METHOD(NULL, &_4$$9, "__construct", NULL, 0, &_7$$9); + ZEPHIR_CALL_METHOD(NULL, &_4$$9, "__construct", NULL, 499, &_7$$9); zephir_check_call_status(); zephir_throw_exception_debug(&_4$$9, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1775); ZEPHIR_MM_RESTORE(); @@ -190517,7 +183748,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) zephir_read_property(&_11$$17, this_ptr, ZEND_STRL("exprLevel"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&exprLevel, &_11$$17); if (Z_TYPE_P(&block) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&code, this_ptr, "statementlistorextends", NULL, 0, &block); + ZEPHIR_CALL_METHOD(&code, this_ptr, "statementlistorextends", NULL, 503, &block); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&exprLevel, 1)) { ZEPHIR_CPY_WRT(&escapedCode, &code); @@ -190544,7 +183775,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) } ZEPHIR_INIT_VAR(&_12$$5); zephir_camelize(&_12$$5, &name, NULL ); - ZEPHIR_CALL_FUNCTION(&method, "lcfirst", NULL, 104, &_12$$5); + ZEPHIR_CALL_FUNCTION(&method, "lcfirst", NULL, 73, &_12$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(&arrayHelpers); zephir_create_array(&arrayHelpers, 16, 0); @@ -190637,7 +183868,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) ZEPHIR_CONCAT_SVSVS(return_value, "$this->callMacro('", &name, "', [", &arguments, "])"); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&_21, this_ptr, "expression", NULL, 0, &nameExpr); + ZEPHIR_CALL_METHOD(&_21, this_ptr, "expression", NULL, 498, &nameExpr); zephir_check_call_status(); ZEPHIR_CONCAT_VSVS(return_value, &_21, "(", &arguments, ")"); RETURN_MM(); @@ -190908,28 +184139,28 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveTest) if (zephir_array_isset_string_fetch(&name, &testName, SL("value"), 0)) { if (ZEPHIR_IS_STRING(&name, "divisibleby")) { zephir_array_fetch_string(&_1$$12, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2155); - ZEPHIR_CALL_METHOD(&_0$$12, this_ptr, "expression", NULL, 0, &_1$$12); + ZEPHIR_CALL_METHOD(&_0$$12, this_ptr, "expression", NULL, 498, &_1$$12); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "(((", &left, ") % (", &_0$$12, ")) == 0)"); RETURN_MM(); } if (ZEPHIR_IS_STRING(&name, "sameas")) { zephir_array_fetch_string(&_3$$13, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2162); - ZEPHIR_CALL_METHOD(&_2$$13, this_ptr, "expression", NULL, 0, &_3$$13); + ZEPHIR_CALL_METHOD(&_2$$13, this_ptr, "expression", NULL, 498, &_3$$13); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "(", &left, ") === (", &_2$$13, ")"); RETURN_MM(); } if (ZEPHIR_IS_STRING(&name, "type")) { zephir_array_fetch_string(&_5$$14, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2169); - ZEPHIR_CALL_METHOD(&_4$$14, this_ptr, "expression", NULL, 0, &_5$$14); + ZEPHIR_CALL_METHOD(&_4$$14, this_ptr, "expression", NULL, 498, &_5$$14); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "gettype(", &left, ") === (", &_4$$14, ")"); RETURN_MM(); } } } - ZEPHIR_CALL_METHOD(&_6, this_ptr, "expression", NULL, 0, &test); + ZEPHIR_CALL_METHOD(&_6, this_ptr, "expression", NULL, 498, &test); zephir_check_call_status(); ZEPHIR_CONCAT_VSV(return_value, &left, " == ", &_6); RETURN_MM(); @@ -191131,7 +184362,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource) } else { ZVAL_BOOL(&_0, 0); } - ZEPHIR_CALL_METHOD(&compilation, this_ptr, "statementlist", NULL, 0, &intermediate, &_0); + ZEPHIR_CALL_METHOD(&compilation, this_ptr, "statementlist", NULL, 500, &intermediate, &_0); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("extended"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&extended, &_1); @@ -191167,11 +184398,11 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource) ZEPHIR_INIT_NVAR(&localBlock); array_init(&localBlock); } - ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 0, &localBlock); + ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 500, &localBlock); zephir_check_call_status(); } else { if (Z_TYPE_P(&block) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 0, &block); + ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 500, &block); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&blockCompilation, &block); @@ -191212,11 +184443,11 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource) ZEPHIR_INIT_NVAR(&localBlock); array_init(&localBlock); } - ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 0, &localBlock); + ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 500, &localBlock); zephir_check_call_status(); } else { if (Z_TYPE_P(&block) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 0, &block); + ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 500, &block); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&blockCompilation, &block); @@ -191405,7 +184636,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) zephir_array_fetch_string(&_2$$5, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2389); ZEPHIR_INIT_VAR(&_3$$5); ZEPHIR_CONCAT_SVSV(&_3$$5, "Unknown filter type in ", &_1$$5, " on line ", &_2$$5); - ZEPHIR_CALL_METHOD(NULL, &_0$$5, "__construct", NULL, 0, &_3$$5); + ZEPHIR_CALL_METHOD(NULL, &_0$$5, "__construct", NULL, 499, &_3$$5); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$5, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2389); ZEPHIR_MM_RESTORE(); @@ -191439,11 +184670,11 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) zephir_array_update_string(&_4$$7, SL("file"), &file, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_4$$7, SL("line"), &line, PH_COPY | PH_SEPARATE); ZEPHIR_MAKE_REF(&funcArguments); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 292, &funcArguments, &_4$$7); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 265, &funcArguments, &_4$$7); ZEPHIR_UNREF(&funcArguments); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 0, &funcArguments); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 498, &funcArguments); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&arguments, &left); @@ -191458,7 +184689,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) zephir_array_fast_append(&_7$$9, &funcArguments); ZEPHIR_INIT_VAR(&_8$$9); ZVAL_STRING(&_8$$9, "compileFilter"); - ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 0, &_8$$9, &_7$$9); + ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 501, &_8$$9, &_7$$9); zephir_check_call_status(); if (Z_TYPE_P(&code) == IS_STRING) { RETURN_CCTOR(&code); @@ -191489,7 +184720,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) zephir_array_fetch_string(&_12$$11, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2483); ZEPHIR_INIT_VAR(&_13$$11); ZEPHIR_CONCAT_SVSVSV(&_13$$11, "Invalid definition for user filter '", &name, "' in ", &_11$$11, " on line ", &_12$$11); - ZEPHIR_CALL_METHOD(NULL, &_10$$11, "__construct", NULL, 0, &_13$$11); + ZEPHIR_CALL_METHOD(NULL, &_10$$11, "__construct", NULL, 499, &_13$$11); zephir_check_call_status(); zephir_throw_exception_debug(&_10$$11, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2483); ZEPHIR_MM_RESTORE(); @@ -191623,7 +184854,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) zephir_array_fetch_string(&_25, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2677); ZEPHIR_INIT_VAR(&_26); ZEPHIR_CONCAT_SVSVSV(&_26, "Unknown filter \"", &name, "\" in ", &_24, " on line ", &_25); - ZEPHIR_CALL_METHOD(NULL, &_23, "__construct", NULL, 0, &_26); + ZEPHIR_CALL_METHOD(NULL, &_23, "__construct", NULL, 499, &_26); zephir_check_call_status(); zephir_throw_exception_debug(&_23, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2677); ZEPHIR_MM_RESTORE(); @@ -191791,7 +185022,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) zephir_array_fetch_string(&_6$$7, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2725); ZEPHIR_INIT_NVAR(&_7$$7); ZEPHIR_CONCAT_SVSV(&_7$$7, "Invalid statement in ", &_5$$7, " on line ", &_6$$7); - ZEPHIR_CALL_METHOD(NULL, &_4$$7, "__construct", &_8, 0, &_7$$7, &statement); + ZEPHIR_CALL_METHOD(NULL, &_4$$7, "__construct", &_8, 499, &_7$$7, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_4$$7, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2727); ZEPHIR_MM_RESTORE(); @@ -191803,7 +185034,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) zephir_array_fast_append(&_9$$8, &statement); ZEPHIR_INIT_NVAR(&_10$$8); ZVAL_STRING(&_10$$8, "compileStatement"); - ZEPHIR_CALL_METHOD(&tempCompilation, this_ptr, "fireextensionevent", &_11, 0, &_10$$8, &_9$$8); + ZEPHIR_CALL_METHOD(&tempCompilation, this_ptr, "fireextensionevent", &_11, 501, &_10$$8, &_9$$8); zephir_check_call_status(); if (Z_TYPE_P(&tempCompilation) == IS_STRING) { zephir_concat_self(&compilation, &tempCompilation); @@ -191908,7 +185139,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) } else { ZVAL_BOOL(&_34$$24, 0); } - ZEPHIR_CALL_METHOD(&_33$$24, this_ptr, "statementlist", &_35, 0, &blockStatements, &_34$$24); + ZEPHIR_CALL_METHOD(&_33$$24, this_ptr, "statementlist", &_35, 500, &blockStatements, &_34$$24); zephir_check_call_status(); zephir_concat_self(&compilation, &_33$$24); } @@ -192018,7 +185249,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) zephir_array_fetch_string(&_58$$37, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2957); ZEPHIR_INIT_NVAR(&_59$$37); ZEPHIR_CONCAT_SVSVSV(&_59$$37, "Unknown statement ", &type, " in ", &_57$$37, " on line ", &_58$$37); - ZEPHIR_CALL_METHOD(NULL, &_56$$37, "__construct", &_8, 0, &_59$$37); + ZEPHIR_CALL_METHOD(NULL, &_56$$37, "__construct", &_8, 499, &_59$$37); zephir_check_call_status(); zephir_throw_exception_debug(&_56$$37, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2957); ZEPHIR_MM_RESTORE(); @@ -192048,7 +185279,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) zephir_array_fetch_string(&_62$$40, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2725); ZEPHIR_INIT_NVAR(&_63$$40); ZEPHIR_CONCAT_SVSV(&_63$$40, "Invalid statement in ", &_61$$40, " on line ", &_62$$40); - ZEPHIR_CALL_METHOD(NULL, &_60$$40, "__construct", &_8, 0, &_63$$40, &statement); + ZEPHIR_CALL_METHOD(NULL, &_60$$40, "__construct", &_8, 499, &_63$$40, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_60$$40, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2727); ZEPHIR_MM_RESTORE(); @@ -192060,7 +185291,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) zephir_array_fast_append(&_64$$41, &statement); ZEPHIR_INIT_NVAR(&_65$$41); ZVAL_STRING(&_65$$41, "compileStatement"); - ZEPHIR_CALL_METHOD(&tempCompilation, this_ptr, "fireextensionevent", &_11, 0, &_65$$41, &_64$$41); + ZEPHIR_CALL_METHOD(&tempCompilation, this_ptr, "fireextensionevent", &_11, 501, &_65$$41, &_64$$41); zephir_check_call_status(); if (Z_TYPE_P(&tempCompilation) == IS_STRING) { zephir_concat_self(&compilation, &tempCompilation); @@ -192165,7 +185396,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) } else { ZVAL_BOOL(&_81$$57, 0); } - ZEPHIR_CALL_METHOD(&_80$$57, this_ptr, "statementlist", &_35, 0, &blockStatements, &_81$$57); + ZEPHIR_CALL_METHOD(&_80$$57, this_ptr, "statementlist", &_35, 500, &blockStatements, &_81$$57); zephir_check_call_status(); zephir_concat_self(&compilation, &_80$$57); } @@ -192275,7 +185506,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) zephir_array_fetch_string(&_96$$70, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2957); ZEPHIR_INIT_NVAR(&_97$$70); ZEPHIR_CONCAT_SVSVSV(&_97$$70, "Unknown statement ", &type, " in ", &_95$$70, " on line ", &_96$$70); - ZEPHIR_CALL_METHOD(NULL, &_94$$70, "__construct", &_8, 0, &_97$$70); + ZEPHIR_CALL_METHOD(NULL, &_94$$70, "__construct", &_8, 499, &_97$$70); zephir_check_call_status(); zephir_throw_exception_debug(&_94$$70, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2957); ZEPHIR_MM_RESTORE(); @@ -192362,7 +185593,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementListOrExtends) ZEPHIR_INIT_NVAR(&statement); } if (isStatementList) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "statementlist", NULL, 0, statements); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "statementlist", NULL, 500, statements); zephir_check_call_status(); RETURN_MM(); } @@ -202911,7 +196142,7 @@ static PHP_METHOD(Phalcon_Paginator_Adapter_Model, paginate) ZEPHIR_INIT_VAR(&_6); ZVAL_STRING(&_6, "count"); zephir_array_fast_append(&_5, &_6); - ZEPHIR_CALL_FUNCTION(&_7, "call_user_func", NULL, 206, &_5, ¶meters); + ZEPHIR_CALL_FUNCTION(&_7, "call_user_func", NULL, 178, &_5, ¶meters); zephir_check_call_status(); rowcount = zephir_get_intval(&_7); if (zephir_safe_mod_long_long(rowcount, limit) != 0) { @@ -202932,7 +196163,7 @@ static PHP_METHOD(Phalcon_Paginator_Adapter_Model, paginate) ZEPHIR_INIT_VAR(&_11$$8); ZVAL_STRING(&_11$$8, "find"); zephir_array_fast_append(&_10$$8, &_11$$8); - ZEPHIR_CALL_FUNCTION(&_12$$8, "call_user_func", NULL, 206, &_10$$8, ¶meters); + ZEPHIR_CALL_FUNCTION(&_12$$8, "call_user_func", NULL, 178, &_10$$8, ¶meters); zephir_check_call_status(); ZEPHIR_CPY_WRT(&pageItems, &_12$$8); } @@ -203041,7 +196272,7 @@ static PHP_METHOD(Phalcon_Paginator_Adapter_NativeArray, paginate) } ZVAL_LONG(&_0, (show * ((pageNumber - 1)))); ZVAL_LONG(&_4, show); - ZEPHIR_CALL_FUNCTION(&_5, "array_slice", NULL, 0, &items, &_0, &_4); + ZEPHIR_CALL_FUNCTION(&_5, "array_slice", NULL, 496, &items, &_0, &_4); zephir_check_call_status(); ZEPHIR_CPY_WRT(&items, &_5); if (pageNumber < totalPages) { @@ -203142,7 +196373,7 @@ static PHP_METHOD(Phalcon_Paginator_Adapter_QueryBuilder, __construct) object_init_ex(&_0$$5, phalcon_paginator_exception_ce); ZEPHIR_INIT_VAR(&_1$$5); ZEPHIR_CONCAT_SS(&_1$$5, "Parameter 'builder' must be an instance ", "of Phalcon\\Mvc\\Model\\Query\\Builder"); - ZEPHIR_CALL_METHOD(NULL, &_0$$5, "__construct", NULL, 31, &_1$$5); + ZEPHIR_CALL_METHOD(NULL, &_0$$5, "__construct", NULL, 29, &_1$$5); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$5, "phalcon/Paginator/Adapter/QueryBuilder.zep", 80); ZEPHIR_MM_RESTORE(); @@ -203888,7 +197119,7 @@ static PHP_METHOD(Phalcon_Session_Manager, destroy) ZEPHIR_CALL_METHOD(&_0, this_ptr, "exists", NULL, 0); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - ZEPHIR_CALL_FUNCTION(NULL, "session_destroy", NULL, 0); + ZEPHIR_CALL_FUNCTION(NULL, "session_destroy", NULL, 511); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_SESSION); array_init(&_SESSION); @@ -204231,7 +197462,7 @@ static PHP_METHOD(Phalcon_Session_Manager, setId) object_init_ex(&_1$$3, phalcon_session_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZEPHIR_CONCAT_SS(&_2$$3, "The session has already been started. ", "To change the id, use regenerateId()"); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 31, &_2$$3); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_2$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Session/Manager.zep", 271); ZEPHIR_MM_RESTORE(); @@ -204426,7 +197657,7 @@ static PHP_METHOD(Phalcon_Session_Manager, phpHeadersSent) ZEPHIR_MM_GROW(); - ZEPHIR_RETURN_CALL_FUNCTION("headers_sent", NULL, 440); + ZEPHIR_RETURN_CALL_FUNCTION("headers_sent", NULL, 355); zephir_check_call_status(); RETURN_MM(); } @@ -204646,19 +197877,20 @@ static PHP_METHOD(Phalcon_Session_Adapter_AbstractAdapter, destroy) static PHP_METHOD(Phalcon_Session_Adapter_AbstractAdapter, gc) { - zval *maxlifetime, maxlifetime_sub; + zval *maxlifetime_param = NULL; + zend_long maxlifetime; zval *this_ptr = getThis(); - ZVAL_UNDEF(&maxlifetime_sub); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(maxlifetime) + Z_PARAM_LONG(maxlifetime) ZEND_PARSE_PARAMETERS_END(); #endif - zephir_fetch_params_without_memory_grow(1, 0, &maxlifetime); + zephir_fetch_params_without_memory_grow(1, 0, &maxlifetime_param); + maxlifetime = zephir_get_intval(maxlifetime_param); RETURN_BOOL(1); @@ -204948,19 +198180,20 @@ static PHP_METHOD(Phalcon_Session_Adapter_Noop, destroy) static PHP_METHOD(Phalcon_Session_Adapter_Noop, gc) { - zval *maxlifetime, maxlifetime_sub; + zval *maxlifetime_param = NULL; + zend_long maxlifetime; zval *this_ptr = getThis(); - ZVAL_UNDEF(&maxlifetime_sub); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(maxlifetime) + Z_PARAM_LONG(maxlifetime) ZEND_PARSE_PARAMETERS_END(); #endif - zephir_fetch_params_without_memory_grow(1, 0, &maxlifetime); + zephir_fetch_params_without_memory_grow(1, 0, &maxlifetime_param); + maxlifetime = zephir_get_intval(maxlifetime_param); RETURN_BOOL(1); @@ -205225,13 +198458,13 @@ static PHP_METHOD(Phalcon_Session_Adapter_Stream, __construct) object_init_ex(&_4$$4, phalcon_session_exception_ce); ZEPHIR_INIT_VAR(&_5$$4); ZEPHIR_CONCAT_SVS(&_5$$4, "The session save path [", &path, "] is not writable"); - ZEPHIR_CALL_METHOD(NULL, &_4$$4, "__construct", NULL, 31, &_5$$4); + ZEPHIR_CALL_METHOD(NULL, &_4$$4, "__construct", NULL, 29, &_5$$4); zephir_check_call_status(); zephir_throw_exception_debug(&_4$$4, "phalcon/Session/Adapter/Stream.zep", 71); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_6, this_ptr, "getdirseparator", NULL, 0, &path); + ZEPHIR_CALL_METHOD(&_6, this_ptr, "getdirseparator", NULL, 506, &path); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("path"), &_6); ZEPHIR_MM_RESTORE(); @@ -205269,12 +198502,12 @@ static PHP_METHOD(Phalcon_Session_Adapter_Stream, destroy) ZEPHIR_CONCAT_VV(&file, &_0, &_1); _2 = (zephir_file_exists(&file) == SUCCESS); if (_2) { - ZEPHIR_CALL_FUNCTION(&_3, "is_file", NULL, 0, &file); + ZEPHIR_CALL_FUNCTION(&_3, "is_file", NULL, 507, &file); zephir_check_call_status(); _2 = zephir_is_true(&_3); } if (_2) { - ZEPHIR_CALL_FUNCTION(NULL, "unlink", NULL, 151, &file); + ZEPHIR_CALL_FUNCTION(NULL, "unlink", NULL, 118, &file); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -205285,11 +198518,10 @@ static PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) zend_bool _6$$3, _9$$3, _12$$5, _14$$5; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zephir_fcall_cache_entry *_8 = NULL, *_11 = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *maxlifetime, maxlifetime_sub, file, pattern, time, _0, _1, _2, _3, *_4, _5, _7$$3, _10$$3, _13$$5, _15$$5; + zval *maxlifetime_param = NULL, file, pattern, time, _0, _1, _2, _3, *_4, _5, _7$$3, _10$$3, _13$$5, _15$$5; + zend_long maxlifetime, ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); - ZVAL_UNDEF(&maxlifetime_sub); ZVAL_UNDEF(&file); ZVAL_UNDEF(&pattern); ZVAL_UNDEF(&time); @@ -205305,13 +198537,14 @@ static PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(maxlifetime) + Z_PARAM_LONG(maxlifetime) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &maxlifetime); + zephir_fetch_params(1, 1, 0, &maxlifetime_param); + maxlifetime = zephir_get_intval(maxlifetime_param); zephir_read_property(&_0, this_ptr, ZEND_STRL("path"), PH_NOISY_CC | PH_READONLY); @@ -205321,10 +198554,10 @@ static PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) ZEPHIR_INIT_VAR(&_2); zephir_time(&_2); ZEPHIR_INIT_VAR(&time); - zephir_sub_function(&time, &_2, maxlifetime); - ZEPHIR_CALL_FUNCTION(&_3, "glob", NULL, 0, &pattern); + ZVAL_LONG(&time, (zephir_get_numberval(&_2) - maxlifetime)); + ZEPHIR_CALL_FUNCTION(&_3, "glob", NULL, 508, &pattern); zephir_check_call_status(); - zephir_is_iterable(&_3, 0, "phalcon/Session/Adapter/Stream.zep", 108); + zephir_is_iterable(&_3, 0, "phalcon/Session/Adapter/Stream.zep", 111); if (Z_TYPE_P(&_3) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_3), _4) { @@ -205332,7 +198565,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) ZVAL_COPY(&file, _4); _6$$3 = 1 == (zephir_file_exists(&file) == SUCCESS); if (_6$$3) { - ZEPHIR_CALL_FUNCTION(&_7$$3, "is_file", &_8, 0, &file); + ZEPHIR_CALL_FUNCTION(&_7$$3, "is_file", &_8, 507, &file); zephir_check_call_status(); _6$$3 = ZEPHIR_IS_TRUE_IDENTICAL(&_7$$3); } @@ -205343,7 +198576,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) _9$$3 = ZEPHIR_LT(&_10$$3, &time); } if (_9$$3) { - ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_11, 151, &file); + ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_11, 118, &file); zephir_check_call_status(); } } ZEND_HASH_FOREACH_END(); @@ -205360,7 +198593,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) zephir_check_call_status(); _12$$5 = 1 == (zephir_file_exists(&file) == SUCCESS); if (_12$$5) { - ZEPHIR_CALL_FUNCTION(&_13$$5, "is_file", &_8, 0, &file); + ZEPHIR_CALL_FUNCTION(&_13$$5, "is_file", &_8, 507, &file); zephir_check_call_status(); _12$$5 = ZEPHIR_IS_TRUE_IDENTICAL(&_13$$5); } @@ -205371,7 +198604,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) _14$$5 = ZEPHIR_LT(&_15$$5, &time); } if (_14$$5) { - ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_11, 151, &file); + ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_11, 118, &file); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, &_3, "next", NULL, 0); @@ -205448,7 +198681,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Stream, read) ZEPHIR_CALL_METHOD(&pointer, this_ptr, "phpfopen", NULL, 0, &name, &_3$$3); zephir_check_call_status(); ZVAL_LONG(&_4$$3, 1); - ZEPHIR_CALL_FUNCTION(&_5$$3, "flock", NULL, 159, &pointer, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "flock", NULL, 126, &pointer, &_4$$3); zephir_check_call_status(); if (zephir_is_true(&_5$$3)) { ZEPHIR_CALL_METHOD(&data, this_ptr, "phpfilegetcontents", NULL, 0, &name); @@ -205691,7 +198924,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Stream, phpFilePutContents) ZVAL_LONG(&_0, flags); - ZEPHIR_RETURN_CALL_FUNCTION("file_put_contents", NULL, 162, &filename, data, &_0, context); + ZEPHIR_RETURN_CALL_FUNCTION("file_put_contents", NULL, 133, &filename, data, &_0, context); zephir_check_call_status(); RETURN_MM(); } @@ -205721,7 +198954,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Stream, phpFopen) zephir_get_strval(&mode, mode_param); - ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 90, &filename, &mode); + ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 134, &filename, &mode); zephir_check_call_status(); RETURN_MM(); } @@ -205748,7 +198981,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Stream, phpIniGet) zephir_get_strval(&varname, varname_param); - ZEPHIR_RETURN_CALL_FUNCTION("ini_get", NULL, 0, &varname); + ZEPHIR_RETURN_CALL_FUNCTION("ini_get", NULL, 509, &varname); zephir_check_call_status(); RETURN_MM(); } @@ -205775,7 +199008,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Stream, phpIsWritable) zephir_get_strval(&filename, filename_param); - ZEPHIR_RETURN_CALL_FUNCTION("is_writable", NULL, 402, &filename); + ZEPHIR_RETURN_CALL_FUNCTION("is_writable", NULL, 510, &filename); zephir_check_call_status(); RETURN_MM(); } @@ -207264,7 +200497,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuDec) ZVAL_LONG(&_0, step); ZVAL_LONG(&_1, ttl); ZEPHIR_MAKE_REF(success); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_dec", NULL, 131, key, &_0, success, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_dec", NULL, 98, key, &_0, success, &_1); ZEPHIR_UNREF(success); zephir_check_call_status(); RETURN_MM(); @@ -207290,7 +200523,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuDelete) zephir_fetch_params(1, 1, 0, &key); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_delete", NULL, 132, key); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_delete", NULL, 99, key); zephir_check_call_status(); RETURN_MM(); } @@ -207315,7 +200548,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuExists) zephir_fetch_params(1, 1, 0, &key); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_exists", NULL, 133, key); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_exists", NULL, 100, key); zephir_check_call_status(); RETURN_MM(); } @@ -207365,7 +200598,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuInc) ZVAL_LONG(&_0, step); ZVAL_LONG(&_1, ttl); ZEPHIR_MAKE_REF(success); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_inc", NULL, 134, key, &_0, success, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_inc", NULL, 101, key, &_0, success, &_1); ZEPHIR_UNREF(success); zephir_check_call_status(); RETURN_MM(); @@ -207400,7 +200633,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuFetch) ZEPHIR_MAKE_REF(success); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_fetch", NULL, 135, key, success); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_fetch", NULL, 102, key, success); ZEPHIR_UNREF(success); zephir_check_call_status(); RETURN_MM(); @@ -207465,7 +200698,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuStore) ZVAL_LONG(&_0, ttl); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_store", NULL, 136, key, payload, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_store", NULL, 103, key, payload, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -207737,14 +200970,14 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Libmemcached, getAdapter) ZEPHIR_INIT_NVAR(&_7$$4); zephir_fast_array_merge(&_7$$4, &failover, &client); ZEPHIR_CPY_WRT(&client, &_7$$4); - ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "setoptions", NULL, 137, &connection, &client); + ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "setoptions", NULL, 104, &connection, &client); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_10$$4, &_9$$4, "setservers", NULL, 138, &connection, &servers); + ZEPHIR_CALL_METHOD(&_10$$4, &_9$$4, "setservers", NULL, 105, &connection, &servers); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_10$$4, "setsasl", NULL, 139, &connection, &saslUser, &saslPass); + ZEPHIR_CALL_METHOD(NULL, &_10$$4, "setsasl", NULL, 106, &connection, &saslUser, &saslPass); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 140, &connection); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 107, &connection); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("adapter"), &connection); } @@ -208896,17 +202129,17 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Redis, getAdapter) object_init_ex(&connection, zephir_get_internal_ce(SL("redis"))); ZEPHIR_CALL_METHOD(NULL, &connection, "__construct", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "checkconnect", NULL, 141, &connection); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "checkconnect", NULL, 108, &connection); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_2$$3, &_1$$3, "checkauth", NULL, 142, &connection); + ZEPHIR_CALL_METHOD(&_2$$3, &_1$$3, "checkauth", NULL, 109, &connection); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "checkindex", NULL, 143, &connection); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "checkindex", NULL, 110, &connection); zephir_check_call_status(); zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("prefix"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_4$$3, 2); ZEPHIR_CALL_METHOD(NULL, &connection, "setoption", NULL, 0, &_4$$3, &_3$$3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 144, &connection); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 111, &connection); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("adapter"), &connection); } @@ -209306,9 +202539,9 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Redis, checkConnect) object_init_ex(&_4$$5, phalcon_storage_exception_ce); ZEPHIR_INIT_VAR(&_5$$5); ZVAL_STRING(&_5$$5, "Could not connect to the Redisd server [%s:%s]"); - ZEPHIR_CALL_FUNCTION(&_6$$5, "sprintf", NULL, 145, &_5$$5, &host, &port); + ZEPHIR_CALL_FUNCTION(&_6$$5, "sprintf", NULL, 112, &_5$$5, &host, &port); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_4$$5, "__construct", NULL, 31, &_6$$5); + ZEPHIR_CALL_METHOD(NULL, &_4$$5, "__construct", NULL, 29, &_6$$5); zephir_check_call_status(); zephir_throw_exception_debug(&_4$$5, "phalcon/Storage/Adapter/Redis.zep", 291); ZEPHIR_MM_RESTORE(); @@ -209400,34 +202633,34 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Redis, setSerializer) add_assoc_long_ex(&map, SL("redis_php"), 1); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "\\Redis::SERIALIZER_IGBINARY"); - ZEPHIR_CALL_FUNCTION(&_1, "defined", NULL, 146, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "defined", NULL, 113, &_0); zephir_check_call_status(); if (zephir_is_true(&_1)) { ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "\\Redis::SERIALIZER_IGBINARY"); - ZEPHIR_CALL_FUNCTION(&_3$$3, "constant", NULL, 147, &_2$$3); + ZEPHIR_CALL_FUNCTION(&_3$$3, "constant", NULL, 114, &_2$$3); zephir_check_call_status(); zephir_array_update_string(&map, SL("redis_igbinary"), &_3$$3, PH_COPY | PH_SEPARATE); } ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "\\Redis::SERIALIZER_MSGPACK"); - ZEPHIR_CALL_FUNCTION(&_4, "defined", NULL, 146, &_0); + ZEPHIR_CALL_FUNCTION(&_4, "defined", NULL, 113, &_0); zephir_check_call_status(); if (zephir_is_true(&_4)) { ZEPHIR_INIT_VAR(&_5$$4); ZVAL_STRING(&_5$$4, "\\Redis::SERIALIZER_MSGPACK"); - ZEPHIR_CALL_FUNCTION(&_6$$4, "constant", NULL, 147, &_5$$4); + ZEPHIR_CALL_FUNCTION(&_6$$4, "constant", NULL, 114, &_5$$4); zephir_check_call_status(); zephir_array_update_string(&map, SL("redis_msgpack"), &_6$$4, PH_COPY | PH_SEPARATE); } ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "\\Redis::SERIALIZER_JSON"); - ZEPHIR_CALL_FUNCTION(&_7, "defined", NULL, 146, &_0); + ZEPHIR_CALL_FUNCTION(&_7, "defined", NULL, 113, &_0); zephir_check_call_status(); if (zephir_is_true(&_7)) { ZEPHIR_INIT_VAR(&_8$$5); ZVAL_STRING(&_8$$5, "\\Redis::SERIALIZER_JSON"); - ZEPHIR_CALL_FUNCTION(&_9$$5, "constant", NULL, 147, &_8$$5); + ZEPHIR_CALL_FUNCTION(&_9$$5, "constant", NULL, 114, &_8$$5); zephir_check_call_status(); zephir_array_update_string(&map, SL("redis_json"), &_9$$5, PH_COPY | PH_SEPARATE); } @@ -209513,7 +202746,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, __construct) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_storage_exception_ce, "The 'storageDir' must be specified in the options", "phalcon/Storage/Adapter/Stream.zep", 63); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "getdirseparator", NULL, 148, &storageDir); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "getdirseparator", NULL, 115, &storageDir); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("storageDir"), &_2); ZEPHIR_CALL_PARENT(NULL, phalcon_storage_adapter_stream_ce, getThis(), "__construct", &_3, 0, factory, &options); @@ -209549,9 +202782,9 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, clear) result = 1; zephir_read_property(&_0, this_ptr, ZEND_STRL("storageDir"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdirseparator", NULL, 148, &_0); + ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdirseparator", NULL, 115, &_0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 149, &directory); + ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 116, &directory); zephir_check_call_status(); zephir_is_iterable(&iterator, 0, "phalcon/Storage/Adapter/Stream.zep", 94); if (Z_TYPE_P(&iterator) == IS_ARRAY) { @@ -209700,9 +202933,9 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, delete) if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { RETURN_MM_BOOL(0); } - ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 150, &key); + ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 117, &key); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("unlink", NULL, 151, &filepath); + ZEPHIR_RETURN_CALL_FUNCTION("unlink", NULL, 118, &filepath); zephir_check_call_status(); RETURN_MM(); } @@ -209751,17 +202984,17 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, get) } - ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 150, &key); + ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 117, &key); zephir_check_call_status(); if (1 != (zephir_file_exists(&filepath) == SUCCESS)) { RETVAL_ZVAL(defaultValue, 1, 0); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&payload, this_ptr, "getpayload", NULL, 152, &filepath); + ZEPHIR_CALL_METHOD(&payload, this_ptr, "getpayload", NULL, 119, &filepath); zephir_check_call_status(); _0 = ZEPHIR_IS_EMPTY(&payload); if (!(_0)) { - ZEPHIR_CALL_METHOD(&_1, this_ptr, "isexpired", NULL, 153, &payload); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "isexpired", NULL, 120, &payload); zephir_check_call_status(); _0 = zephir_is_true(&_1); } @@ -209831,7 +203064,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, getKeys) ZEPHIR_INIT_VAR(&files); array_init(&files); - ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 154); + ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 121); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, this_ptr, "phpfileexists", NULL, 0, &directory); zephir_check_call_status(); @@ -209839,7 +203072,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, getKeys) array_init(return_value); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 149, &directory); + ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 116, &directory); zephir_check_call_status(); zephir_is_iterable(&iterator, 0, "phalcon/Storage/Adapter/Stream.zep", 200); if (Z_TYPE_P(&iterator) == IS_ARRAY) { @@ -209923,19 +203156,19 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, has) } - ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 150, &key); + ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 117, &key); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, this_ptr, "phpfileexists", NULL, 0, &filepath); zephir_check_call_status(); if (UNEXPECTED(!ZEPHIR_IS_TRUE_IDENTICAL(&_0))) { RETURN_MM_BOOL(0); } - ZEPHIR_CALL_METHOD(&payload, this_ptr, "getpayload", NULL, 152, &filepath); + ZEPHIR_CALL_METHOD(&payload, this_ptr, "getpayload", NULL, 119, &filepath); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_IS_EMPTY(&payload))) { RETURN_MM_BOOL(0); } - ZEPHIR_CALL_METHOD(&_1, this_ptr, "isexpired", NULL, 153, &payload); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "isexpired", NULL, 120, &payload); zephir_check_call_status(); RETURN_MM_BOOL(!zephir_is_true(&_1)); } @@ -210063,7 +203296,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, set) ZEPHIR_CALL_METHOD(&_2, this_ptr, "getserializeddata", NULL, 0, value); zephir_check_call_status(); zephir_array_update_string(&payload, SL("content"), &_2, PH_COPY | PH_SEPARATE); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "storepayload", NULL, 155, &payload, &key); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "storepayload", NULL, 122, &payload, &key); zephir_check_call_status(); RETURN_MM(); } @@ -210113,7 +203346,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, setForever) ZEPHIR_CALL_METHOD(&_1, this_ptr, "getserializeddata", NULL, 0, value); zephir_check_call_status(); zephir_array_update_string(&payload, SL("content"), &_1, PH_COPY | PH_SEPARATE); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "storepayload", NULL, 155, &payload, &key); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "storepayload", NULL, 122, &payload, &key); zephir_check_call_status(); RETURN_MM(); } @@ -210167,18 +203400,18 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, getDir) zephir_read_property(&_1, this_ptr, ZEND_STRL("prefix"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_2); ZEPHIR_CONCAT_VV(&_2, &_0, &_1); - ZEPHIR_CALL_METHOD(&dirPrefix, this_ptr, "getdirseparator", NULL, 148, &_2); + ZEPHIR_CALL_METHOD(&dirPrefix, this_ptr, "getdirseparator", NULL, 115, &_2); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3); zephir_read_property(&_4, this_ptr, ZEND_STRL("prefix"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_5); ZVAL_STRING(&_5, ""); zephir_fast_str_replace(&_3, &_4, &_5, &key); - ZEPHIR_CALL_METHOD(&dirFromFile, this_ptr, "getdirfromfile", NULL, 156, &_3); + ZEPHIR_CALL_METHOD(&dirFromFile, this_ptr, "getdirfromfile", NULL, 123, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6); ZEPHIR_CONCAT_VV(&_6, &dirPrefix, &dirFromFile); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getdirseparator", NULL, 148, &_6); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getdirseparator", NULL, 115, &_6); zephir_check_call_status(); RETURN_MM(); } @@ -210217,7 +203450,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, getFilepath) } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdir", NULL, 154, &key); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdir", NULL, 121, &key); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); zephir_read_property(&_2, this_ptr, ZEND_STRL("prefix"), PH_NOISY_CC | PH_READONLY); @@ -210264,10 +203497,10 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, getIterator) ZEPHIR_INIT_VAR(&_0); object_init_ex(&_0, spl_ce_RecursiveDirectoryIterator); ZVAL_LONG(&_1, 4096); - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 157, &dir, &_1); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 124, &dir, &_1); zephir_check_call_status(); ZVAL_LONG(&_1, 2); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 158, &_0, &_1); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 125, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -210320,7 +203553,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, getPayload) RETURN_MM(); } ZVAL_LONG(&_1, 1); - ZEPHIR_CALL_FUNCTION(&_2, "flock", NULL, 159, &pointer, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "flock", NULL, 126, &pointer, &_1); zephir_check_call_status(); if (EXPECTED(ZEPHIR_IS_TRUE_IDENTICAL(&_2))) { ZEPHIR_CALL_METHOD(&payload, this_ptr, "phpfilegetcontents", NULL, 0, &filepath); @@ -210331,34 +203564,34 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, getPayload) array_init(return_value); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 87); + ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 127); zephir_check_call_status(); ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$false); ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "8.0"); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, ">="); - ZEPHIR_CALL_FUNCTION(&_4, "version_compare", NULL, 88, &version, &_0, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "version_compare", NULL, 128, &version, &_0, &_3); zephir_check_call_status(); if (zephir_is_true(&_4)) { ZEPHIR_INIT_VAR(&_5$$6); ZEPHIR_INIT_NVAR(&_5$$6); - zephir_create_closure_ex(&_5$$6, NULL, phalcon_3__closure_ce, SL("__invoke")); + zephir_create_closure_ex(&_5$$6, NULL, phalcon_1__closure_ce, SL("__invoke")); ZVAL_LONG(&_6$$6, 8); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 89, &_5$$6, &_6$$6); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 129, &_5$$6, &_6$$6); zephir_check_call_status(); } else { ZEPHIR_INIT_VAR(&_7$$7); ZEPHIR_INIT_NVAR(&_7$$7); - zephir_create_closure_ex(&_7$$7, NULL, phalcon_4__closure_ce, SL("__invoke")); + zephir_create_closure_ex(&_7$$7, NULL, phalcon_2__closure_ce, SL("__invoke")); ZVAL_LONG(&_8$$7, 8); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 89, &_7$$7, &_8$$7); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 129, &_7$$7, &_8$$7); zephir_check_call_status(); } ZEPHIR_CALL_FUNCTION(&_9, "unserialize", NULL, 16, &payload); zephir_check_call_status(); ZEPHIR_CPY_WRT(&payload, &_9); - ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 91); + ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 130); zephir_check_call_status(); _10 = ZEPHIR_GLOBAL(warning).enable; if (!(_10)) { @@ -210458,13 +203691,13 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, storePayload) ZEPHIR_CALL_FUNCTION(&_0, "serialize", NULL, 15, &payload); zephir_check_call_status(); ZEPHIR_CPY_WRT(&payload, &_0); - ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 154, &key); + ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 121, &key); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_0, "is_dir", NULL, 160, &directory); + ZEPHIR_CALL_FUNCTION(&_0, "is_dir", NULL, 131, &directory); zephir_check_call_status(); if (!(zephir_is_true(&_0))) { ZVAL_LONG(&_1$$3, 0777); - ZEPHIR_CALL_FUNCTION(NULL, "mkdir", NULL, 161, &directory, &_1$$3, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "mkdir", NULL, 132, &directory, &_1$$3, &__$true); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_3); @@ -210564,7 +203797,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, phpFilePutContents) ZVAL_LONG(&_0, flags); - ZEPHIR_RETURN_CALL_FUNCTION("file_put_contents", NULL, 162, &filename, data, &_0, context); + ZEPHIR_RETURN_CALL_FUNCTION("file_put_contents", NULL, 133, &filename, data, &_0, context); zephir_check_call_status(); RETURN_MM(); } @@ -210594,7 +203827,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, phpFopen) zephir_get_strval(&mode, mode_param); - ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 90, &filename, &mode); + ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 134, &filename, &mode); zephir_check_call_status(); RETURN_MM(); } @@ -210621,7 +203854,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, phpUnlink) zephir_get_strval(&filename, filename_param); - ZEPHIR_RETURN_CALL_FUNCTION("unlink", NULL, 151, &filename); + ZEPHIR_RETURN_CALL_FUNCTION("unlink", NULL, 118, &filename); zephir_check_call_status(); RETURN_MM(); } @@ -210669,7 +203902,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, getDirFromFile) ZVAL_LONG(&_0, 8); - ZEPHIR_CALL_FUNCTION(&name, "pathinfo", NULL, 118, &file, &_0); + ZEPHIR_CALL_FUNCTION(&name, "pathinfo", NULL, 85, &file, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, 0); ZVAL_LONG(&_1, -2); @@ -210692,7 +203925,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, getDirFromFile) } ZEPHIR_INIT_VAR(&_7); ZVAL_LONG(&_8, 2); - ZEPHIR_CALL_FUNCTION(&_9, "str_split", NULL, 117, &start, &_8); + ZEPHIR_CALL_FUNCTION(&_9, "str_split", NULL, 84, &start, &_8); zephir_check_call_status(); zephir_fast_join_str(&_7, SL("/"), &_9); ZEPHIR_CONCAT_VS(return_value, &_7, "/"); @@ -210856,6 +204089,39 @@ static PHP_METHOD(Phalcon_Storage_Serializer_AbstractSerializer, isSerializable) RETURN_BOOL(!(_1)); } +static PHP_METHOD(Phalcon_Storage_Serializer_AbstractSerializer, __serialize) +{ + zval *this_ptr = getThis(); + + + + array_init(return_value); + return; +} + +static PHP_METHOD(Phalcon_Storage_Serializer_AbstractSerializer, __unserialize) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *data_param = NULL; + zval data; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&data); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_ARRAY(data) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &data_param); + zephir_get_arrval(&data, data_param); + + +} + @@ -210893,7 +204159,7 @@ static PHP_METHOD(Phalcon_Storage_Serializer_Base64, serialize) return; } zephir_read_property(&_1, this_ptr, ZEND_STRL("data"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 251, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 224, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -210902,7 +204168,8 @@ static PHP_METHOD(Phalcon_Storage_Serializer_Base64, unserialize) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *data, data_sub, __$true, __$false, result, _0; + zval data_sub, __$true, __$false, result, _0, _1; + zval *data; zval *this_ptr = getThis(); ZVAL_UNDEF(&data_sub); @@ -210910,6 +204177,7 @@ static PHP_METHOD(Phalcon_Storage_Serializer_Base64, unserialize) ZVAL_BOOL(&__$false, 0); ZVAL_UNDEF(&result); ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -210922,12 +204190,14 @@ static PHP_METHOD(Phalcon_Storage_Serializer_Base64, unserialize) zephir_fetch_params(1, 1, 0, &data); - if (Z_TYPE_P(data) != IS_STRING) { + ZEPHIR_INIT_VAR(&_0); + zephir_gettype(&_0, data); + if (!ZEPHIR_IS_STRING_IDENTICAL(&_0, "string")) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Data for the unserializer must of type string", "phalcon/Storage/Serializer/Base64.zep", 47); return; } - ZVAL_BOOL(&_0, 1); - ZEPHIR_CALL_METHOD(&result, this_ptr, "phpbase64decode", NULL, 0, data, &_0); + ZVAL_BOOL(&_1, 1); + ZEPHIR_CALL_METHOD(&result, this_ptr, "phpbase64decode", NULL, 0, data, &_1); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_IS_FALSE_IDENTICAL(&result))) { if (0) { @@ -210974,7 +204244,7 @@ static PHP_METHOD(Phalcon_Storage_Serializer_Base64, phpBase64Decode) ZVAL_BOOL(&_0, (strict ? 1 : 0)); - ZEPHIR_RETURN_CALL_FUNCTION("base64_decode", NULL, 250, &input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("base64_decode", NULL, 223, &input, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -211039,7 +204309,8 @@ static PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, unserialize) zend_bool _8$$4; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *data, data_sub, __$false, __$true, result, version, _0, _1$$4, _2$$4, _3$$4, _4$$5, _5$$5, _6$$6, _7$$6; + zval data_sub, __$false, __$true, result, version, _0, _1$$4, _2$$4, _3$$4, _4$$5, _5$$5, _6$$6, _7$$6; + zval *data; zval *this_ptr = getThis(); ZVAL_UNDEF(&data_sub); @@ -211072,33 +204343,33 @@ static PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, unserialize) if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); } else { - ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 87); + ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 127); zephir_check_call_status(); ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$false); ZEPHIR_INIT_VAR(&_1$$4); ZVAL_STRING(&_1$$4, "8.0"); ZEPHIR_INIT_VAR(&_2$$4); ZVAL_STRING(&_2$$4, ">="); - ZEPHIR_CALL_FUNCTION(&_3$$4, "version_compare", NULL, 88, &version, &_1$$4, &_2$$4); + ZEPHIR_CALL_FUNCTION(&_3$$4, "version_compare", NULL, 128, &version, &_1$$4, &_2$$4); zephir_check_call_status(); if (zephir_is_true(&_3$$4)) { ZEPHIR_INIT_VAR(&_4$$5); ZEPHIR_INIT_NVAR(&_4$$5); - zephir_create_closure_ex(&_4$$5, NULL, phalcon_5__closure_ce, SL("__invoke")); + zephir_create_closure_ex(&_4$$5, NULL, phalcon_3__closure_ce, SL("__invoke")); ZVAL_LONG(&_5$$5, 2); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 89, &_4$$5, &_5$$5); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 129, &_4$$5, &_5$$5); zephir_check_call_status(); } else { ZEPHIR_INIT_VAR(&_6$$6); ZEPHIR_INIT_NVAR(&_6$$6); - zephir_create_closure_ex(&_6$$6, NULL, phalcon_6__closure_ce, SL("__invoke")); + zephir_create_closure_ex(&_6$$6, NULL, phalcon_4__closure_ce, SL("__invoke")); ZVAL_LONG(&_7$$6, 2); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 89, &_6$$6, &_7$$6); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 129, &_6$$6, &_7$$6); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&result, this_ptr, "dounserialize", NULL, 0, data); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 91); + ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 130); zephir_check_call_status(); _8$$4 = ZEPHIR_GLOBAL(warning).enable; if (!(_8$$4)) { @@ -211138,7 +204409,7 @@ static PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, phpIgbinarySerialize) zephir_fetch_params(1, 1, 0, &value); - ZEPHIR_RETURN_CALL_FUNCTION("igbinary_serialize", NULL, 163, value); + ZEPHIR_RETURN_CALL_FUNCTION("igbinary_serialize", NULL, 135, value); zephir_check_call_status(); RETURN_MM(); } @@ -211188,7 +204459,7 @@ static PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, doUnserialize) zephir_fetch_params(1, 1, 0, &value); - ZEPHIR_RETURN_CALL_FUNCTION("igbinary_unserialize", NULL, 164, value); + ZEPHIR_RETURN_CALL_FUNCTION("igbinary_unserialize", NULL, 136, value); zephir_check_call_status(); RETURN_MM(); } @@ -211243,7 +204514,7 @@ static PHP_METHOD(Phalcon_Storage_Serializer_Json, serialize) object_init_ex(&_3$$3, spl_ce_InvalidArgumentException); ZEPHIR_INIT_VAR(&_4$$3); ZEPHIR_CONCAT_SS(&_4$$3, "Data for the JSON serializer cannot be of type 'object' ", "without implementing 'JsonSerializable'"); - ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 40, &_4$$3); + ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 189, &_4$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$3, "phalcon/Storage/Serializer/Json.zep", 29); ZEPHIR_MM_RESTORE(); @@ -211265,7 +204536,8 @@ static PHP_METHOD(Phalcon_Storage_Serializer_Json, unserialize) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *data, data_sub, _0, _1$$4; + zval data_sub, _0, _1$$4; + zval *data; zval *this_ptr = getThis(); ZVAL_UNDEF(&data_sub); @@ -211358,16 +204630,16 @@ static PHP_METHOD(Phalcon_Storage_Serializer_Json, getDecode) ZVAL_LONG(&_2, options); ZEPHIR_INIT_VAR(&decoded); zephir_json_decode(&decoded, &data, zephir_get_intval(&_0) ); - ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 215); + ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 187); zephir_check_call_status(); if (UNEXPECTED(!ZEPHIR_IS_LONG_IDENTICAL(&_3, 0))) { ZEPHIR_INIT_VAR(&_4$$3); object_init_ex(&_4$$3, spl_ce_InvalidArgumentException); - ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 216); + ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 188); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6$$3); ZEPHIR_CONCAT_SV(&_6$$3, "json_decode error: ", &_5$$3); - ZEPHIR_CALL_METHOD(NULL, &_4$$3, "__construct", NULL, 40, &_6$$3); + ZEPHIR_CALL_METHOD(NULL, &_4$$3, "__construct", NULL, 189, &_6$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_4$$3, "phalcon/Storage/Serializer/Json.zep", 71); ZEPHIR_MM_RESTORE(); @@ -211420,16 +204692,16 @@ static PHP_METHOD(Phalcon_Storage_Serializer_Json, getEncode) ZVAL_LONG(&_1, depth); ZEPHIR_INIT_VAR(&encoded); zephir_json_encode(&encoded, data, zephir_get_intval(&_0) ); - ZEPHIR_CALL_FUNCTION(&_2, "json_last_error", NULL, 215); + ZEPHIR_CALL_FUNCTION(&_2, "json_last_error", NULL, 187); zephir_check_call_status(); if (UNEXPECTED(!ZEPHIR_IS_LONG_IDENTICAL(&_2, 0))) { ZEPHIR_INIT_VAR(&_3$$3); object_init_ex(&_3$$3, spl_ce_InvalidArgumentException); - ZEPHIR_CALL_FUNCTION(&_4$$3, "json_last_error_msg", NULL, 216); + ZEPHIR_CALL_FUNCTION(&_4$$3, "json_last_error_msg", NULL, 188); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5$$3); ZEPHIR_CONCAT_SV(&_5$$3, "json_encode error: ", &_4$$3); - ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 40, &_5$$3); + ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 189, &_5$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$3, "phalcon/Storage/Serializer/Json.zep", 92); ZEPHIR_MM_RESTORE(); @@ -211586,7 +204858,8 @@ static PHP_METHOD(Phalcon_Storage_Serializer_None, serialize) static PHP_METHOD(Phalcon_Storage_Serializer_None, unserialize) { - zval *data, data_sub; + zval data_sub; + zval *data; zval *this_ptr = getThis(); ZVAL_UNDEF(&data_sub); @@ -211649,10 +204922,11 @@ static PHP_METHOD(Phalcon_Storage_Serializer_Php, serialize) static PHP_METHOD(Phalcon_Storage_Serializer_Php, unserialize) { - zend_bool _8$$4; + zend_bool _8; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *data, data_sub, __$false, __$true, result, version, _0, _1$$4, _2$$4, _3$$4, _4$$6, _5$$6, _6$$7, _7$$7; + zval data_sub, __$false, __$true, result, version, _0, _1, _2, _3, _4$$4, _5$$4, _6$$5, _7$$5; + zval *data; zval *this_ptr = getThis(); ZVAL_UNDEF(&data_sub); @@ -211661,13 +204935,13 @@ static PHP_METHOD(Phalcon_Storage_Serializer_Php, unserialize) ZVAL_UNDEF(&result); ZVAL_UNDEF(&version); ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1$$4); - ZVAL_UNDEF(&_2$$4); - ZVAL_UNDEF(&_3$$4); - ZVAL_UNDEF(&_4$$6); - ZVAL_UNDEF(&_5$$6); - ZVAL_UNDEF(&_6$$7); - ZVAL_UNDEF(&_7$$7); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_4$$4); + ZVAL_UNDEF(&_5$$4); + ZVAL_UNDEF(&_6$$5); + ZVAL_UNDEF(&_7$$5); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -211684,54 +204958,50 @@ static PHP_METHOD(Phalcon_Storage_Serializer_Php, unserialize) zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); - } else { - if (Z_TYPE_P(data) != IS_STRING) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Data for the unserializer must of type string", "phalcon/Storage/Serializer/Php.zep", 46); - return; - } - ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 87); + RETURN_MM_NULL(); + } + ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 127); + zephir_check_call_status(); + ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$false); + ZEPHIR_INIT_VAR(&_1); + ZVAL_STRING(&_1, "8.0"); + ZEPHIR_INIT_VAR(&_2); + ZVAL_STRING(&_2, ">="); + ZEPHIR_CALL_FUNCTION(&_3, "version_compare", NULL, 128, &version, &_1, &_2); + zephir_check_call_status(); + if (zephir_is_true(&_3)) { + ZEPHIR_INIT_VAR(&_4$$4); + ZEPHIR_INIT_NVAR(&_4$$4); + zephir_create_closure_ex(&_4$$4, NULL, phalcon_11__closure_ce, SL("__invoke")); + ZVAL_LONG(&_5$$4, 8); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 129, &_4$$4, &_5$$4); zephir_check_call_status(); - ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$false); - ZEPHIR_INIT_VAR(&_1$$4); - ZVAL_STRING(&_1$$4, "8.0"); - ZEPHIR_INIT_VAR(&_2$$4); - ZVAL_STRING(&_2$$4, ">="); - ZEPHIR_CALL_FUNCTION(&_3$$4, "version_compare", NULL, 88, &version, &_1$$4, &_2$$4); + } else { + ZEPHIR_INIT_VAR(&_6$$5); + ZEPHIR_INIT_NVAR(&_6$$5); + zephir_create_closure_ex(&_6$$5, NULL, phalcon_12__closure_ce, SL("__invoke")); + ZVAL_LONG(&_7$$5, 8); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 129, &_6$$5, &_7$$5); zephir_check_call_status(); - if (zephir_is_true(&_3$$4)) { - ZEPHIR_INIT_VAR(&_4$$6); - ZEPHIR_INIT_NVAR(&_4$$6); - zephir_create_closure_ex(&_4$$6, NULL, phalcon_13__closure_ce, SL("__invoke")); - ZVAL_LONG(&_5$$6, 8); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 89, &_4$$6, &_5$$6); - zephir_check_call_status(); + } + ZEPHIR_CALL_METHOD(&result, this_ptr, "phpunserialize", NULL, 0, data); + zephir_check_call_status(); + ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 130); + zephir_check_call_status(); + _8 = ZEPHIR_GLOBAL(warning).enable; + if (!(_8)) { + _8 = ZEPHIR_IS_FALSE_IDENTICAL(&result); + } + if (UNEXPECTED(_8)) { + if (0) { + zephir_update_property_zval(this_ptr, ZEND_STRL("isSuccess"), &__$true); } else { - ZEPHIR_INIT_VAR(&_6$$7); - ZEPHIR_INIT_NVAR(&_6$$7); - zephir_create_closure_ex(&_6$$7, NULL, phalcon_14__closure_ce, SL("__invoke")); - ZVAL_LONG(&_7$$7, 8); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 89, &_6$$7, &_7$$7); - zephir_check_call_status(); - } - ZEPHIR_CALL_METHOD(&result, this_ptr, "phpunserialize", NULL, 0, data); - zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 91); - zephir_check_call_status(); - _8$$4 = ZEPHIR_GLOBAL(warning).enable; - if (!(_8$$4)) { - _8$$4 = ZEPHIR_IS_FALSE_IDENTICAL(&result); - } - if (UNEXPECTED(_8$$4)) { - if (0) { - zephir_update_property_zval(this_ptr, ZEND_STRL("isSuccess"), &__$true); - } else { - zephir_update_property_zval(this_ptr, ZEND_STRL("isSuccess"), &__$false); - } - ZEPHIR_INIT_NVAR(&result); - ZVAL_STRING(&result, ""); + zephir_update_property_zval(this_ptr, ZEND_STRL("isSuccess"), &__$false); } - zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &result); + ZEPHIR_INIT_NVAR(&result); + ZVAL_STRING(&result, ""); } + zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &result); ZEPHIR_MM_RESTORE(); } @@ -212443,7 +205713,8 @@ static PHP_METHOD(Phalcon_Support_Collection, offsetExists) zval _0; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *element = NULL, element_sub; + zval element_sub; + zval *element = NULL; zval *this_ptr = getThis(); ZVAL_UNDEF(&element_sub); @@ -212458,7 +205729,6 @@ static PHP_METHOD(Phalcon_Support_Collection, offsetExists) ZEPHIR_MM_GROW(); zephir_fetch_params(1, 1, 0, &element); - ZEPHIR_SEPARATE_PARAM(element); zephir_cast_to_string(&_0, element); @@ -212473,7 +205743,8 @@ static PHP_METHOD(Phalcon_Support_Collection, offsetGet) zval _0; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *element = NULL, element_sub; + zval element_sub; + zval *element = NULL; zval *this_ptr = getThis(); ZVAL_UNDEF(&element_sub); @@ -212488,7 +205759,6 @@ static PHP_METHOD(Phalcon_Support_Collection, offsetGet) ZEPHIR_MM_GROW(); zephir_fetch_params(1, 1, 0, &element); - ZEPHIR_SEPARATE_PARAM(element); zephir_cast_to_string(&_0, element); @@ -212503,7 +205773,8 @@ static PHP_METHOD(Phalcon_Support_Collection, offsetSet) zval _0; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *element = NULL, element_sub, *value, value_sub; + zval element_sub, value_sub; + zval *element = NULL, *value; zval *this_ptr = getThis(); ZVAL_UNDEF(&element_sub); @@ -212520,7 +205791,6 @@ static PHP_METHOD(Phalcon_Support_Collection, offsetSet) ZEPHIR_MM_GROW(); zephir_fetch_params(1, 2, 0, &element, &value); - ZEPHIR_SEPARATE_PARAM(element); zephir_cast_to_string(&_0, element); @@ -212535,7 +205805,8 @@ static PHP_METHOD(Phalcon_Support_Collection, offsetUnset) zval _0; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *element = NULL, element_sub; + zval element_sub; + zval *element = NULL; zval *this_ptr = getThis(); ZVAL_UNDEF(&element_sub); @@ -212550,7 +205821,6 @@ static PHP_METHOD(Phalcon_Support_Collection, offsetUnset) ZEPHIR_MM_GROW(); zephir_fetch_params(1, 1, 0, &element); - ZEPHIR_SEPARATE_PARAM(element); zephir_cast_to_string(&_0, element); @@ -212708,32 +205978,71 @@ static PHP_METHOD(Phalcon_Support_Collection, toJson) static PHP_METHOD(Phalcon_Support_Collection, unserialize) { - zval _0; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *serialized = NULL, serialized_sub, data; + zval *serialized_param = NULL, data; + zval serialized; zval *this_ptr = getThis(); - ZVAL_UNDEF(&serialized_sub); + ZVAL_UNDEF(&serialized); ZVAL_UNDEF(&data); - ZVAL_UNDEF(&_0); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(serialized) + Z_PARAM_STR(serialized) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &serialized); - ZEPHIR_SEPARATE_PARAM(serialized); + zephir_fetch_params(1, 1, 0, &serialized_param); + zephir_get_strval(&serialized, serialized_param); + + + ZEPHIR_CALL_FUNCTION(&data, "unserialize", NULL, 16, &serialized); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "init", NULL, 0, &data); + zephir_check_call_status(); + ZEPHIR_MM_RESTORE(); +} + +static PHP_METHOD(Phalcon_Support_Collection, __serialize) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *this_ptr = getThis(); + + + ZEPHIR_MM_GROW(); - zephir_cast_to_string(&_0, serialized); - ZEPHIR_CPY_WRT(serialized, &_0); - ZEPHIR_CALL_FUNCTION(&data, "unserialize", NULL, 16, serialized); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "toarray", NULL, 0); zephir_check_call_status(); + RETURN_MM(); +} + +static PHP_METHOD(Phalcon_Support_Collection, __unserialize) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *data_param = NULL; + zval data; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&data); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_ARRAY(data) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &data_param); + zephir_get_arrval(&data, data_param); + + ZEPHIR_CALL_METHOD(NULL, this_ptr, "init", NULL, 0, &data); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -213132,7 +206441,7 @@ static PHP_METHOD(Phalcon_Support_Debug, listenLowSeverity) ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "onUncaughtLowSeverity"); zephir_array_fast_append(&_0, &_1); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 89, &_0); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 129, &_0); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); zephir_create_array(&_2, 2, 0); @@ -213174,7 +206483,7 @@ static PHP_METHOD(Phalcon_Support_Debug, onUncaughtException) ZEPHIR_CALL_FUNCTION(&obLevel, "ob_get_level", NULL, 0); zephir_check_call_status(); if (ZEPHIR_GT_LONG(&obLevel, 0)) { - ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 0); + ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 484); zephir_check_call_status(); } zephir_read_static_property_ce(&_0, phalcon_support_debug_ce, SL("isActive"), PH_NOISY_CC | PH_READONLY); @@ -214280,7 +207589,7 @@ static PHP_METHOD(Phalcon_Support_Debug, showTraceItem) } else { ZEPHIR_INIT_VAR(&classReflection); object_init_ex(&classReflection, zephir_get_internal_ce(SL("reflectionclass"))); - ZEPHIR_CALL_METHOD(NULL, &classReflection, "__construct", NULL, 179, &className); + ZEPHIR_CALL_METHOD(NULL, &classReflection, "__construct", NULL, 151, &className); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_8$$5, &classReflection, "isinternal", NULL, 0); zephir_check_call_status(); @@ -214313,7 +207622,7 @@ static PHP_METHOD(Phalcon_Support_Debug, showTraceItem) if ((zephir_function_exists(&functionName) == SUCCESS)) { ZEPHIR_INIT_VAR(&functionReflection); object_init_ex(&functionReflection, zephir_get_internal_ce(SL("reflectionfunction"))); - ZEPHIR_CALL_METHOD(NULL, &functionReflection, "__construct", NULL, 173, &functionName); + ZEPHIR_CALL_METHOD(NULL, &functionReflection, "__construct", NULL, 145, &functionName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_14$$10, &functionReflection, "isinternal", NULL, 0); zephir_check_call_status(); @@ -215201,7 +208510,8 @@ static PHP_METHOD(Phalcon_Support_Registry, offsetGet) zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zephir_fcall_cache_entry *_0 = NULL; - zval *element, element_sub; + zval element_sub; + zval *element; zval *this_ptr = getThis(); ZVAL_UNDEF(&element_sub); @@ -215623,11 +208933,11 @@ static PHP_METHOD(Phalcon_Support_Version, getId) zephir_array_fetch_long(&specialNumber, &version, 4, PH_NOISY, "phalcon/Support/Version.zep", 161); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "%02s"); - ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 145, &_0, &medium); + ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 112, &_0, &medium); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "%02s"); - ZEPHIR_CALL_FUNCTION(&_2, "sprintf", NULL, 145, &_0, &minor); + ZEPHIR_CALL_FUNCTION(&_2, "sprintf", NULL, 112, &_0, &minor); zephir_check_call_status(); ZEPHIR_CONCAT_VVVVV(return_value, &major, &_1, &_2, &special, &specialNumber); RETURN_MM(); @@ -216578,7 +209888,7 @@ static PHP_METHOD(Phalcon_Support_Debug_Dump, output) ZEPHIR_CONCAT_VS(&_45$$11, &_44$$11, "[skipped]\n"); zephir_concat_self(&output, &_45$$11); } else if (_42$$9) { - ZEPHIR_CALL_FUNCTION(&_46$$12, "get_object_vars", NULL, 508, variable); + ZEPHIR_CALL_FUNCTION(&_46$$12, "get_object_vars", NULL, 422, variable); zephir_check_call_status(); zephir_is_iterable(&_46$$12, 0, "phalcon/Support/Debug/Dump.zep", 263); if (Z_TYPE_P(&_46$$12) == IS_ARRAY) { @@ -216669,10 +209979,10 @@ static PHP_METHOD(Phalcon_Support_Debug_Dump, output) } else { ZEPHIR_INIT_VAR(&reflect$$15); object_init_ex(&reflect$$15, zephir_get_internal_ce(SL("reflectionclass"))); - ZEPHIR_CALL_METHOD(NULL, &reflect$$15, "__construct", NULL, 179, variable); + ZEPHIR_CALL_METHOD(NULL, &reflect$$15, "__construct", NULL, 151, variable); zephir_check_call_status(); ZVAL_LONG(&_67$$15, ((1 | 2) | 4)); - ZEPHIR_CALL_METHOD(&props$$15, &reflect$$15, "getproperties", NULL, 183, &_67$$15); + ZEPHIR_CALL_METHOD(&props$$15, &reflect$$15, "getproperties", NULL, 155, &_67$$15); zephir_check_call_status(); zephir_is_iterable(&props$$15, 0, "phalcon/Support/Debug/Dump.zep", 289); if (Z_TYPE_P(&props$$15) == IS_ARRAY) { @@ -216950,7 +210260,7 @@ static PHP_METHOD(Phalcon_Support_Debug_Dump, output) ZEPHIR_CONCAT_VV(return_value, &output, &_145$$26); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_147, "is_float", NULL, 234, variable); + ZEPHIR_CALL_FUNCTION(&_147, "is_float", NULL, 207, variable); zephir_check_call_status(); if (zephir_is_true(&_147)) { ZEPHIR_INIT_VAR(&_148$$27); @@ -217108,16 +210418,16 @@ static PHP_METHOD(Phalcon_Support_Debug_Dump, encode) ZVAL_LONG(&_1, depth); ZEPHIR_INIT_VAR(&encoded); zephir_json_encode(&encoded, data, zephir_get_intval(&_0) ); - ZEPHIR_CALL_FUNCTION(&_2, "json_last_error", NULL, 215); + ZEPHIR_CALL_FUNCTION(&_2, "json_last_error", NULL, 187); zephir_check_call_status(); if (UNEXPECTED(!ZEPHIR_IS_LONG_IDENTICAL(&_2, 0))) { ZEPHIR_INIT_VAR(&_3$$3); object_init_ex(&_3$$3, spl_ce_InvalidArgumentException); - ZEPHIR_CALL_FUNCTION(&_4$$3, "json_last_error_msg", NULL, 216); + ZEPHIR_CALL_FUNCTION(&_4$$3, "json_last_error_msg", NULL, 188); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5$$3); ZEPHIR_CONCAT_SV(&_5$$3, "json_encode error: ", &_4$$3); - ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 40, &_5$$3); + ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 189, &_5$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$3, "phalcon/Support/Debug/Dump.zep", 356); ZEPHIR_MM_RESTORE(); @@ -217299,12 +210609,12 @@ static PHP_METHOD(Phalcon_Support_Helper_Arr_Blacklist, __invoke) ZEPHIR_INIT_VAR(&_0); ZEPHIR_INIT_NVAR(&_0); - zephir_create_closure_ex(&_0, NULL, phalcon_15__closure_ce, SL("__invoke")); + zephir_create_closure_ex(&_0, NULL, phalcon_13__closure_ce, SL("__invoke")); ZEPHIR_CALL_METHOD(&blackListed, this_ptr, "tofilter", NULL, 0, &blackList, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "array_flip", NULL, 128, &blackListed); + ZEPHIR_CALL_FUNCTION(&_1, "array_flip", NULL, 95, &blackListed); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("array_diff_key", NULL, 127, &collection, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("array_diff_key", NULL, 94, &collection, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -217470,7 +210780,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Arr_First, __invoke) ZEPHIR_CALL_METHOD(&filtered, this_ptr, "tofilter", NULL, 0, &collection, method); zephir_check_call_status(); ZEPHIR_MAKE_REF(&filtered); - ZEPHIR_RETURN_CALL_FUNCTION("reset", NULL, 0, &filtered); + ZEPHIR_RETURN_CALL_FUNCTION("reset", NULL, 472, &filtered); ZEPHIR_UNREF(&filtered); zephir_check_call_status(); RETURN_MM(); @@ -217998,7 +211308,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Arr_Group, processCallable) ZEPHIR_CALL_METHOD(&_0, this_ptr, "iscallable", NULL, 0, method); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - ZEPHIR_CALL_FUNCTION(&key, "call_user_func", NULL, 206, method, element); + ZEPHIR_CALL_FUNCTION(&key, "call_user_func", NULL, 178, method, element); zephir_check_call_status(); zephir_array_update_multi(&output, element, SL("za"), 2, &key); } @@ -218182,7 +211492,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Arr_IsUnique, __invoke) zephir_get_arrval(&collection, collection_param); - ZEPHIR_CALL_FUNCTION(&_0, "array_unique", NULL, 198, &collection); + ZEPHIR_CALL_FUNCTION(&_0, "array_unique", NULL, 170, &collection); zephir_check_call_status(); RETURN_MM_BOOL(zephir_fast_count_int(&collection) == zephir_fast_count_int(&_0)); } @@ -218238,7 +211548,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Arr_Last, __invoke) ZEPHIR_CALL_METHOD(&filtered, this_ptr, "tofilter", NULL, 0, &collection, method); zephir_check_call_status(); ZEPHIR_MAKE_REF(&filtered); - ZEPHIR_RETURN_CALL_FUNCTION("end", NULL, 345, &filtered); + ZEPHIR_RETURN_CALL_FUNCTION("end", NULL, 318, &filtered); ZEPHIR_UNREF(&filtered); zephir_check_call_status(); RETURN_MM(); @@ -218294,7 +211604,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Arr_LastKey, __invoke) ZEPHIR_CALL_METHOD(&filtered, this_ptr, "tofilter", NULL, 0, &collection, method); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("array_key_last", NULL, 49, &filtered); + ZEPHIR_RETURN_CALL_FUNCTION("array_key_last", NULL, 36, &filtered); zephir_check_call_status(); RETURN_MM(); } @@ -218767,7 +212077,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Arr_SliceLeft, __invoke) ZVAL_LONG(&_0, 0); ZVAL_LONG(&_1, elements); - ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 0, &collection, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 496, &collection, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -218820,7 +212130,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Arr_SliceRight, __invoke) ZVAL_LONG(&_0, elements); - ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 0, &collection, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 496, &collection, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -219059,10 +212369,10 @@ static PHP_METHOD(Phalcon_Support_Helper_Arr_Whitelist, __invoke) ZEPHIR_INIT_VAR(&_0); ZEPHIR_INIT_NVAR(&_0); - zephir_create_closure_ex(&_0, NULL, phalcon_16__closure_ce, SL("__invoke")); + zephir_create_closure_ex(&_0, NULL, phalcon_14__closure_ce, SL("__invoke")); ZEPHIR_CALL_METHOD(&filtered, this_ptr, "tofilter", NULL, 0, &whiteList, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "array_flip", NULL, 128, &filtered); + ZEPHIR_CALL_FUNCTION(&_1, "array_flip", NULL, 95, &filtered); zephir_check_call_status(); ZEPHIR_RETURN_CALL_FUNCTION("array_intersect_key", NULL, 2, &collection, &_1); zephir_check_call_status(); @@ -219137,7 +212447,7 @@ static PHP_METHOD(Phalcon_Support_Helper_File_Basename, __invoke) ZVAL_STRING(&_2, "/"); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "@"); - ZEPHIR_CALL_FUNCTION(&_4, "preg_quote", NULL, 439, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "preg_quote", NULL, 354, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5); ZEPHIR_CONCAT_SVS(&_5, "@[^", &_4, "]+$@"); @@ -219153,13 +212463,13 @@ static PHP_METHOD(Phalcon_Support_Helper_File_Basename, __invoke) if (1 != ZEPHIR_IS_EMPTY(&suffix)) { ZEPHIR_INIT_VAR(&_6$$3); ZVAL_STRING(&_6$$3, "@"); - ZEPHIR_CALL_FUNCTION(&_7$$3, "preg_quote", NULL, 439, &suffix, &_6$$3); + ZEPHIR_CALL_FUNCTION(&_7$$3, "preg_quote", NULL, 354, &suffix, &_6$$3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_8$$3); ZEPHIR_CONCAT_SVS(&_8$$3, "@", &_7$$3, "$@"); ZEPHIR_INIT_NVAR(&_6$$3); ZVAL_STRING(&_6$$3, ""); - ZEPHIR_CALL_FUNCTION(&_9$$3, "preg_replace", NULL, 50, &_8$$3, &_6$$3, &fileName); + ZEPHIR_CALL_FUNCTION(&_9$$3, "preg_replace", NULL, 37, &_8$$3, &_6$$3, &fileName); zephir_check_call_status(); ZEPHIR_CPY_WRT(&fileName, &_9$$3); } @@ -219238,16 +212548,16 @@ static PHP_METHOD(Phalcon_Support_Helper_Json_Decode, __invoke) ZVAL_LONG(&_2, options); ZEPHIR_INIT_VAR(&decoded); zephir_json_decode(&decoded, &data, zephir_get_intval(&_0) ); - ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 215); + ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 187); zephir_check_call_status(); if (!ZEPHIR_IS_LONG_IDENTICAL(&_3, 0)) { ZEPHIR_INIT_VAR(&_4$$3); object_init_ex(&_4$$3, spl_ce_InvalidArgumentException); - ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 216); + ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 188); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6$$3); ZEPHIR_CONCAT_SV(&_6$$3, "json_decode error: ", &_5$$3); - ZEPHIR_CALL_METHOD(NULL, &_4$$3, "__construct", NULL, 40, &_6$$3); + ZEPHIR_CALL_METHOD(NULL, &_4$$3, "__construct", NULL, 189, &_6$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_4$$3, "phalcon/Support/Helper/Json/Decode.zep", 45); ZEPHIR_MM_RESTORE(); @@ -219324,12 +212634,12 @@ static PHP_METHOD(Phalcon_Support_Helper_Json_Encode, __invoke) ZVAL_LONG(&_2, depth); ZEPHIR_INIT_NVAR(&encoded); zephir_json_encode(&encoded, data, zephir_get_intval(&_1) ); - ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 215); + ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 187); zephir_check_call_status(); if (!ZEPHIR_IS_LONG_IDENTICAL(&_3, 0)) { ZEPHIR_INIT_VAR(&_4$$3); object_init_ex(&_4$$3, zephir_get_internal_ce(SL("jsonexception"))); - ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 216); + ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 188); zephir_check_call_status(); ZVAL_LONG(&_6$$3, 5); ZEPHIR_CALL_METHOD(NULL, &_4$$3, "__construct", NULL, 0, &_5$$3, &_6$$3); @@ -219752,7 +213062,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Str_Camelize, __invoke) ZEPHIR_CALL_PARENT(&result, phalcon_support_helper_str_camelize_ce, getThis(), "__invoke", &_0, 0, &text, &delimiters); zephir_check_call_status(); if (lowerFirst == 1) { - ZEPHIR_CALL_FUNCTION(&_1$$3, "lcfirst", NULL, 104, &result); + ZEPHIR_CALL_FUNCTION(&_1$$3, "lcfirst", NULL, 73, &result); zephir_check_call_status(); ZEPHIR_CPY_WRT(&result, &_1$$3); } @@ -219808,19 +213118,19 @@ static PHP_METHOD(Phalcon_Support_Helper_Str_Concat, __invoke) return; } ZEPHIR_MAKE_REF(&arguments); - ZEPHIR_CALL_FUNCTION(&delimiter, "reset", NULL, 0, &arguments); + ZEPHIR_CALL_FUNCTION(&delimiter, "reset", NULL, 472, &arguments); ZEPHIR_UNREF(&arguments); zephir_check_call_status(); ZVAL_LONG(&_0, 1); - ZEPHIR_CALL_FUNCTION(&_1, "array_slice", NULL, 0, &arguments, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "array_slice", NULL, 496, &arguments, &_0); zephir_check_call_status(); ZEPHIR_CPY_WRT(&arguments, &_1); ZEPHIR_MAKE_REF(&arguments); - ZEPHIR_CALL_FUNCTION(&first, "reset", NULL, 0, &arguments); + ZEPHIR_CALL_FUNCTION(&first, "reset", NULL, 472, &arguments); ZEPHIR_UNREF(&arguments); zephir_check_call_status(); ZEPHIR_MAKE_REF(&arguments); - ZEPHIR_CALL_FUNCTION(&last, "end", NULL, 345, &arguments); + ZEPHIR_CALL_FUNCTION(&last, "end", NULL, 318, &arguments); ZEPHIR_UNREF(&arguments); zephir_check_call_status(); ZEPHIR_INIT_VAR(&prefix); @@ -219985,7 +213295,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Str_Decapitalize, __invoke) ZVAL_LONG(&_0, 1); - ZEPHIR_CALL_FUNCTION(&substr, "mb_substr", NULL, 248, &text, &_0); + ZEPHIR_CALL_FUNCTION(&substr, "mb_substr", NULL, 221, &text, &_0); zephir_check_call_status(); if (upperRest) { ZEPHIR_CALL_METHOD(&suffix, this_ptr, "toupper", NULL, 0, &substr, &encoding); @@ -219995,7 +213305,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Str_Decapitalize, __invoke) } ZVAL_LONG(&_0, 0); ZVAL_LONG(&_2, 1); - ZEPHIR_CALL_FUNCTION(&_3, "mb_substr", NULL, 248, &text, &_0, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "mb_substr", NULL, 221, &text, &_0, &_2); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_1, this_ptr, "tolower", NULL, 0, &_3, &encoding); zephir_check_call_status(); @@ -220133,16 +213443,16 @@ static PHP_METHOD(Phalcon_Support_Helper_Str_DirFromFile, __invoke) ZVAL_LONG(&_0, 8); - ZEPHIR_CALL_FUNCTION(&name, "pathinfo", NULL, 118, &file, &_0); + ZEPHIR_CALL_FUNCTION(&name, "pathinfo", NULL, 85, &file, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, 0); ZVAL_LONG(&_1, -2); - ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 248, &name, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 221, &name, &_0, &_1); zephir_check_call_status(); if (!zephir_is_true(&start)) { ZVAL_LONG(&_2$$3, 0); ZVAL_LONG(&_3$$3, 1); - ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 248, &name, &_2$$3, &_3$$3); + ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 221, &name, &_2$$3, &_3$$3); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_4); @@ -220310,9 +213620,9 @@ static PHP_METHOD(Phalcon_Support_Helper_Str_Dynamic, __invoke) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_FUNCTION(&ldS, "preg_quote", NULL, 439, &leftDelimiter); + ZEPHIR_CALL_FUNCTION(&ldS, "preg_quote", NULL, 354, &leftDelimiter); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&rdS, "preg_quote", NULL, 439, &rightDelimiter); + ZEPHIR_CALL_FUNCTION(&rdS, "preg_quote", NULL, 354, &rightDelimiter); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); ZEPHIR_CONCAT_SVSVVSVS(&_4, "/", &ldS, "([^", &ldS, &rdS, "]+)", &rdS, "/"); @@ -220342,16 +213652,16 @@ static PHP_METHOD(Phalcon_Support_Helper_Str_Dynamic, __invoke) ZEPHIR_INIT_NVAR(&words); zephir_fast_explode(&words, &separator, &_9$$6, LONG_MAX); ZEPHIR_OBS_NVAR(&word); - ZEPHIR_CALL_FUNCTION(&_10$$6, "array_rand", &_11, 221, &words); + ZEPHIR_CALL_FUNCTION(&_10$$6, "array_rand", &_11, 194, &words); zephir_check_call_status(); zephir_array_fetch(&word, &words, &_10$$6, PH_NOISY, "phalcon/Support/Helper/Str/Dynamic.zep", 62); zephir_array_fetch_long(&_12$$6, &match, 0, PH_NOISY | PH_READONLY, "phalcon/Support/Helper/Str/Dynamic.zep", 63); - ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 439, &_12$$6, &separator); + ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 354, &_12$$6, &separator); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_13$$6); ZEPHIR_CONCAT_SVS(&_13$$6, "/", &sub, "/"); ZVAL_LONG(&_14$$6, 1); - ZEPHIR_CALL_FUNCTION(&_15$$6, "preg_replace", &_16, 50, &_13$$6, &word, &text, &_14$$6); + ZEPHIR_CALL_FUNCTION(&_15$$6, "preg_replace", &_16, 37, &_13$$6, &word, &text, &_14$$6); zephir_check_call_status(); zephir_get_strval(&text, &_15$$6); } ZEND_HASH_FOREACH_END(); @@ -220377,16 +213687,16 @@ static PHP_METHOD(Phalcon_Support_Helper_Str_Dynamic, __invoke) ZEPHIR_INIT_NVAR(&words); zephir_fast_explode(&words, &separator, &_18$$8, LONG_MAX); ZEPHIR_OBS_NVAR(&word); - ZEPHIR_CALL_FUNCTION(&_19$$8, "array_rand", &_11, 221, &words); + ZEPHIR_CALL_FUNCTION(&_19$$8, "array_rand", &_11, 194, &words); zephir_check_call_status(); zephir_array_fetch(&word, &words, &_19$$8, PH_NOISY, "phalcon/Support/Helper/Str/Dynamic.zep", 62); zephir_array_fetch_long(&_20$$8, &match, 0, PH_NOISY | PH_READONLY, "phalcon/Support/Helper/Str/Dynamic.zep", 63); - ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 439, &_20$$8, &separator); + ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 354, &_20$$8, &separator); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_21$$8); ZEPHIR_CONCAT_SVS(&_21$$8, "/", &sub, "/"); ZVAL_LONG(&_22$$8, 1); - ZEPHIR_CALL_FUNCTION(&_23$$8, "preg_replace", &_16, 50, &_21$$8, &word, &text, &_22$$8); + ZEPHIR_CALL_FUNCTION(&_23$$8, "preg_replace", &_16, 37, &_21$$8, &word, &text, &_22$$8); zephir_check_call_status(); zephir_get_strval(&text, &_23$$8); ZEPHIR_CALL_METHOD(NULL, &matches, "next", NULL, 0); @@ -220647,7 +213957,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Str_Friendly, __invoke) ZVAL_STRING(&_4, "/[^a-zA-Z0-9\\/_|+ -]/"); ZEPHIR_INIT_VAR(&_5); ZVAL_STRING(&_5, ""); - ZEPHIR_CALL_FUNCTION(&friendly, "preg_replace", NULL, 50, &_4, &_5, &text); + ZEPHIR_CALL_FUNCTION(&friendly, "preg_replace", NULL, 37, &_4, &_5, &text); zephir_check_call_status(); if (lowercase) { ZEPHIR_INIT_VAR(&_6$$5); @@ -220656,7 +213966,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Str_Friendly, __invoke) } ZEPHIR_INIT_NVAR(&_4); ZVAL_STRING(&_4, "/[\\/_|+ -]+/"); - ZEPHIR_CALL_FUNCTION(&_7, "preg_replace", NULL, 50, &_4, &separator, &friendly); + ZEPHIR_CALL_FUNCTION(&_7, "preg_replace", NULL, 37, &_4, &separator, &friendly); zephir_check_call_status(); ZEPHIR_CPY_WRT(&friendly, &_7); zephir_fast_trim(return_value, &friendly, &separator, ZEPHIR_TRIM_BOTH); @@ -220891,7 +214201,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Str_Humanize, __invoke) ZVAL_STRING(&_1, "#[_-]+#"); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, " "); - ZEPHIR_CALL_FUNCTION(&result, "preg_replace", NULL, 50, &_1, &_2, &_0); + ZEPHIR_CALL_FUNCTION(&result, "preg_replace", NULL, 37, &_1, &_2, &_0); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_1); if (Z_TYPE_P(&result) == IS_NULL) { @@ -220945,7 +214255,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Str_Includes, __invoke) zephir_get_strval(&needle, needle_param); - ZEPHIR_CALL_FUNCTION(&_0, "mb_strpos", NULL, 113, &haystack, &needle); + ZEPHIR_CALL_FUNCTION(&_0, "mb_strpos", NULL, 82, &haystack, &needle); zephir_check_call_status(); RETURN_MM_BOOL(!ZEPHIR_IS_FALSE_IDENTICAL(&_0)); } @@ -221447,7 +214757,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Str_Len, __invoke) } - ZEPHIR_RETURN_CALL_FUNCTION("mb_strlen", NULL, 254, &text, &encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strlen", NULL, 227, &text, &encoding); zephir_check_call_status(); RETURN_MM(); } @@ -221559,8 +214869,8 @@ static PHP_METHOD(Phalcon_Support_Helper_Str_PascalCase, __invoke) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0); ZEPHIR_INIT_NVAR(&_0); - zephir_create_closure_ex(&_0, NULL, phalcon_2__closure_ce, SL("__invoke")); - ZEPHIR_CALL_FUNCTION(&output, "array_map", NULL, 97, &_0, &exploded); + zephir_create_closure_ex(&_0, NULL, phalcon_0__closure_ce, SL("__invoke")); + ZEPHIR_CALL_FUNCTION(&output, "array_map", NULL, 66, &_0, &exploded); zephir_check_call_status(); zephir_fast_join_str(return_value, SL(""), &output); RETURN_MM(); @@ -221656,7 +214966,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Str_PascalCase, processArray) ZEPHIR_CONCAT_SVS(&_10, "/[", &delimiters, "]+/"); ZVAL_LONG(&_11, -1); ZVAL_LONG(&_12, (2 | 1)); - ZEPHIR_CALL_FUNCTION(&result, "preg_split", NULL, 98, &_10, &text, &_11, &_12); + ZEPHIR_CALL_FUNCTION(&result, "preg_split", NULL, 67, &_10, &text, &_11, &_12); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_13); if (ZEPHIR_IS_FALSE_IDENTICAL(&result)) { @@ -221817,61 +215127,61 @@ static PHP_METHOD(Phalcon_Support_Helper_Str_Random, __invoke) ZVAL_STRING(&_3, "a"); ZEPHIR_INIT_VAR(&_4); ZVAL_STRING(&_4, "z"); - ZEPHIR_CALL_FUNCTION(&_5, "range", NULL, 338, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&_5, "range", NULL, 311, &_3, &_4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "A"); ZEPHIR_INIT_NVAR(&_4); ZVAL_STRING(&_4, "Z"); - ZEPHIR_CALL_FUNCTION(&_6, "range", NULL, 338, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&_6, "range", NULL, 311, &_3, &_4); zephir_check_call_status(); zephir_fast_array_merge(&_2, &_5, &_6); zephir_array_update_long(&pools, 1, &_2, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); ZEPHIR_INIT_NVAR(&_2); ZVAL_LONG(&_7, 0); ZVAL_LONG(&_8, 9); - ZEPHIR_CALL_FUNCTION(&_9, "range", NULL, 338, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_9, "range", NULL, 311, &_7, &_8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "a"); ZEPHIR_INIT_NVAR(&_4); ZVAL_STRING(&_4, "f"); - ZEPHIR_CALL_FUNCTION(&_10, "range", NULL, 338, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&_10, "range", NULL, 311, &_3, &_4); zephir_check_call_status(); zephir_fast_array_merge(&_2, &_9, &_10); zephir_array_update_long(&pools, 2, &_2, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); ZVAL_LONG(&_7, 0); ZVAL_LONG(&_8, 9); - ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 338, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 311, &_7, &_8); zephir_check_call_status(); zephir_array_update_long(&pools, 3, &_11, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); ZVAL_LONG(&_7, 1); ZVAL_LONG(&_8, 9); - ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 338, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 311, &_7, &_8); zephir_check_call_status(); zephir_array_update_long(&pools, 4, &_11, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "2345679ACDEFHJKLMNPRSTUVWXYZ"); - ZEPHIR_CALL_FUNCTION(&_11, "str_split", NULL, 117, &_2); + ZEPHIR_CALL_FUNCTION(&_11, "str_split", NULL, 84, &_2); zephir_check_call_status(); zephir_array_update_long(&pools, 5, &_11, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); ZVAL_LONG(&_7, 0); ZVAL_LONG(&_8, 9); - ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 338, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 311, &_7, &_8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "a"); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "z"); - ZEPHIR_CALL_FUNCTION(&_12, "range", NULL, 338, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_12, "range", NULL, 311, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "A"); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Z"); - ZEPHIR_CALL_FUNCTION(&_13, "range", NULL, 338, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_13, "range", NULL, 311, &_2, &_3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_14, "array_merge", NULL, 355, &_11, &_12, &_13); + ZEPHIR_CALL_FUNCTION(&_14, "array_merge", NULL, 328, &_11, &_12, &_13); zephir_check_call_status(); zephir_array_update_long(&pools, 0, &_14, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); zephir_array_fetch_long(&_15, &pools, type, PH_NOISY | PH_READONLY, "phalcon/Support/Helper/Str/Random.zep", 66); @@ -221935,7 +215245,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Str_ReduceSlashes, __invoke) ZVAL_STRING(&_0, "#(?= 80000 @@ -629,6 +639,8 @@ ZEPHIR_INIT_FUNCS(phalcon_storage_serializer_abstractserializer_method_entry) { PHP_ME(Phalcon_Storage_Serializer_AbstractSerializer, isSuccess, arginfo_phalcon_storage_serializer_abstractserializer_issuccess, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Storage_Serializer_AbstractSerializer, setData, arginfo_phalcon_storage_serializer_abstractserializer_setdata, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Storage_Serializer_AbstractSerializer, isSerializable, arginfo_phalcon_storage_serializer_abstractserializer_isserializable, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Storage_Serializer_AbstractSerializer, __serialize, arginfo_phalcon_storage_serializer_abstractserializer___serialize, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Storage_Serializer_AbstractSerializer, __unserialize, arginfo_phalcon_storage_serializer_abstractserializer___unserialize, ZEND_ACC_PUBLIC) PHP_FE_END }; @@ -1291,6 +1303,8 @@ static PHP_METHOD(Phalcon_Support_Collection, serialize); static PHP_METHOD(Phalcon_Support_Collection, toArray); static PHP_METHOD(Phalcon_Support_Collection, toJson); static PHP_METHOD(Phalcon_Support_Collection, unserialize); +static PHP_METHOD(Phalcon_Support_Collection, __serialize); +static PHP_METHOD(Phalcon_Support_Collection, __unserialize); static PHP_METHOD(Phalcon_Support_Collection, setData); static PHP_METHOD(Phalcon_Support_Collection, phpJsonEncode); static PHP_METHOD(Phalcon_Support_Collection, processKey); @@ -1366,7 +1380,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_offse ZEND_ARG_INFO(0, element) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_support_collection_offsetget, 0, 0, 1) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_offsetget, 0, 1, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_offsetget, 0, 1, IS_NULL, 0) +#endif ZEND_ARG_INFO(0, element) ZEND_END_ARG_INFO() @@ -1402,9 +1420,22 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_tojso ZEND_ARG_TYPE_INFO(0, options, IS_LONG, 0) ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_unserialize, 0, 1, IS_VOID, 0) + ZEND_ARG_TYPE_INFO(0, serialized, IS_STRING, 0) +ZEND_END_ARG_INFO() +#else ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_unserialize, 0, 1, IS_VOID, 0) + ZEND_ARG_INFO(0, serialized) +ZEND_END_ARG_INFO() +#endif - ZEND_ARG_INFO(0, serialized) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection___serialize, 0, 0, IS_ARRAY, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection___unserialize, 0, 1, IS_VOID, 0) + + ZEND_ARG_ARRAY_INFO(0, data, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_setdata, 0, 2, IS_VOID, 0) @@ -1451,6 +1482,8 @@ ZEPHIR_INIT_FUNCS(phalcon_support_collection_method_entry) { PHP_ME(Phalcon_Support_Collection, toArray, arginfo_phalcon_support_collection_toarray, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Support_Collection, toJson, arginfo_phalcon_support_collection_tojson, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Support_Collection, unserialize, arginfo_phalcon_support_collection_unserialize, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Support_Collection, __serialize, arginfo_phalcon_support_collection___serialize, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Support_Collection, __unserialize, arginfo_phalcon_support_collection___unserialize, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Support_Collection, setData, arginfo_phalcon_support_collection_setdata, ZEND_ACC_PROTECTED) PHP_ME(Phalcon_Support_Collection, phpJsonEncode, arginfo_phalcon_support_collection_phpjsonencode, ZEND_ACC_PROTECTED) PHP_ME(Phalcon_Support_Collection, processKey, arginfo_phalcon_support_collection_processkey, ZEND_ACC_PROTECTED) @@ -1480,13 +1513,22 @@ ZEPHIR_INIT_CLASS(Phalcon_Storage_Serializer_None); static PHP_METHOD(Phalcon_Storage_Serializer_None, serialize); static PHP_METHOD(Phalcon_Storage_Serializer_None, unserialize); -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_none_serialize, 0, 0, IS_STRING, 0) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_none_serialize, 0, 0, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_none_serialize, 0, 0, IS_NULL, 0) +#endif ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_none_unserialize, 0, 1, IS_VOID, 0) - - ZEND_ARG_INFO(0, data) + ZEND_ARG_TYPE_INFO(0, serialized, IS_STRING, 0) ZEND_END_ARG_INFO() +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_none_unserialize, 0, 1, IS_VOID, 0) + ZEND_ARG_INFO(0, serialized) +ZEND_END_ARG_INFO() +#endif ZEPHIR_INIT_FUNCS(phalcon_storage_serializer_none_method_entry) { PHP_ME(Phalcon_Storage_Serializer_None, serialize, arginfo_phalcon_storage_serializer_none_serialize, ZEND_ACC_PUBLIC) @@ -1778,36 +1820,6 @@ ZEPHIR_INIT_FUNCS(phalcon_config_configinterface_method_entry) { PHP_FE_END }; -zend_class_entry *phalcon_http_message_abstractcommon_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_AbstractCommon); - -static PHP_METHOD(Phalcon_Http_Message_AbstractCommon, cloneInstance); -static PHP_METHOD(Phalcon_Http_Message_AbstractCommon, checkStringParameter); -static PHP_METHOD(Phalcon_Http_Message_AbstractCommon, processWith); - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_abstractcommon_cloneinstance, 0, 0, 2) - ZEND_ARG_INFO(0, element) - ZEND_ARG_TYPE_INFO(0, property, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_abstractcommon_checkstringparameter, 0, 1, IS_VOID, 0) - - ZEND_ARG_INFO(0, element) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_abstractcommon_processwith, 0, 0, 2) - ZEND_ARG_INFO(0, element) - ZEND_ARG_TYPE_INFO(0, property, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_http_message_abstractcommon_method_entry) { - PHP_ME(Phalcon_Http_Message_AbstractCommon, cloneInstance, arginfo_phalcon_http_message_abstractcommon_cloneinstance, ZEND_ACC_FINAL|ZEND_ACC_PROTECTED) - PHP_ME(Phalcon_Http_Message_AbstractCommon, checkStringParameter, arginfo_phalcon_http_message_abstractcommon_checkstringparameter, ZEND_ACC_FINAL|ZEND_ACC_PROTECTED) - PHP_ME(Phalcon_Http_Message_AbstractCommon, processWith, arginfo_phalcon_http_message_abstractcommon_processwith, ZEND_ACC_FINAL|ZEND_ACC_PROTECTED) - PHP_FE_END -}; - zend_class_entry *phalcon_mvc_model_metadatainterface_ce; ZEPHIR_INIT_CLASS(Phalcon_Mvc_Model_MetaDataInterface); @@ -2565,11 +2577,6 @@ ZEPHIR_INIT_FUNCS(phalcon_db_adapter_adapterinterface_method_entry) { PHP_FE_END }; -zend_class_entry *phalcon_http_message_requestmethodinterface_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_RequestMethodInterface); - - zend_class_entry *phalcon_mvc_model_metadata_ce; ZEPHIR_INIT_CLASS(Phalcon_Mvc_Model_MetaData); @@ -3648,150 +3655,6 @@ ZEPHIR_INIT_FUNCS(phalcon_html_link_interfaces_linkproviderinterface_method_entr PHP_FE_END }; -zend_class_entry *phalcon_http_message_abstractmessage_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_AbstractMessage); - -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, getBody); -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, getProtocolVersion); -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, getUri); -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, getHeader); -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, getHeaderLine); -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, getHeaders); -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, hasHeader); -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, withAddedHeader); -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, withBody); -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, withHeader); -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, withProtocolVersion); -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, withoutHeader); -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, checkHeaderHost); -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, checkHeaderName); -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, checkHeaderValue); -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, getHeaderValue); -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, getUriHost); -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, populateHeaderCollection); -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, processBody); -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, processHeaders); -static PHP_METHOD(Phalcon_Http_Message_AbstractMessage, processProtocol); - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_abstractmessage_getbody, 0, 0, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_abstractmessage_getprotocolversion, 0, 0, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_abstractmessage_geturi, 0, 0, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_abstractmessage_getheader, 0, 1, IS_ARRAY, 0) - ZEND_ARG_INFO(0, name) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_abstractmessage_getheaderline, 0, 1, IS_STRING, 0) - ZEND_ARG_INFO(0, name) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_abstractmessage_getheaders, 0, 0, IS_ARRAY, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_abstractmessage_hasheader, 0, 1, _IS_BOOL, 0) - ZEND_ARG_INFO(0, name) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_abstractmessage_withaddedheader, 0, 0, 2) - ZEND_ARG_INFO(0, name) - ZEND_ARG_INFO(0, value) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_abstractmessage_withbody, 0, 0, 1) - ZEND_ARG_OBJ_INFO(0, body, Psr\\Http\\Message\\StreamInterface, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_abstractmessage_withheader, 0, 0, 2) - ZEND_ARG_INFO(0, name) - ZEND_ARG_INFO(0, value) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_abstractmessage_withprotocolversion, 0, 0, 1) - ZEND_ARG_INFO(0, version) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_abstractmessage_withoutheader, 0, 0, 1) - ZEND_ARG_INFO(0, name) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_abstractmessage_checkheaderhost, 0, 1, Phalcon\\Support\\Collection\\CollectionInterface, 0) - ZEND_ARG_OBJ_INFO(0, collection, Phalcon\\Support\\Collection\\CollectionInterface, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_abstractmessage_checkheadername, 0, 1, IS_VOID, 0) - - ZEND_ARG_INFO(0, name) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_abstractmessage_checkheadervalue, 0, 1, IS_VOID, 0) - - ZEND_ARG_INFO(0, value) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_abstractmessage_getheadervalue, 0, 1, IS_ARRAY, 0) - ZEND_ARG_INFO(0, values) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_abstractmessage_geturihost, 0, 1, IS_STRING, 0) - ZEND_ARG_OBJ_INFO(0, uri, Psr\\Http\\Message\\UriInterface, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_abstractmessage_populateheadercollection, 0, 1, Phalcon\\Support\\Collection\\CollectionInterface, 0) - ZEND_ARG_ARRAY_INFO(0, headers, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_abstractmessage_processbody, 0, 0, Psr\\Http\\Message\\StreamInterface, 0) - ZEND_ARG_INFO(0, body) - ZEND_ARG_TYPE_INFO(0, mode, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_abstractmessage_processheaders, 0, 1, Phalcon\\Support\\Collection\\CollectionInterface, 0) - ZEND_ARG_INFO(0, headers) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_abstractmessage_processprotocol, 0, 0, IS_STRING, 0) - ZEND_ARG_INFO(0, protocol) -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_http_message_abstractmessage_method_entry) { -#if PHP_VERSION_ID >= 80000 - PHP_ME(Phalcon_Http_Message_AbstractMessage, getBody, arginfo_phalcon_http_message_abstractmessage_getbody, ZEND_ACC_PUBLIC) -#else - PHP_ME(Phalcon_Http_Message_AbstractMessage, getBody, NULL, ZEND_ACC_PUBLIC) -#endif - PHP_ME(Phalcon_Http_Message_AbstractMessage, getProtocolVersion, arginfo_phalcon_http_message_abstractmessage_getprotocolversion, ZEND_ACC_PUBLIC) -#if PHP_VERSION_ID >= 80000 - PHP_ME(Phalcon_Http_Message_AbstractMessage, getUri, arginfo_phalcon_http_message_abstractmessage_geturi, ZEND_ACC_PUBLIC) -#else - PHP_ME(Phalcon_Http_Message_AbstractMessage, getUri, NULL, ZEND_ACC_PUBLIC) -#endif - PHP_ME(Phalcon_Http_Message_AbstractMessage, getHeader, arginfo_phalcon_http_message_abstractmessage_getheader, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_AbstractMessage, getHeaderLine, arginfo_phalcon_http_message_abstractmessage_getheaderline, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_AbstractMessage, getHeaders, arginfo_phalcon_http_message_abstractmessage_getheaders, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_AbstractMessage, hasHeader, arginfo_phalcon_http_message_abstractmessage_hasheader, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_AbstractMessage, withAddedHeader, arginfo_phalcon_http_message_abstractmessage_withaddedheader, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_AbstractMessage, withBody, arginfo_phalcon_http_message_abstractmessage_withbody, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_AbstractMessage, withHeader, arginfo_phalcon_http_message_abstractmessage_withheader, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_AbstractMessage, withProtocolVersion, arginfo_phalcon_http_message_abstractmessage_withprotocolversion, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_AbstractMessage, withoutHeader, arginfo_phalcon_http_message_abstractmessage_withoutheader, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_AbstractMessage, checkHeaderHost, arginfo_phalcon_http_message_abstractmessage_checkheaderhost, ZEND_ACC_FINAL|ZEND_ACC_PROTECTED) - PHP_ME(Phalcon_Http_Message_AbstractMessage, checkHeaderName, arginfo_phalcon_http_message_abstractmessage_checkheadername, ZEND_ACC_FINAL|ZEND_ACC_PROTECTED) - PHP_ME(Phalcon_Http_Message_AbstractMessage, checkHeaderValue, arginfo_phalcon_http_message_abstractmessage_checkheadervalue, ZEND_ACC_FINAL|ZEND_ACC_PROTECTED) - PHP_ME(Phalcon_Http_Message_AbstractMessage, getHeaderValue, arginfo_phalcon_http_message_abstractmessage_getheadervalue, ZEND_ACC_FINAL|ZEND_ACC_PROTECTED) - PHP_ME(Phalcon_Http_Message_AbstractMessage, getUriHost, arginfo_phalcon_http_message_abstractmessage_geturihost, ZEND_ACC_FINAL|ZEND_ACC_PROTECTED) - PHP_ME(Phalcon_Http_Message_AbstractMessage, populateHeaderCollection, arginfo_phalcon_http_message_abstractmessage_populateheadercollection, ZEND_ACC_FINAL|ZEND_ACC_PROTECTED) - PHP_ME(Phalcon_Http_Message_AbstractMessage, processBody, arginfo_phalcon_http_message_abstractmessage_processbody, ZEND_ACC_FINAL|ZEND_ACC_PROTECTED) - PHP_ME(Phalcon_Http_Message_AbstractMessage, processHeaders, arginfo_phalcon_http_message_abstractmessage_processheaders, ZEND_ACC_FINAL|ZEND_ACC_PROTECTED) - PHP_ME(Phalcon_Http_Message_AbstractMessage, processProtocol, arginfo_phalcon_http_message_abstractmessage_processprotocol, ZEND_ACC_FINAL|ZEND_ACC_PROTECTED) - PHP_FE_END -}; - zend_class_entry *phalcon_logger_adapter_adapterinterface_ce; ZEPHIR_INIT_CLASS(Phalcon_Logger_Adapter_AdapterInterface); @@ -5094,152 +4957,6 @@ ZEPHIR_INIT_FUNCS(phalcon_html_helper_abstractlist_method_entry) { PHP_FE_END }; -zend_class_entry *phalcon_http_message_stream_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_Stream); - -static PHP_METHOD(Phalcon_Http_Message_Stream, __construct); -static PHP_METHOD(Phalcon_Http_Message_Stream, __destruct); -static PHP_METHOD(Phalcon_Http_Message_Stream, __toString); -static PHP_METHOD(Phalcon_Http_Message_Stream, close); -static PHP_METHOD(Phalcon_Http_Message_Stream, detach); -static PHP_METHOD(Phalcon_Http_Message_Stream, eof); -static PHP_METHOD(Phalcon_Http_Message_Stream, getContents); -static PHP_METHOD(Phalcon_Http_Message_Stream, getMetadata); -static PHP_METHOD(Phalcon_Http_Message_Stream, getSize); -static PHP_METHOD(Phalcon_Http_Message_Stream, isReadable); -static PHP_METHOD(Phalcon_Http_Message_Stream, isSeekable); -static PHP_METHOD(Phalcon_Http_Message_Stream, isWritable); -static PHP_METHOD(Phalcon_Http_Message_Stream, read); -static PHP_METHOD(Phalcon_Http_Message_Stream, rewind); -static PHP_METHOD(Phalcon_Http_Message_Stream, seek); -static PHP_METHOD(Phalcon_Http_Message_Stream, setStream); -static PHP_METHOD(Phalcon_Http_Message_Stream, tell); -static PHP_METHOD(Phalcon_Http_Message_Stream, write); -static PHP_METHOD(Phalcon_Http_Message_Stream, checkHandle); -static PHP_METHOD(Phalcon_Http_Message_Stream, checkReadable); -static PHP_METHOD(Phalcon_Http_Message_Stream, checkSeekable); -static PHP_METHOD(Phalcon_Http_Message_Stream, checkWritable); -static PHP_METHOD(Phalcon_Http_Message_Stream, getArrVal); - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_stream___construct, 0, 0, 1) - ZEND_ARG_INFO(0, stream) - ZEND_ARG_TYPE_INFO(0, mode, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_stream___destruct, 0, 0, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_stream___tostring, 0, 0, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_stream_close, 0, 0, IS_VOID, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_stream_detach, 0, 0, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_stream_eof, 0, 0, _IS_BOOL, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_stream_getcontents, 0, 0, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_stream_getmetadata, 0, 0, 0) - ZEND_ARG_INFO(0, key) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_stream_getsize, 0, 0, IS_LONG, 1) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_stream_isreadable, 0, 0, _IS_BOOL, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_stream_isseekable, 0, 0, _IS_BOOL, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_stream_iswritable, 0, 0, _IS_BOOL, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_stream_read, 0, 1, IS_STRING, 0) - ZEND_ARG_INFO(0, length) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_stream_rewind, 0, 0, IS_VOID, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_stream_seek, 0, 1, IS_VOID, 0) - - ZEND_ARG_INFO(0, offset) - ZEND_ARG_INFO(0, whence) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_stream_setstream, 0, 1, IS_VOID, 0) - - ZEND_ARG_INFO(0, stream) - ZEND_ARG_TYPE_INFO(0, mode, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_stream_tell, 0, 0, IS_LONG, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_stream_write, 0, 1, IS_LONG, 0) - ZEND_ARG_INFO(0, data) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_stream_checkhandle, 0, 0, IS_VOID, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_stream_checkreadable, 0, 0, IS_VOID, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_stream_checkseekable, 0, 0, IS_VOID, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_stream_checkwritable, 0, 0, IS_VOID, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_stream_getarrval, 0, 0, 2) - ZEND_ARG_ARRAY_INFO(0, collection, 0) - ZEND_ARG_INFO(0, index) - ZEND_ARG_INFO(0, defaultValue) -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_http_message_stream_method_entry) { - PHP_ME(Phalcon_Http_Message_Stream, __construct, arginfo_phalcon_http_message_stream___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) -#if PHP_VERSION_ID >= 80000 - PHP_ME(Phalcon_Http_Message_Stream, __destruct, arginfo_phalcon_http_message_stream___destruct, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR) -#else - PHP_ME(Phalcon_Http_Message_Stream, __destruct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR) -#endif - PHP_ME(Phalcon_Http_Message_Stream, __toString, arginfo_phalcon_http_message_stream___tostring, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Stream, close, arginfo_phalcon_http_message_stream_close, ZEND_ACC_PUBLIC) -#if PHP_VERSION_ID >= 80000 - PHP_ME(Phalcon_Http_Message_Stream, detach, arginfo_phalcon_http_message_stream_detach, ZEND_ACC_PUBLIC) -#else - PHP_ME(Phalcon_Http_Message_Stream, detach, NULL, ZEND_ACC_PUBLIC) -#endif - PHP_ME(Phalcon_Http_Message_Stream, eof, arginfo_phalcon_http_message_stream_eof, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Stream, getContents, arginfo_phalcon_http_message_stream_getcontents, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Stream, getMetadata, arginfo_phalcon_http_message_stream_getmetadata, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Stream, getSize, arginfo_phalcon_http_message_stream_getsize, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Stream, isReadable, arginfo_phalcon_http_message_stream_isreadable, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Stream, isSeekable, arginfo_phalcon_http_message_stream_isseekable, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Stream, isWritable, arginfo_phalcon_http_message_stream_iswritable, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Stream, read, arginfo_phalcon_http_message_stream_read, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Stream, rewind, arginfo_phalcon_http_message_stream_rewind, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Stream, seek, arginfo_phalcon_http_message_stream_seek, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Stream, setStream, arginfo_phalcon_http_message_stream_setstream, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Stream, tell, arginfo_phalcon_http_message_stream_tell, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Stream, write, arginfo_phalcon_http_message_stream_write, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Stream, checkHandle, arginfo_phalcon_http_message_stream_checkhandle, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_Stream, checkReadable, arginfo_phalcon_http_message_stream_checkreadable, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_Stream, checkSeekable, arginfo_phalcon_http_message_stream_checkseekable, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_Stream, checkWritable, arginfo_phalcon_http_message_stream_checkwritable, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_Stream, getArrVal, arginfo_phalcon_http_message_stream_getarrval, ZEND_ACC_PRIVATE) - PHP_FE_END -}; - zend_class_entry *phalcon_image_adapter_adapterinterface_ce; ZEPHIR_INIT_CLASS(Phalcon_Image_Adapter_AdapterInterface); @@ -5654,7 +5371,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_abstra ZEND_ARG_INFO(0, translateKey) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_translate_adapter_abstractadapter_offsetget, 0, 0, 1) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_abstractadapter_offsetget, 0, 1, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_abstractadapter_offsetget, 0, 1, IS_NULL, 0) +#endif ZEND_ARG_INFO(0, translateKey) ZEND_END_ARG_INFO() @@ -6598,7 +6319,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_di_di_has, 0, 1, _IS_BOO ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_di_di_offsetget, 0, 0, 1) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_di_di_offsetget, 0, 1, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_di_di_offsetget, 0, 1, IS_NULL, 0) +#endif ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() @@ -7320,70 +7045,6 @@ ZEPHIR_INIT_FUNCS(phalcon_html_link_abstractlinkprovider_method_entry) { PHP_FE_END }; -zend_class_entry *phalcon_http_message_abstractrequest_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_AbstractRequest); - -static PHP_METHOD(Phalcon_Http_Message_AbstractRequest, getMethod); -static PHP_METHOD(Phalcon_Http_Message_AbstractRequest, getUri); -static PHP_METHOD(Phalcon_Http_Message_AbstractRequest, getRequestTarget); -static PHP_METHOD(Phalcon_Http_Message_AbstractRequest, withMethod); -static PHP_METHOD(Phalcon_Http_Message_AbstractRequest, withRequestTarget); -static PHP_METHOD(Phalcon_Http_Message_AbstractRequest, withUri); -static PHP_METHOD(Phalcon_Http_Message_AbstractRequest, processMethod); -static PHP_METHOD(Phalcon_Http_Message_AbstractRequest, processUri); - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_abstractrequest_getmethod, 0, 0, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_abstractrequest_geturi, 0, 0, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_abstractrequest_getrequesttarget, 0, 0, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_abstractrequest_withmethod, 0, 0, 1) - ZEND_ARG_INFO(0, method) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_abstractrequest_withrequesttarget, 0, 0, 1) - ZEND_ARG_INFO(0, requestTarget) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_abstractrequest_withuri, 0, 0, 1) - ZEND_ARG_OBJ_INFO(0, uri, Psr\\Http\\Message\\UriInterface, 0) - ZEND_ARG_INFO(0, preserveHost) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_abstractrequest_processmethod, 0, 0, IS_STRING, 0) - ZEND_ARG_INFO(0, method) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_abstractrequest_processuri, 0, 1, Psr\\Http\\Message\\UriInterface, 0) - ZEND_ARG_INFO(0, uri) -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_http_message_abstractrequest_method_entry) { - PHP_ME(Phalcon_Http_Message_AbstractRequest, getMethod, arginfo_phalcon_http_message_abstractrequest_getmethod, ZEND_ACC_PUBLIC) -#if PHP_VERSION_ID >= 80000 - PHP_ME(Phalcon_Http_Message_AbstractRequest, getUri, arginfo_phalcon_http_message_abstractrequest_geturi, ZEND_ACC_PUBLIC) -#else - PHP_ME(Phalcon_Http_Message_AbstractRequest, getUri, NULL, ZEND_ACC_PUBLIC) -#endif - PHP_ME(Phalcon_Http_Message_AbstractRequest, getRequestTarget, arginfo_phalcon_http_message_abstractrequest_getrequesttarget, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_AbstractRequest, withMethod, arginfo_phalcon_http_message_abstractrequest_withmethod, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_AbstractRequest, withRequestTarget, arginfo_phalcon_http_message_abstractrequest_withrequesttarget, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_AbstractRequest, withUri, arginfo_phalcon_http_message_abstractrequest_withuri, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_AbstractRequest, processMethod, arginfo_phalcon_http_message_abstractrequest_processmethod, ZEND_ACC_FINAL|ZEND_ACC_PROTECTED) - PHP_ME(Phalcon_Http_Message_AbstractRequest, processUri, arginfo_phalcon_http_message_abstractrequest_processuri, ZEND_ACC_FINAL|ZEND_ACC_PROTECTED) - PHP_FE_END -}; - -zend_class_entry *phalcon_http_message_responsestatuscodeinterface_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_ResponseStatusCodeInterface); - - zend_class_entry *phalcon_image_adapter_abstractadapter_ce; ZEPHIR_INIT_CLASS(Phalcon_Image_Adapter_AbstractAdapter); @@ -7561,6 +7222,131 @@ ZEPHIR_INIT_FUNCS(phalcon_logger_formatter_abstractformatter_method_entry) { PHP_FE_END }; +zend_class_entry *phalcon_logger_loggerinterface_ce; + +ZEPHIR_INIT_CLASS(Phalcon_Logger_LoggerInterface); + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_loggerinterface_alert, 0, 1, IS_VOID, 0) + + ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") +#else + ZEND_ARG_ARRAY_INFO(0, context, 0) +#endif +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_loggerinterface_critical, 0, 1, IS_VOID, 0) + + ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") +#else + ZEND_ARG_ARRAY_INFO(0, context, 0) +#endif +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_loggerinterface_debug, 0, 1, IS_VOID, 0) + + ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") +#else + ZEND_ARG_ARRAY_INFO(0, context, 0) +#endif +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_loggerinterface_emergency, 0, 1, IS_VOID, 0) + + ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") +#else + ZEND_ARG_ARRAY_INFO(0, context, 0) +#endif +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_loggerinterface_error, 0, 1, IS_VOID, 0) + + ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") +#else + ZEND_ARG_ARRAY_INFO(0, context, 0) +#endif +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_logger_loggerinterface_getadapter, 0, 1, Phalcon\\Logger\\Adapter\\AdapterInterface, 0) + ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_loggerinterface_getadapters, 0, 0, IS_ARRAY, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_loggerinterface_getloglevel, 0, 0, IS_LONG, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_loggerinterface_getname, 0, 0, IS_STRING, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_loggerinterface_info, 0, 1, IS_VOID, 0) + + ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") +#else + ZEND_ARG_ARRAY_INFO(0, context, 0) +#endif +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_loggerinterface_log, 0, 2, IS_VOID, 0) + + ZEND_ARG_INFO(0, level) + ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") +#else + ZEND_ARG_ARRAY_INFO(0, context, 0) +#endif +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_loggerinterface_notice, 0, 1, IS_VOID, 0) + + ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") +#else + ZEND_ARG_ARRAY_INFO(0, context, 0) +#endif +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_loggerinterface_warning, 0, 1, IS_VOID, 0) + + ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") +#else + ZEND_ARG_ARRAY_INFO(0, context, 0) +#endif +ZEND_END_ARG_INFO() + +ZEPHIR_INIT_FUNCS(phalcon_logger_loggerinterface_method_entry) { + PHP_ABSTRACT_ME(Phalcon_Logger_LoggerInterface, alert, arginfo_phalcon_logger_loggerinterface_alert) + PHP_ABSTRACT_ME(Phalcon_Logger_LoggerInterface, critical, arginfo_phalcon_logger_loggerinterface_critical) + PHP_ABSTRACT_ME(Phalcon_Logger_LoggerInterface, debug, arginfo_phalcon_logger_loggerinterface_debug) + PHP_ABSTRACT_ME(Phalcon_Logger_LoggerInterface, emergency, arginfo_phalcon_logger_loggerinterface_emergency) + PHP_ABSTRACT_ME(Phalcon_Logger_LoggerInterface, error, arginfo_phalcon_logger_loggerinterface_error) + PHP_ABSTRACT_ME(Phalcon_Logger_LoggerInterface, getAdapter, arginfo_phalcon_logger_loggerinterface_getadapter) + PHP_ABSTRACT_ME(Phalcon_Logger_LoggerInterface, getAdapters, arginfo_phalcon_logger_loggerinterface_getadapters) + PHP_ABSTRACT_ME(Phalcon_Logger_LoggerInterface, getLogLevel, arginfo_phalcon_logger_loggerinterface_getloglevel) + PHP_ABSTRACT_ME(Phalcon_Logger_LoggerInterface, getName, arginfo_phalcon_logger_loggerinterface_getname) + PHP_ABSTRACT_ME(Phalcon_Logger_LoggerInterface, info, arginfo_phalcon_logger_loggerinterface_info) + PHP_ABSTRACT_ME(Phalcon_Logger_LoggerInterface, log, arginfo_phalcon_logger_loggerinterface_log) + PHP_ABSTRACT_ME(Phalcon_Logger_LoggerInterface, notice, arginfo_phalcon_logger_loggerinterface_notice) + PHP_ABSTRACT_ME(Phalcon_Logger_LoggerInterface, warning, arginfo_phalcon_logger_loggerinterface_warning) + PHP_FE_END +}; + zend_class_entry *phalcon_mvc_entityinterface_ce; ZEPHIR_INIT_CLASS(Phalcon_Mvc_EntityInterface); @@ -7709,7 +7495,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_filt ZEND_ARG_INFO(0, filter) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_model_resultset_getcache, 0, 0, Phalcon\\Mvc\\Model\\CacheInterface, 1) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_model_resultset_getcache, 0, 0, Phalcon\\Cache\\CacheInterface, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset_getfirst, 0, 0, 0) @@ -7739,7 +7525,11 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_next, 0, 0, IS_VOID, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset_offsetget, 0, 0, 1) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_offsetget, 0, 1, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_offsetget, 0, 1, IS_NULL, 0) +#endif ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() @@ -8032,9 +7822,19 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_session_adapter_abstract ZEND_ARG_INFO(0, sessionId) ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 80100 +ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_phalcon_session_adapter_abstractadapter_gc, 0, 1, MAY_BE_LONG|MAY_BE_FALSE) + ZEND_ARG_TYPE_INFO(0, maxlifetime, IS_LONG, 0) +ZEND_END_ARG_INFO() +#elif PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_session_adapter_abstractadapter_gc, 0, 0, 1) + ZEND_ARG_TYPE_INFO(0, maxlifetime, IS_LONG, 0) +ZEND_END_ARG_INFO() +#else ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_session_adapter_abstractadapter_gc, 0, 0, 1) - ZEND_ARG_INFO(0, maxlifetime) + ZEND_ARG_INFO(0, maxlifetime) ZEND_END_ARG_INFO() +#endif ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_session_adapter_abstractadapter_read, 0, 1, IS_STRING, 0) ZEND_ARG_INFO(0, sessionId) @@ -8453,7 +8253,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_ #endif ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_profilerinterface_getlogger, 0, 0, Psr\\Log\\LoggerInterface, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_profilerinterface_getlogger, 0, 0, Phalcon\\Logger\\LoggerInterface, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_profilerinterface_getlogformat, 0, 0, IS_STRING, 0) @@ -9440,6 +9240,16 @@ ZEPHIR_INIT_FUNCS(phalcon_http_cookie_cookieinterface_method_entry) { PHP_FE_END }; +zend_class_entry *phalcon_http_message_requestmethodinterface_ce; + +ZEPHIR_INIT_CLASS(Phalcon_Http_Message_RequestMethodInterface); + + +zend_class_entry *phalcon_http_message_responsestatuscodeinterface_ce; + +ZEPHIR_INIT_CLASS(Phalcon_Http_Message_ResponseStatusCodeInterface); + + zend_class_entry *phalcon_http_request_fileinterface_ce; ZEPHIR_INIT_CLASS(Phalcon_Http_Request_FileInterface); @@ -10028,131 +9838,6 @@ ZEPHIR_INIT_FUNCS(phalcon_logger_abstractlogger_method_entry) { PHP_FE_END }; -zend_class_entry *phalcon_logger_loggerinterface_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Logger_LoggerInterface); - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_loggerinterface_alert, 0, 1, IS_VOID, 0) - - ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") -#else - ZEND_ARG_ARRAY_INFO(0, context, 0) -#endif -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_loggerinterface_critical, 0, 1, IS_VOID, 0) - - ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") -#else - ZEND_ARG_ARRAY_INFO(0, context, 0) -#endif -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_loggerinterface_debug, 0, 1, IS_VOID, 0) - - ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") -#else - ZEND_ARG_ARRAY_INFO(0, context, 0) -#endif -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_loggerinterface_emergency, 0, 1, IS_VOID, 0) - - ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") -#else - ZEND_ARG_ARRAY_INFO(0, context, 0) -#endif -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_loggerinterface_error, 0, 1, IS_VOID, 0) - - ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") -#else - ZEND_ARG_ARRAY_INFO(0, context, 0) -#endif -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_logger_loggerinterface_getadapter, 0, 1, Phalcon\\Logger\\Adapter\\AdapterInterface, 0) - ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_loggerinterface_getadapters, 0, 0, IS_ARRAY, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_loggerinterface_getloglevel, 0, 0, IS_LONG, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_loggerinterface_getname, 0, 0, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_loggerinterface_info, 0, 1, IS_VOID, 0) - - ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") -#else - ZEND_ARG_ARRAY_INFO(0, context, 0) -#endif -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_loggerinterface_log, 0, 2, IS_VOID, 0) - - ZEND_ARG_INFO(0, level) - ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") -#else - ZEND_ARG_ARRAY_INFO(0, context, 0) -#endif -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_loggerinterface_notice, 0, 1, IS_VOID, 0) - - ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") -#else - ZEND_ARG_ARRAY_INFO(0, context, 0) -#endif -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_loggerinterface_warning, 0, 1, IS_VOID, 0) - - ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") -#else - ZEND_ARG_ARRAY_INFO(0, context, 0) -#endif -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_logger_loggerinterface_method_entry) { - PHP_ABSTRACT_ME(Phalcon_Logger_LoggerInterface, alert, arginfo_phalcon_logger_loggerinterface_alert) - PHP_ABSTRACT_ME(Phalcon_Logger_LoggerInterface, critical, arginfo_phalcon_logger_loggerinterface_critical) - PHP_ABSTRACT_ME(Phalcon_Logger_LoggerInterface, debug, arginfo_phalcon_logger_loggerinterface_debug) - PHP_ABSTRACT_ME(Phalcon_Logger_LoggerInterface, emergency, arginfo_phalcon_logger_loggerinterface_emergency) - PHP_ABSTRACT_ME(Phalcon_Logger_LoggerInterface, error, arginfo_phalcon_logger_loggerinterface_error) - PHP_ABSTRACT_ME(Phalcon_Logger_LoggerInterface, getAdapter, arginfo_phalcon_logger_loggerinterface_getadapter) - PHP_ABSTRACT_ME(Phalcon_Logger_LoggerInterface, getAdapters, arginfo_phalcon_logger_loggerinterface_getadapters) - PHP_ABSTRACT_ME(Phalcon_Logger_LoggerInterface, getLogLevel, arginfo_phalcon_logger_loggerinterface_getloglevel) - PHP_ABSTRACT_ME(Phalcon_Logger_LoggerInterface, getName, arginfo_phalcon_logger_loggerinterface_getname) - PHP_ABSTRACT_ME(Phalcon_Logger_LoggerInterface, info, arginfo_phalcon_logger_loggerinterface_info) - PHP_ABSTRACT_ME(Phalcon_Logger_LoggerInterface, log, arginfo_phalcon_logger_loggerinterface_log) - PHP_ABSTRACT_ME(Phalcon_Logger_LoggerInterface, notice, arginfo_phalcon_logger_loggerinterface_notice) - PHP_ABSTRACT_ME(Phalcon_Logger_LoggerInterface, warning, arginfo_phalcon_logger_loggerinterface_warning) - PHP_FE_END -}; - zend_class_entry *phalcon_messages_messageinterface_ce; ZEPHIR_INIT_CLASS(Phalcon_Messages_MessageInterface); @@ -12372,9 +12057,19 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_session_adapter_noop_des ZEND_ARG_INFO(0, sessionId) ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 80100 +ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_phalcon_session_adapter_noop_gc, 0, 1, MAY_BE_LONG|MAY_BE_FALSE) + ZEND_ARG_TYPE_INFO(0, maxlifetime, IS_LONG, 0) +ZEND_END_ARG_INFO() +#elif PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_session_adapter_noop_gc, 0, 0, 1) - ZEND_ARG_INFO(0, maxlifetime) + ZEND_ARG_TYPE_INFO(0, maxlifetime, IS_LONG, 0) ZEND_END_ARG_INFO() +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_session_adapter_noop_gc, 0, 0, 1) + ZEND_ARG_INFO(0, maxlifetime) +ZEND_END_ARG_INFO() +#endif ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_session_adapter_noop_read, 0, 1, IS_STRING, 0) ZEND_ARG_INFO(0, sessionId) @@ -13125,10 +12820,15 @@ static PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, doUnserialize); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_igbinary_serialize, 0, 0, 0) ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_igbinary_unserialize, 0, 1, IS_VOID, 0) - - ZEND_ARG_INFO(0, data) + ZEND_ARG_TYPE_INFO(0, serialized, IS_STRING, 0) +ZEND_END_ARG_INFO() +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_igbinary_unserialize, 0, 1, IS_VOID, 0) + ZEND_ARG_INFO(0, serialized) ZEND_END_ARG_INFO() +#endif ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_igbinary_phpigbinaryserialize, 0, 1, IS_STRING, 1) ZEND_ARG_INFO(0, value) @@ -13656,7 +13356,11 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_annotations_collection_count, 0, 0, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_annotations_collection_current, 0, 0, 0) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_annotations_collection_current, 0, 0, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_annotations_collection_current, 0, 0, IS_NULL, 0) +#endif ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_annotations_collection_get, 0, 1, Phalcon\\Annotations\\Annotation, 0) @@ -13689,11 +13393,7 @@ ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_annotations_collection_method_entry) { PHP_ME(Phalcon_Annotations_Collection, __construct, arginfo_phalcon_annotations_collection___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) PHP_ME(Phalcon_Annotations_Collection, count, arginfo_phalcon_annotations_collection_count, ZEND_ACC_PUBLIC) -#if PHP_VERSION_ID >= 80000 PHP_ME(Phalcon_Annotations_Collection, current, arginfo_phalcon_annotations_collection_current, ZEND_ACC_PUBLIC) -#else - PHP_ME(Phalcon_Annotations_Collection, current, NULL, ZEND_ACC_PUBLIC) -#endif PHP_ME(Phalcon_Annotations_Collection, get, arginfo_phalcon_annotations_collection_get, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Annotations_Collection, getAll, arginfo_phalcon_annotations_collection_getall, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Annotations_Collection, getAnnotations, arginfo_phalcon_annotations_collection_getannotations, ZEND_ACC_PUBLIC) @@ -13975,7 +13675,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_count, 0, 0, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_assets_collection_getiterator, 0, 0, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_assets_collection_getiterator, 0, 0, Traversable, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getrealtargetpath, 0, 1, IS_STRING, 0) @@ -14092,11 +13792,7 @@ ZEPHIR_INIT_FUNCS(phalcon_assets_collection_method_entry) { PHP_ME(Phalcon_Assets_Collection, addInlineJs, arginfo_phalcon_assets_collection_addinlinejs, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Assets_Collection, addJs, arginfo_phalcon_assets_collection_addjs, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Assets_Collection, count, arginfo_phalcon_assets_collection_count, ZEND_ACC_PUBLIC) -#if PHP_VERSION_ID >= 80000 PHP_ME(Phalcon_Assets_Collection, getIterator, arginfo_phalcon_assets_collection_getiterator, ZEND_ACC_PUBLIC) -#else - PHP_ME(Phalcon_Assets_Collection, getIterator, NULL, ZEND_ACC_PUBLIC) -#endif PHP_ME(Phalcon_Assets_Collection, getRealTargetPath, arginfo_phalcon_assets_collection_getrealtargetpath, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Assets_Collection, has, arginfo_phalcon_assets_collection_has, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Assets_Collection, isAutoVersion, arginfo_phalcon_assets_collection_isautoversion, ZEND_ACC_PUBLIC) @@ -15722,23 +15418,25 @@ zend_class_entry *phalcon_datamapper_pdo_profiler_memorylogger_ce; ZEPHIR_INIT_CLASS(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger); -static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, getMessages); -static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, emergency); static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, alert); static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, critical); +static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, debug); +static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, emergency); static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, error); -static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, warning); -static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, notice); +static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, getAdapter); +static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, getAdapters); +static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, getLogLevel); +static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, getMessages); +static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, getName); static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, info); -static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, debug); +static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, notice); +static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, warning); static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, log); zend_object *zephir_init_properties_Phalcon_DataMapper_Pdo_Profiler_MemoryLogger(zend_class_entry *class_type); -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_getmessages, 0, 0, IS_ARRAY, 0) -ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_alert, 0, 1, IS_VOID, 0) -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_emergency, 0, 0, 1) - ZEND_ARG_INFO(0, message) + ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) #if PHP_VERSION_ID >= 80000 ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") #else @@ -15746,8 +15444,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_emer #endif ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_alert, 0, 0, 1) - ZEND_ARG_INFO(0, message) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_critical, 0, 1, IS_VOID, 0) + + ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) #if PHP_VERSION_ID >= 80000 ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") #else @@ -15755,8 +15454,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_aler #endif ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_critical, 0, 0, 1) - ZEND_ARG_INFO(0, message) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_debug, 0, 1, IS_VOID, 0) + + ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) #if PHP_VERSION_ID >= 80000 ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") #else @@ -15764,8 +15464,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_crit #endif ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_error, 0, 0, 1) - ZEND_ARG_INFO(0, message) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_emergency, 0, 1, IS_VOID, 0) + + ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) #if PHP_VERSION_ID >= 80000 ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") #else @@ -15773,8 +15474,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_erro #endif ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_warning, 0, 0, 1) - ZEND_ARG_INFO(0, message) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_error, 0, 1, IS_VOID, 0) + + ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) #if PHP_VERSION_ID >= 80000 ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") #else @@ -15782,8 +15484,25 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_warn #endif ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_notice, 0, 0, 1) - ZEND_ARG_INFO(0, message) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_getadapter, 0, 1, Phalcon\\Logger\\Adapter\\AdapterInterface, 0) + ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_getadapters, 0, 0, IS_ARRAY, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_getloglevel, 0, 0, IS_LONG, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_getmessages, 0, 0, IS_ARRAY, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_getname, 0, 0, IS_STRING, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_info, 0, 1, IS_VOID, 0) + + ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) #if PHP_VERSION_ID >= 80000 ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") #else @@ -15791,8 +15510,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_noti #endif ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_info, 0, 0, 1) - ZEND_ARG_INFO(0, message) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_notice, 0, 1, IS_VOID, 0) + + ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) #if PHP_VERSION_ID >= 80000 ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") #else @@ -15800,8 +15520,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_info #endif ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_debug, 0, 0, 1) - ZEND_ARG_INFO(0, message) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_warning, 0, 1, IS_VOID, 0) + + ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) #if PHP_VERSION_ID >= 80000 ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") #else @@ -15809,9 +15530,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_debu #endif ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_log, 0, 0, 2) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_log, 0, 2, IS_VOID, 0) + ZEND_ARG_INFO(0, level) - ZEND_ARG_INFO(0, message) + ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) #if PHP_VERSION_ID >= 80000 ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") #else @@ -15823,15 +15545,19 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_memorylogger_zeph ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_datamapper_pdo_profiler_memorylogger_method_entry) { - PHP_ME(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, getMessages, arginfo_phalcon_datamapper_pdo_profiler_memorylogger_getmessages, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, emergency, arginfo_phalcon_datamapper_pdo_profiler_memorylogger_emergency, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, alert, arginfo_phalcon_datamapper_pdo_profiler_memorylogger_alert, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, critical, arginfo_phalcon_datamapper_pdo_profiler_memorylogger_critical, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, debug, arginfo_phalcon_datamapper_pdo_profiler_memorylogger_debug, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, emergency, arginfo_phalcon_datamapper_pdo_profiler_memorylogger_emergency, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, error, arginfo_phalcon_datamapper_pdo_profiler_memorylogger_error, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, warning, arginfo_phalcon_datamapper_pdo_profiler_memorylogger_warning, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, notice, arginfo_phalcon_datamapper_pdo_profiler_memorylogger_notice, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, getAdapter, arginfo_phalcon_datamapper_pdo_profiler_memorylogger_getadapter, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, getAdapters, arginfo_phalcon_datamapper_pdo_profiler_memorylogger_getadapters, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, getLogLevel, arginfo_phalcon_datamapper_pdo_profiler_memorylogger_getloglevel, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, getMessages, arginfo_phalcon_datamapper_pdo_profiler_memorylogger_getmessages, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, getName, arginfo_phalcon_datamapper_pdo_profiler_memorylogger_getname, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, info, arginfo_phalcon_datamapper_pdo_profiler_memorylogger_info, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, debug, arginfo_phalcon_datamapper_pdo_profiler_memorylogger_debug, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, notice, arginfo_phalcon_datamapper_pdo_profiler_memorylogger_notice, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, warning, arginfo_phalcon_datamapper_pdo_profiler_memorylogger_warning, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_DataMapper_Pdo_Profiler_MemoryLogger, log, arginfo_phalcon_datamapper_pdo_profiler_memorylogger_log, ZEND_ACC_PUBLIC) PHP_FE_END }; @@ -15854,7 +15580,7 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, encode); zend_object *zephir_init_properties_Phalcon_DataMapper_Pdo_Profiler_Profiler(zend_class_entry *class_type); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_profiler___construct, 0, 0, 0) - ZEND_ARG_OBJ_INFO(0, logger, Psr\\Log\\LoggerInterface, 1) + ZEND_ARG_OBJ_INFO(0, logger, Phalcon\\Logger\\LoggerInterface, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_profiler_finish, 0, 0, IS_VOID, 0) @@ -15870,7 +15596,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_profiler_getlogformat, 0, 0, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_profiler_getlogger, 0, 0, Psr\\Log\\LoggerInterface, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_profiler_getlogger, 0, 0, Phalcon\\Logger\\LoggerInterface, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_profiler_getloglevel, 0, 0, IS_STRING, 0) @@ -17602,15 +17328,15 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_result_pdoresult_exec ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_result_pdoresult_fetch, 0, 0, 0) - ZEND_ARG_INFO(0, fetchStyle) - ZEND_ARG_INFO(0, cursorOrientation) - ZEND_ARG_INFO(0, cursorOffset) + ZEND_ARG_TYPE_INFO(0, fetchStyle, IS_LONG, 1) + ZEND_ARG_TYPE_INFO(0, cursorOrientation, IS_LONG, 0) + ZEND_ARG_TYPE_INFO(0, cursorOffset, IS_LONG, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_result_pdoresult_fetchall, 0, 0, IS_ARRAY, 0) - ZEND_ARG_INFO(0, fetchStyle) - ZEND_ARG_INFO(0, fetchArgument) - ZEND_ARG_INFO(0, ctorArgs) + ZEND_ARG_TYPE_INFO(0, fetchStyle, IS_LONG, 1) + ZEND_ARG_TYPE_INFO(0, fetchArgument, IS_LONG, 0) + ZEND_ARG_TYPE_INFO(0, ctorArgs, IS_LONG, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_result_pdoresult_fetcharray, 0, 0, 0) @@ -21027,7 +20753,11 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_forms_form_count, 0, 0, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_forms_form_current, 0, 0, 0) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_forms_form_current, 0, 0, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_forms_form_current, 0, 0, IS_NULL, 0) +#endif ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_forms_form_get, 0, 1, Phalcon\\Forms\\Element\\ElementInterface, 0) @@ -21172,11 +20902,7 @@ ZEPHIR_INIT_FUNCS(phalcon_forms_form_method_entry) { PHP_ME(Phalcon_Forms_Form, bind, arginfo_phalcon_forms_form_bind, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Forms_Form, clear, arginfo_phalcon_forms_form_clear, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Forms_Form, count, arginfo_phalcon_forms_form_count, ZEND_ACC_PUBLIC) -#if PHP_VERSION_ID >= 80000 PHP_ME(Phalcon_Forms_Form, current, arginfo_phalcon_forms_form_current, ZEND_ACC_PUBLIC) -#else - PHP_ME(Phalcon_Forms_Form, current, NULL, ZEND_ACC_PUBLIC) -#endif PHP_ME(Phalcon_Forms_Form, get, arginfo_phalcon_forms_form_get, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Forms_Form, getAction, arginfo_phalcon_forms_form_getaction, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Forms_Form, getAttributes, arginfo_phalcon_forms_form_getattributes, ZEND_ACC_PUBLIC) @@ -22427,791 +22153,6 @@ zend_class_entry *phalcon_http_cookie_exception_ce; ZEPHIR_INIT_CLASS(Phalcon_Http_Cookie_Exception); -zend_class_entry *phalcon_http_message_exception_invalidargumentexception_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_Exception_InvalidArgumentException); - - -zend_class_entry *phalcon_http_message_request_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_Request); - -static PHP_METHOD(Phalcon_Http_Message_Request, __construct); - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_request___construct, 0, 0, 0) - ZEND_ARG_TYPE_INFO(0, method, IS_STRING, 0) - ZEND_ARG_INFO(0, uri) - ZEND_ARG_INFO(0, body) - ZEND_ARG_INFO(0, headers) -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_http_message_request_method_entry) { - PHP_ME(Phalcon_Http_Message_Request, __construct, arginfo_phalcon_http_message_request___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) - PHP_FE_END -}; - -zend_class_entry *phalcon_http_message_requestfactory_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_RequestFactory); - -static PHP_METHOD(Phalcon_Http_Message_RequestFactory, createRequest); - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_requestfactory_createrequest, 0, 2, Psr\\Http\\Message\\RequestInterface, 0) - ZEND_ARG_TYPE_INFO(0, method, IS_STRING, 0) - ZEND_ARG_INFO(0, uri) -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_http_message_requestfactory_method_entry) { - PHP_ME(Phalcon_Http_Message_RequestFactory, createRequest, arginfo_phalcon_http_message_requestfactory_createrequest, ZEND_ACC_PUBLIC) - PHP_FE_END -}; - -zend_class_entry *phalcon_http_message_response_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_Response); - -static PHP_METHOD(Phalcon_Http_Message_Response, getReasonPhrase); -static PHP_METHOD(Phalcon_Http_Message_Response, getStatusCode); -static PHP_METHOD(Phalcon_Http_Message_Response, __construct); -static PHP_METHOD(Phalcon_Http_Message_Response, withStatus); -static PHP_METHOD(Phalcon_Http_Message_Response, getPhrases); -static PHP_METHOD(Phalcon_Http_Message_Response, processCode); -static PHP_METHOD(Phalcon_Http_Message_Response, checkCodeType); -static PHP_METHOD(Phalcon_Http_Message_Response, checkCodeValue); -static PHP_METHOD(Phalcon_Http_Message_Response, isBetween); - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_response_getreasonphrase, 0, 0, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_response_getstatuscode, 0, 0, IS_LONG, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_response___construct, 0, 0, 0) - ZEND_ARG_INFO(0, body) - ZEND_ARG_TYPE_INFO(0, code, IS_LONG, 0) -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, headers, IS_ARRAY, 0, "[]") -#else - ZEND_ARG_ARRAY_INFO(0, headers, 0) -#endif -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_response_withstatus, 0, 1, Phalcon\\Http\\Message\\Response, 0) - ZEND_ARG_INFO(0, code) - ZEND_ARG_INFO(0, reasonPhrase) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_response_getphrases, 0, 0, IS_ARRAY, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_response_processcode, 0, 1, IS_VOID, 0) - - ZEND_ARG_INFO(0, code) - ZEND_ARG_INFO(0, phrase) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_response_checkcodetype, 0, 1, IS_VOID, 0) - - ZEND_ARG_INFO(0, code) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_response_checkcodevalue, 0, 1, IS_VOID, 0) - - ZEND_ARG_TYPE_INFO(0, code, IS_LONG, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_response_isbetween, 0, 3, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, value, IS_LONG, 0) - ZEND_ARG_TYPE_INFO(0, from, IS_LONG, 0) - ZEND_ARG_TYPE_INFO(0, to, IS_LONG, 0) -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_http_message_response_method_entry) { - PHP_ME(Phalcon_Http_Message_Response, getReasonPhrase, arginfo_phalcon_http_message_response_getreasonphrase, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Response, getStatusCode, arginfo_phalcon_http_message_response_getstatuscode, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Response, __construct, arginfo_phalcon_http_message_response___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) - PHP_ME(Phalcon_Http_Message_Response, withStatus, arginfo_phalcon_http_message_response_withstatus, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Response, getPhrases, arginfo_phalcon_http_message_response_getphrases, ZEND_ACC_PROTECTED) - PHP_ME(Phalcon_Http_Message_Response, processCode, arginfo_phalcon_http_message_response_processcode, ZEND_ACC_PROTECTED) - PHP_ME(Phalcon_Http_Message_Response, checkCodeType, arginfo_phalcon_http_message_response_checkcodetype, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_Response, checkCodeValue, arginfo_phalcon_http_message_response_checkcodevalue, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_Response, isBetween, arginfo_phalcon_http_message_response_isbetween, ZEND_ACC_PRIVATE) - PHP_FE_END -}; - -zend_class_entry *phalcon_http_message_responsefactory_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_ResponseFactory); - -static PHP_METHOD(Phalcon_Http_Message_ResponseFactory, createResponse); - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_responsefactory_createresponse, 0, 0, Psr\\Http\\Message\\ResponseInterface, 0) - ZEND_ARG_TYPE_INFO(0, code, IS_LONG, 0) - ZEND_ARG_TYPE_INFO(0, reasonPhrase, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_http_message_responsefactory_method_entry) { - PHP_ME(Phalcon_Http_Message_ResponseFactory, createResponse, arginfo_phalcon_http_message_responsefactory_createresponse, ZEND_ACC_PUBLIC) - PHP_FE_END -}; - -zend_class_entry *phalcon_http_message_serverrequest_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_ServerRequest); - -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, getCookieParams); -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, getParsedBody); -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, getQueryParams); -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, getServerParams); -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, getUploadedFiles); -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, __construct); -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, getAttribute); -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, getAttributes); -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, withAttribute); -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, withCookieParams); -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, withParsedBody); -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, withQueryParams); -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, withUploadedFiles); -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, withoutAttribute); -static PHP_METHOD(Phalcon_Http_Message_ServerRequest, checkUploadedFiles); -zend_object *zephir_init_properties_Phalcon_Http_Message_ServerRequest(zend_class_entry *class_type); - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_serverrequest_getcookieparams, 0, 0, IS_ARRAY, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_serverrequest_getparsedbody, 0, 0, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_serverrequest_getqueryparams, 0, 0, IS_ARRAY, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_serverrequest_getserverparams, 0, 0, IS_ARRAY, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_serverrequest_getuploadedfiles, 0, 0, IS_ARRAY, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_serverrequest___construct, 0, 0, 0) - ZEND_ARG_TYPE_INFO(0, method, IS_STRING, 0) - ZEND_ARG_INFO(0, uri) -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, serverParams, IS_ARRAY, 0, "[]") -#else - ZEND_ARG_ARRAY_INFO(0, serverParams, 0) -#endif - ZEND_ARG_INFO(0, body) - ZEND_ARG_INFO(0, headers) -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, cookies, IS_ARRAY, 0, "[]") -#else - ZEND_ARG_ARRAY_INFO(0, cookies, 0) -#endif -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, queryParams, IS_ARRAY, 0, "[]") -#else - ZEND_ARG_ARRAY_INFO(0, queryParams, 0) -#endif -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, uploadFiles, IS_ARRAY, 0, "[]") -#else - ZEND_ARG_ARRAY_INFO(0, uploadFiles, 0) -#endif - ZEND_ARG_INFO(0, parsedBody) - ZEND_ARG_TYPE_INFO(0, protocol, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_serverrequest_getattribute, 0, 0, 1) - ZEND_ARG_INFO(0, name) - ZEND_ARG_INFO(0, defaultValue) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_serverrequest_getattributes, 0, 0, IS_ARRAY, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_serverrequest_withattribute, 0, 2, Phalcon\\Http\\Message\\ServerRequest, 0) - ZEND_ARG_INFO(0, name) - ZEND_ARG_INFO(0, value) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_serverrequest_withcookieparams, 0, 1, Phalcon\\Http\\Message\\ServerRequest, 0) - ZEND_ARG_ARRAY_INFO(0, cookies, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_serverrequest_withparsedbody, 0, 1, Phalcon\\Http\\Message\\ServerRequest, 0) - ZEND_ARG_INFO(0, data) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_serverrequest_withqueryparams, 0, 1, Phalcon\\Http\\Message\\ServerRequest, 0) - ZEND_ARG_ARRAY_INFO(0, query, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_serverrequest_withuploadedfiles, 0, 1, Phalcon\\Http\\Message\\ServerRequest, 0) - ZEND_ARG_ARRAY_INFO(0, uploadedFiles, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_serverrequest_withoutattribute, 0, 1, Phalcon\\Http\\Message\\ServerRequest, 0) - ZEND_ARG_INFO(0, name) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_serverrequest_checkuploadedfiles, 0, 1, IS_VOID, 0) - - ZEND_ARG_ARRAY_INFO(0, files, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_serverrequest_zephir_init_properties_phalcon_http_message_serverrequest, 0, 0, 0) -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_http_message_serverrequest_method_entry) { - PHP_ME(Phalcon_Http_Message_ServerRequest, getCookieParams, arginfo_phalcon_http_message_serverrequest_getcookieparams, ZEND_ACC_PUBLIC) -#if PHP_VERSION_ID >= 80000 - PHP_ME(Phalcon_Http_Message_ServerRequest, getParsedBody, arginfo_phalcon_http_message_serverrequest_getparsedbody, ZEND_ACC_PUBLIC) -#else - PHP_ME(Phalcon_Http_Message_ServerRequest, getParsedBody, NULL, ZEND_ACC_PUBLIC) -#endif - PHP_ME(Phalcon_Http_Message_ServerRequest, getQueryParams, arginfo_phalcon_http_message_serverrequest_getqueryparams, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_ServerRequest, getServerParams, arginfo_phalcon_http_message_serverrequest_getserverparams, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_ServerRequest, getUploadedFiles, arginfo_phalcon_http_message_serverrequest_getuploadedfiles, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_ServerRequest, __construct, arginfo_phalcon_http_message_serverrequest___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) - PHP_ME(Phalcon_Http_Message_ServerRequest, getAttribute, arginfo_phalcon_http_message_serverrequest_getattribute, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_ServerRequest, getAttributes, arginfo_phalcon_http_message_serverrequest_getattributes, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_ServerRequest, withAttribute, arginfo_phalcon_http_message_serverrequest_withattribute, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_ServerRequest, withCookieParams, arginfo_phalcon_http_message_serverrequest_withcookieparams, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_ServerRequest, withParsedBody, arginfo_phalcon_http_message_serverrequest_withparsedbody, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_ServerRequest, withQueryParams, arginfo_phalcon_http_message_serverrequest_withqueryparams, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_ServerRequest, withUploadedFiles, arginfo_phalcon_http_message_serverrequest_withuploadedfiles, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_ServerRequest, withoutAttribute, arginfo_phalcon_http_message_serverrequest_withoutattribute, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_ServerRequest, checkUploadedFiles, arginfo_phalcon_http_message_serverrequest_checkuploadedfiles, ZEND_ACC_PRIVATE) - PHP_FE_END -}; - -zend_class_entry *phalcon_http_message_serverrequestfactory_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_ServerRequestFactory); - -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, createServerRequest); -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, load); -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, getHeaders); -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, calculateUriHost); -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, calculateUriHostFromHeader); -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, calculateUriPath); -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, calculateUriQuery); -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, calculateUriScheme); -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, checkNullArray); -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, createUploadedFile); -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, getHeader); -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseCookieHeader); -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseHeaders); -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseProtocol); -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseServer); -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseUploadedFiles); -static PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseUri); - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_serverrequestfactory_createserverrequest, 0, 2, Psr\\Http\\Message\\ServerRequestInterface, 0) - ZEND_ARG_TYPE_INFO(0, method, IS_STRING, 0) - ZEND_ARG_INFO(0, uri) -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, serverParams, IS_ARRAY, 0, "[]") -#else - ZEND_ARG_ARRAY_INFO(0, serverParams, 0) -#endif -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_serverrequestfactory_load, 0, 0, Phalcon\\Http\\Message\\ServerRequest, 0) -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, server, IS_ARRAY, 1, "[]") -#else - ZEND_ARG_ARRAY_INFO(0, server, 1) -#endif -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, get, IS_ARRAY, 1, "[]") -#else - ZEND_ARG_ARRAY_INFO(0, get, 1) -#endif -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, post, IS_ARRAY, 1, "[]") -#else - ZEND_ARG_ARRAY_INFO(0, post, 1) -#endif -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, cookies, IS_ARRAY, 1, "[]") -#else - ZEND_ARG_ARRAY_INFO(0, cookies, 1) -#endif -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, files, IS_ARRAY, 1, "[]") -#else - ZEND_ARG_ARRAY_INFO(0, files, 1) -#endif -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_serverrequestfactory_getheaders, 0, 0, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_serverrequestfactory_calculateurihost, 0, 2, IS_ARRAY, 0) - ZEND_ARG_OBJ_INFO(0, server, Phalcon\\Support\\Collection\\CollectionInterface, 0) - ZEND_ARG_OBJ_INFO(0, headers, Phalcon\\Support\\Collection\\CollectionInterface, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_serverrequestfactory_calculateurihostfromheader, 0, 1, IS_ARRAY, 0) - ZEND_ARG_TYPE_INFO(0, host, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_serverrequestfactory_calculateuripath, 0, 1, IS_STRING, 0) - ZEND_ARG_OBJ_INFO(0, server, Phalcon\\Support\\Collection\\CollectionInterface, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_serverrequestfactory_calculateuriquery, 0, 1, IS_STRING, 0) - ZEND_ARG_OBJ_INFO(0, server, Phalcon\\Support\\Collection\\CollectionInterface, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_serverrequestfactory_calculateurischeme, 0, 2, IS_STRING, 0) - ZEND_ARG_OBJ_INFO(0, server, Phalcon\\Support\\Collection\\CollectionInterface, 0) - ZEND_ARG_OBJ_INFO(0, headers, Phalcon\\Support\\Collection\\CollectionInterface, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_serverrequestfactory_checknullarray, 0, 2, IS_ARRAY, 0) - ZEND_ARG_INFO(0, source) - ZEND_ARG_ARRAY_INFO(0, super, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_serverrequestfactory_createuploadedfile, 0, 1, Phalcon\\Http\\Message\\UploadedFile, 0) - ZEND_ARG_ARRAY_INFO(0, file, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_serverrequestfactory_getheader, 0, 0, 2) - ZEND_ARG_OBJ_INFO(0, headers, Phalcon\\Support\\Collection\\CollectionInterface, 0) - ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) - ZEND_ARG_INFO(0, defaultValue) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_serverrequestfactory_parsecookieheader, 0, 1, IS_ARRAY, 0) - ZEND_ARG_TYPE_INFO(0, cookieHeader, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_serverrequestfactory_parseheaders, 0, 1, Phalcon\\Support\\Collection\\CollectionInterface, 0) - ZEND_ARG_OBJ_INFO(0, server, Phalcon\\Support\\Collection\\CollectionInterface, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_serverrequestfactory_parseprotocol, 0, 1, IS_STRING, 0) - ZEND_ARG_OBJ_INFO(0, server, Phalcon\\Support\\Collection\\CollectionInterface, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_serverrequestfactory_parseserver, 0, 1, Phalcon\\Support\\Collection\\CollectionInterface, 0) - ZEND_ARG_ARRAY_INFO(0, server, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_serverrequestfactory_parseuploadedfiles, 0, 1, Phalcon\\Support\\Collection\\CollectionInterface, 0) - ZEND_ARG_ARRAY_INFO(0, files, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_serverrequestfactory_parseuri, 0, 2, Phalcon\\Http\\Message\\Uri, 0) - ZEND_ARG_OBJ_INFO(0, server, Phalcon\\Support\\Collection\\CollectionInterface, 0) - ZEND_ARG_OBJ_INFO(0, headers, Phalcon\\Support\\Collection\\CollectionInterface, 0) -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_http_message_serverrequestfactory_method_entry) { - PHP_ME(Phalcon_Http_Message_ServerRequestFactory, createServerRequest, arginfo_phalcon_http_message_serverrequestfactory_createserverrequest, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_ServerRequestFactory, load, arginfo_phalcon_http_message_serverrequestfactory_load, ZEND_ACC_PUBLIC) -#if PHP_VERSION_ID >= 80000 - PHP_ME(Phalcon_Http_Message_ServerRequestFactory, getHeaders, arginfo_phalcon_http_message_serverrequestfactory_getheaders, ZEND_ACC_PROTECTED) -#else - PHP_ME(Phalcon_Http_Message_ServerRequestFactory, getHeaders, NULL, ZEND_ACC_PROTECTED) -#endif - PHP_ME(Phalcon_Http_Message_ServerRequestFactory, calculateUriHost, arginfo_phalcon_http_message_serverrequestfactory_calculateurihost, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_ServerRequestFactory, calculateUriHostFromHeader, arginfo_phalcon_http_message_serverrequestfactory_calculateurihostfromheader, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_ServerRequestFactory, calculateUriPath, arginfo_phalcon_http_message_serverrequestfactory_calculateuripath, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_ServerRequestFactory, calculateUriQuery, arginfo_phalcon_http_message_serverrequestfactory_calculateuriquery, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_ServerRequestFactory, calculateUriScheme, arginfo_phalcon_http_message_serverrequestfactory_calculateurischeme, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_ServerRequestFactory, checkNullArray, arginfo_phalcon_http_message_serverrequestfactory_checknullarray, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_ServerRequestFactory, createUploadedFile, arginfo_phalcon_http_message_serverrequestfactory_createuploadedfile, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_ServerRequestFactory, getHeader, arginfo_phalcon_http_message_serverrequestfactory_getheader, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_ServerRequestFactory, parseCookieHeader, arginfo_phalcon_http_message_serverrequestfactory_parsecookieheader, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_ServerRequestFactory, parseHeaders, arginfo_phalcon_http_message_serverrequestfactory_parseheaders, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_ServerRequestFactory, parseProtocol, arginfo_phalcon_http_message_serverrequestfactory_parseprotocol, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_ServerRequestFactory, parseServer, arginfo_phalcon_http_message_serverrequestfactory_parseserver, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_ServerRequestFactory, parseUploadedFiles, arginfo_phalcon_http_message_serverrequestfactory_parseuploadedfiles, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_ServerRequestFactory, parseUri, arginfo_phalcon_http_message_serverrequestfactory_parseuri, ZEND_ACC_PRIVATE) - PHP_FE_END -}; - -zend_class_entry *phalcon_http_message_stream_input_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_Stream_Input); - -static PHP_METHOD(Phalcon_Http_Message_Stream_Input, __construct); -static PHP_METHOD(Phalcon_Http_Message_Stream_Input, __toString); -static PHP_METHOD(Phalcon_Http_Message_Stream_Input, getContents); -static PHP_METHOD(Phalcon_Http_Message_Stream_Input, isWritable); -static PHP_METHOD(Phalcon_Http_Message_Stream_Input, read); - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_stream_input___construct, 0, 0, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_stream_input___tostring, 0, 0, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_stream_input_getcontents, 0, 0, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, length, IS_LONG, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_stream_input_iswritable, 0, 0, _IS_BOOL, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_stream_input_read, 0, 1, IS_STRING, 0) - ZEND_ARG_INFO(0, length) -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_http_message_stream_input_method_entry) { -#if PHP_VERSION_ID >= 80000 - PHP_ME(Phalcon_Http_Message_Stream_Input, __construct, arginfo_phalcon_http_message_stream_input___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) -#else - PHP_ME(Phalcon_Http_Message_Stream_Input, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) -#endif - PHP_ME(Phalcon_Http_Message_Stream_Input, __toString, arginfo_phalcon_http_message_stream_input___tostring, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Stream_Input, getContents, arginfo_phalcon_http_message_stream_input_getcontents, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Stream_Input, isWritable, arginfo_phalcon_http_message_stream_input_iswritable, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Stream_Input, read, arginfo_phalcon_http_message_stream_input_read, ZEND_ACC_PUBLIC) - PHP_FE_END -}; - -zend_class_entry *phalcon_http_message_stream_memory_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_Stream_Memory); - -static PHP_METHOD(Phalcon_Http_Message_Stream_Memory, __construct); - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_stream_memory___construct, 0, 0, 0) - ZEND_ARG_INFO(0, mode) -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_http_message_stream_memory_method_entry) { - PHP_ME(Phalcon_Http_Message_Stream_Memory, __construct, arginfo_phalcon_http_message_stream_memory___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) - PHP_FE_END -}; - -zend_class_entry *phalcon_http_message_stream_temp_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_Stream_Temp); - -static PHP_METHOD(Phalcon_Http_Message_Stream_Temp, __construct); - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_stream_temp___construct, 0, 0, 0) - ZEND_ARG_INFO(0, mode) -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_http_message_stream_temp_method_entry) { - PHP_ME(Phalcon_Http_Message_Stream_Temp, __construct, arginfo_phalcon_http_message_stream_temp___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) - PHP_FE_END -}; - -zend_class_entry *phalcon_http_message_streamfactory_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_StreamFactory); - -static PHP_METHOD(Phalcon_Http_Message_StreamFactory, createStream); -static PHP_METHOD(Phalcon_Http_Message_StreamFactory, createStreamFromFile); -static PHP_METHOD(Phalcon_Http_Message_StreamFactory, createStreamFromResource); - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_streamfactory_createstream, 0, 0, Psr\\Http\\Message\\StreamInterface, 0) - ZEND_ARG_TYPE_INFO(0, content, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_streamfactory_createstreamfromfile, 0, 1, Psr\\Http\\Message\\StreamInterface, 0) - ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, mode, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_streamfactory_createstreamfromresource, 0, 1, Psr\\Http\\Message\\StreamInterface, 0) - ZEND_ARG_INFO(0, phpResource) -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_http_message_streamfactory_method_entry) { - PHP_ME(Phalcon_Http_Message_StreamFactory, createStream, arginfo_phalcon_http_message_streamfactory_createstream, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_StreamFactory, createStreamFromFile, arginfo_phalcon_http_message_streamfactory_createstreamfromfile, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_StreamFactory, createStreamFromResource, arginfo_phalcon_http_message_streamfactory_createstreamfromresource, ZEND_ACC_PUBLIC) - PHP_FE_END -}; - -zend_class_entry *phalcon_http_message_uploadedfile_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_UploadedFile); - -static PHP_METHOD(Phalcon_Http_Message_UploadedFile, getClientFilename); -static PHP_METHOD(Phalcon_Http_Message_UploadedFile, getClientMediaType); -static PHP_METHOD(Phalcon_Http_Message_UploadedFile, getError); -static PHP_METHOD(Phalcon_Http_Message_UploadedFile, getSize); -static PHP_METHOD(Phalcon_Http_Message_UploadedFile, __construct); -static PHP_METHOD(Phalcon_Http_Message_UploadedFile, getStream); -static PHP_METHOD(Phalcon_Http_Message_UploadedFile, moveTo); -static PHP_METHOD(Phalcon_Http_Message_UploadedFile, checkError); -static PHP_METHOD(Phalcon_Http_Message_UploadedFile, checkStream); -static PHP_METHOD(Phalcon_Http_Message_UploadedFile, getErrorDescription); -static PHP_METHOD(Phalcon_Http_Message_UploadedFile, storeFile); -static PHP_METHOD(Phalcon_Http_Message_UploadedFile, isBetween); - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_uploadedfile_getclientfilename, 0, 0, IS_STRING, 1) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_uploadedfile_getclientmediatype, 0, 0, IS_STRING, 1) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_uploadedfile_geterror, 0, 0, IS_LONG, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_uploadedfile_getsize, 0, 0, IS_LONG, 1) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_uploadedfile___construct, 0, 0, 1) - ZEND_ARG_INFO(0, stream) - ZEND_ARG_TYPE_INFO(0, size, IS_LONG, 1) - ZEND_ARG_TYPE_INFO(0, error, IS_LONG, 0) - ZEND_ARG_TYPE_INFO(0, clientFilename, IS_STRING, 1) - ZEND_ARG_TYPE_INFO(0, clientMediaType, IS_STRING, 1) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_uploadedfile_getstream, 0, 0, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_uploadedfile_moveto, 0, 1, IS_VOID, 0) - - ZEND_ARG_INFO(0, targetPath) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_uploadedfile_checkerror, 0, 1, IS_VOID, 0) - - ZEND_ARG_TYPE_INFO(0, error, IS_LONG, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_uploadedfile_checkstream, 0, 2, IS_VOID, 0) - - ZEND_ARG_INFO(0, stream) - ZEND_ARG_TYPE_INFO(0, error, IS_LONG, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_uploadedfile_geterrordescription, 0, 1, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, error, IS_LONG, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_uploadedfile_storefile, 0, 1, IS_VOID, 0) - - ZEND_ARG_TYPE_INFO(0, targetPath, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_uploadedfile_isbetween, 0, 3, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, value, IS_LONG, 0) - ZEND_ARG_TYPE_INFO(0, from, IS_LONG, 0) - ZEND_ARG_TYPE_INFO(0, to, IS_LONG, 0) -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_http_message_uploadedfile_method_entry) { - PHP_ME(Phalcon_Http_Message_UploadedFile, getClientFilename, arginfo_phalcon_http_message_uploadedfile_getclientfilename, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_UploadedFile, getClientMediaType, arginfo_phalcon_http_message_uploadedfile_getclientmediatype, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_UploadedFile, getError, arginfo_phalcon_http_message_uploadedfile_geterror, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_UploadedFile, getSize, arginfo_phalcon_http_message_uploadedfile_getsize, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_UploadedFile, __construct, arginfo_phalcon_http_message_uploadedfile___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) -#if PHP_VERSION_ID >= 80000 - PHP_ME(Phalcon_Http_Message_UploadedFile, getStream, arginfo_phalcon_http_message_uploadedfile_getstream, ZEND_ACC_PUBLIC) -#else - PHP_ME(Phalcon_Http_Message_UploadedFile, getStream, NULL, ZEND_ACC_PUBLIC) -#endif - PHP_ME(Phalcon_Http_Message_UploadedFile, moveTo, arginfo_phalcon_http_message_uploadedfile_moveto, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_UploadedFile, checkError, arginfo_phalcon_http_message_uploadedfile_checkerror, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_UploadedFile, checkStream, arginfo_phalcon_http_message_uploadedfile_checkstream, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_UploadedFile, getErrorDescription, arginfo_phalcon_http_message_uploadedfile_geterrordescription, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_UploadedFile, storeFile, arginfo_phalcon_http_message_uploadedfile_storefile, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_UploadedFile, isBetween, arginfo_phalcon_http_message_uploadedfile_isbetween, ZEND_ACC_PRIVATE) - PHP_FE_END -}; - -zend_class_entry *phalcon_http_message_uploadedfilefactory_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_UploadedFileFactory); - -static PHP_METHOD(Phalcon_Http_Message_UploadedFileFactory, createUploadedFile); - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_uploadedfilefactory_createuploadedfile, 0, 1, Psr\\Http\\Message\\UploadedFileInterface, 0) - ZEND_ARG_OBJ_INFO(0, stream, Psr\\Http\\Message\\StreamInterface, 0) - ZEND_ARG_TYPE_INFO(0, size, IS_LONG, 1) - ZEND_ARG_TYPE_INFO(0, error, IS_LONG, 0) - ZEND_ARG_TYPE_INFO(0, clientFilename, IS_STRING, 1) - ZEND_ARG_TYPE_INFO(0, clientMediaType, IS_STRING, 1) -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_http_message_uploadedfilefactory_method_entry) { - PHP_ME(Phalcon_Http_Message_UploadedFileFactory, createUploadedFile, arginfo_phalcon_http_message_uploadedfilefactory_createuploadedfile, ZEND_ACC_PUBLIC) - PHP_FE_END -}; - -zend_class_entry *phalcon_http_message_uri_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_Uri); - -static PHP_METHOD(Phalcon_Http_Message_Uri, getFragment); -static PHP_METHOD(Phalcon_Http_Message_Uri, getHost); -static PHP_METHOD(Phalcon_Http_Message_Uri, getPath); -static PHP_METHOD(Phalcon_Http_Message_Uri, getPort); -static PHP_METHOD(Phalcon_Http_Message_Uri, getQuery); -static PHP_METHOD(Phalcon_Http_Message_Uri, getScheme); -static PHP_METHOD(Phalcon_Http_Message_Uri, __construct); -static PHP_METHOD(Phalcon_Http_Message_Uri, __toString); -static PHP_METHOD(Phalcon_Http_Message_Uri, getAuthority); -static PHP_METHOD(Phalcon_Http_Message_Uri, getUserInfo); -static PHP_METHOD(Phalcon_Http_Message_Uri, withFragment); -static PHP_METHOD(Phalcon_Http_Message_Uri, withPath); -static PHP_METHOD(Phalcon_Http_Message_Uri, withPort); -static PHP_METHOD(Phalcon_Http_Message_Uri, withQuery); -static PHP_METHOD(Phalcon_Http_Message_Uri, withScheme); -static PHP_METHOD(Phalcon_Http_Message_Uri, withUserInfo); -static PHP_METHOD(Phalcon_Http_Message_Uri, withHost); -static PHP_METHOD(Phalcon_Http_Message_Uri, checkValue); -static PHP_METHOD(Phalcon_Http_Message_Uri, filterFragment); -static PHP_METHOD(Phalcon_Http_Message_Uri, filterPath); -static PHP_METHOD(Phalcon_Http_Message_Uri, filterPort); -static PHP_METHOD(Phalcon_Http_Message_Uri, filterQuery); -static PHP_METHOD(Phalcon_Http_Message_Uri, filterScheme); -static PHP_METHOD(Phalcon_Http_Message_Uri, splitQueryValue); -static PHP_METHOD(Phalcon_Http_Message_Uri, getArrVal); - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_uri_getfragment, 0, 0, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_uri_gethost, 0, 0, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_uri_getpath, 0, 0, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_uri_getport, 0, 0, IS_LONG, 1) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_uri_getquery, 0, 0, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_uri_getscheme, 0, 0, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_uri___construct, 0, 0, 0) - ZEND_ARG_TYPE_INFO(0, uri, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_uri___tostring, 0, 0, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_uri_getauthority, 0, 0, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_uri_getuserinfo, 0, 0, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_uri_withfragment, 0, 1, Phalcon\\Http\\Message\\Uri, 0) - ZEND_ARG_INFO(0, fragment) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_uri_withpath, 0, 1, Phalcon\\Http\\Message\\Uri, 0) - ZEND_ARG_INFO(0, path) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_uri_withport, 0, 1, Phalcon\\Http\\Message\\Uri, 0) - ZEND_ARG_INFO(0, port) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_uri_withquery, 0, 1, Phalcon\\Http\\Message\\Uri, 0) - ZEND_ARG_INFO(0, query) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_uri_withscheme, 0, 1, Phalcon\\Http\\Message\\Uri, 0) - ZEND_ARG_INFO(0, scheme) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_uri_withuserinfo, 0, 1, Phalcon\\Http\\Message\\Uri, 0) - ZEND_ARG_INFO(0, user) - ZEND_ARG_INFO(0, password) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_uri_withhost, 0, 1, Phalcon\\Http\\Message\\Uri, 0) - ZEND_ARG_INFO(0, host) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_uri_checkvalue, 0, 1, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, prefix, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, suffix, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_uri_filterfragment, 0, 1, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, fragment, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_uri_filterpath, 0, 1, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, path, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_uri_filterport, 0, 1, IS_LONG, 1) - ZEND_ARG_INFO(0, port) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_uri_filterquery, 0, 1, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, query, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_uri_filterscheme, 0, 1, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, scheme, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_message_uri_splitqueryvalue, 0, 1, IS_ARRAY, 0) - ZEND_ARG_TYPE_INFO(0, element, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_message_uri_getarrval, 0, 0, 2) - ZEND_ARG_ARRAY_INFO(0, collection, 0) - ZEND_ARG_INFO(0, index) - ZEND_ARG_INFO(0, defaultValue) -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_http_message_uri_method_entry) { - PHP_ME(Phalcon_Http_Message_Uri, getFragment, arginfo_phalcon_http_message_uri_getfragment, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Uri, getHost, arginfo_phalcon_http_message_uri_gethost, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Uri, getPath, arginfo_phalcon_http_message_uri_getpath, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Uri, getPort, arginfo_phalcon_http_message_uri_getport, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Uri, getQuery, arginfo_phalcon_http_message_uri_getquery, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Uri, getScheme, arginfo_phalcon_http_message_uri_getscheme, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Uri, __construct, arginfo_phalcon_http_message_uri___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) - PHP_ME(Phalcon_Http_Message_Uri, __toString, arginfo_phalcon_http_message_uri___tostring, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Uri, getAuthority, arginfo_phalcon_http_message_uri_getauthority, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Uri, getUserInfo, arginfo_phalcon_http_message_uri_getuserinfo, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Uri, withFragment, arginfo_phalcon_http_message_uri_withfragment, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Uri, withPath, arginfo_phalcon_http_message_uri_withpath, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Uri, withPort, arginfo_phalcon_http_message_uri_withport, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Uri, withQuery, arginfo_phalcon_http_message_uri_withquery, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Uri, withScheme, arginfo_phalcon_http_message_uri_withscheme, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Uri, withUserInfo, arginfo_phalcon_http_message_uri_withuserinfo, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Uri, withHost, arginfo_phalcon_http_message_uri_withhost, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Message_Uri, checkValue, arginfo_phalcon_http_message_uri_checkvalue, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_Uri, filterFragment, arginfo_phalcon_http_message_uri_filterfragment, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_Uri, filterPath, arginfo_phalcon_http_message_uri_filterpath, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_Uri, filterPort, arginfo_phalcon_http_message_uri_filterport, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_Uri, filterQuery, arginfo_phalcon_http_message_uri_filterquery, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_Uri, filterScheme, arginfo_phalcon_http_message_uri_filterscheme, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_Uri, splitQueryValue, arginfo_phalcon_http_message_uri_splitqueryvalue, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Message_Uri, getArrVal, arginfo_phalcon_http_message_uri_getarrval, ZEND_ACC_PRIVATE) - PHP_FE_END -}; - -zend_class_entry *phalcon_http_message_urifactory_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Http_Message_UriFactory); - -static PHP_METHOD(Phalcon_Http_Message_UriFactory, createUri); - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_message_urifactory_createuri, 0, 0, Psr\\Http\\Message\\UriInterface, 0) - ZEND_ARG_TYPE_INFO(0, uri, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_http_message_urifactory_method_entry) { - PHP_ME(Phalcon_Http_Message_UriFactory, createUri, arginfo_phalcon_http_message_urifactory_createuri, ZEND_ACC_PUBLIC) - PHP_FE_END -}; - zend_class_entry *phalcon_http_request_ce; ZEPHIR_INIT_CLASS(Phalcon_Http_Request); @@ -24131,37 +23072,6 @@ ZEPHIR_INIT_FUNCS(phalcon_http_response_headers_method_entry) { PHP_FE_END }; -zend_class_entry *phalcon_http_server_abstractmiddleware_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Http_Server_AbstractMiddleware); - -static PHP_METHOD(Phalcon_Http_Server_AbstractMiddleware, process); - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_server_abstractmiddleware_process, 0, 2, Psr\\Http\\Message\\ResponseInterface, 0) - ZEND_ARG_OBJ_INFO(0, request, Psr\\Http\\Message\\ServerRequestInterface, 0) - ZEND_ARG_OBJ_INFO(0, handler, Psr\\Http\\Server\\RequestHandlerInterface, 0) -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_http_server_abstractmiddleware_method_entry) { - PHP_ME(Phalcon_Http_Server_AbstractMiddleware, process, arginfo_phalcon_http_server_abstractmiddleware_process, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC) - PHP_FE_END -}; - -zend_class_entry *phalcon_http_server_abstractrequesthandler_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Http_Server_AbstractRequestHandler); - -static PHP_METHOD(Phalcon_Http_Server_AbstractRequestHandler, handle); - -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_server_abstractrequesthandler_handle, 0, 1, Psr\\Http\\Message\\ResponseInterface, 0) - ZEND_ARG_OBJ_INFO(0, request, Psr\\Http\\Message\\ServerRequestInterface, 0) -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_http_server_abstractrequesthandler_method_entry) { - PHP_ME(Phalcon_Http_Server_AbstractRequestHandler, handle, arginfo_phalcon_http_server_abstractrequesthandler_handle, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC) - PHP_FE_END -}; - zend_class_entry *phalcon_image_adapter_gd_ce; ZEPHIR_INIT_CLASS(Phalcon_Image_Adapter_Gd); @@ -24695,6 +23605,11 @@ ZEPHIR_INIT_FUNCS(phalcon_logger_adapterfactory_method_entry) { PHP_FE_END }; +zend_class_entry *phalcon_logger_enum_ce; + +ZEPHIR_INIT_CLASS(Phalcon_Logger_Enum); + + zend_class_entry *phalcon_logger_exception_ce; ZEPHIR_INIT_CLASS(Phalcon_Logger_Exception); @@ -25130,7 +24045,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_messages_offset ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_messages_messages_offsetget, 0, 0, 1) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_messages_offsetget, 0, 1, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_messages_offsetget, 0, 1, IS_NULL, 0) +#endif ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() @@ -25464,22 +24383,26 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_micro_notfound, 0, 1, ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_offsetexists, 0, 1, _IS_BOOL, 0) - ZEND_ARG_INFO(0, alias) + ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_micro_offsetget, 0, 0, 1) - ZEND_ARG_INFO(0, alias) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_offsetget, 0, 1, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_offsetget, 0, 1, IS_NULL, 0) +#endif + ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_offsetset, 0, 2, IS_VOID, 0) - ZEND_ARG_INFO(0, alias) - ZEND_ARG_INFO(0, definition) + ZEND_ARG_INFO(0, offset) + ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_offsetunset, 0, 1, IS_VOID, 0) - ZEND_ARG_INFO(0, alias) + ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_micro_options, 0, 2, Phalcon\\Mvc\\Router\\RouteInterface, 0) @@ -25689,12 +24612,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_micro_collection_setp ZEND_ARG_TYPE_INFO(0, prefix, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_collection_addmap, 0, 4, IS_VOID, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_collection_addmap, 0, 3, IS_VOID, 0) ZEND_ARG_INFO(0, method) ZEND_ARG_TYPE_INFO(0, routePattern, IS_STRING, 0) ZEND_ARG_INFO(0, handler) - ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_micro_collection_zephir_init_properties_phalcon_mvc_micro_collection, 0, 0, 0) @@ -25879,6 +24802,8 @@ static PHP_METHOD(Phalcon_Mvc_Model, useDynamicUpdate); static PHP_METHOD(Phalcon_Mvc_Model, validate); static PHP_METHOD(Phalcon_Mvc_Model, validationHasFailed); static PHP_METHOD(Phalcon_Mvc_Model, caseInsensitiveColumnMap); +static PHP_METHOD(Phalcon_Mvc_Model, __serialize); +static PHP_METHOD(Phalcon_Mvc_Model, __unserialize); zend_object *zephir_init_properties_Phalcon_Mvc_Model(zend_class_entry *class_type); ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_gettransaction, 0, 0, IS_NULL, 1) @@ -26087,9 +25012,15 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_serialize, 0, 0, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_unserialize, 0, 0, 1) - ZEND_ARG_INFO(0, data) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_unserialize, 0, 1, IS_VOID, 0) + ZEND_ARG_TYPE_INFO(0, serialized, IS_STRING, 0) ZEND_END_ARG_INFO() +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_unserialize, 0, 1, IS_VOID, 0) + ZEND_ARG_INFO(0, serialized) +ZEND_END_ARG_INFO() +#endif ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_setconnectionservice, 0, 1, IS_VOID, 0) @@ -26324,6 +25255,14 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_caseinsensitiv ZEND_ARG_INFO(0, key) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model___serialize, 0, 0, IS_ARRAY, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model___unserialize, 0, 1, IS_VOID, 0) + + ZEND_ARG_ARRAY_INFO(0, data, 0) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_zephir_init_properties_phalcon_mvc_model, 0, 0, 0) ZEND_END_ARG_INFO() @@ -26431,6 +25370,8 @@ ZEPHIR_INIT_FUNCS(phalcon_mvc_model_method_entry) { PHP_ME(Phalcon_Mvc_Model, validate, arginfo_phalcon_mvc_model_validate, ZEND_ACC_PROTECTED) PHP_ME(Phalcon_Mvc_Model, validationHasFailed, arginfo_phalcon_mvc_model_validationhasfailed, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model, caseInsensitiveColumnMap, arginfo_phalcon_mvc_model_caseinsensitivecolumnmap, ZEND_ACC_PRIVATE|ZEND_ACC_STATIC) + PHP_ME(Phalcon_Mvc_Model, __serialize, arginfo_phalcon_mvc_model___serialize, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Model, __unserialize, arginfo_phalcon_mvc_model___unserialize, ZEND_ACC_PUBLIC) PHP_FE_END }; @@ -28543,6 +27484,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current); static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, toArray); static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, serialize); static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, unserialize); +static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, __serialize); +static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, __unserialize); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex___construct, 0, 0, 1) ZEND_ARG_INFO(0, columnTypes) @@ -28550,7 +27493,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex___construct, ZEND_ARG_INFO(0, cache) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex_current, 0, 0, 0) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex_current, 0, 0, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex_current, 0, 0, IS_NULL, 0) +#endif ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex_toarray, 0, 0, IS_ARRAY, 0) @@ -28564,16 +27511,22 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_comp ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex___serialize, 0, 0, IS_ARRAY, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex___unserialize, 0, 1, IS_VOID, 0) + + ZEND_ARG_ARRAY_INFO(0, data, 0) +ZEND_END_ARG_INFO() + ZEPHIR_INIT_FUNCS(phalcon_mvc_model_resultset_complex_method_entry) { PHP_ME(Phalcon_Mvc_Model_Resultset_Complex, __construct, arginfo_phalcon_mvc_model_resultset_complex___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) -#if PHP_VERSION_ID >= 80000 PHP_ME(Phalcon_Mvc_Model_Resultset_Complex, current, arginfo_phalcon_mvc_model_resultset_complex_current, ZEND_ACC_FINAL|ZEND_ACC_PUBLIC) -#else - PHP_ME(Phalcon_Mvc_Model_Resultset_Complex, current, NULL, ZEND_ACC_FINAL|ZEND_ACC_PUBLIC) -#endif PHP_ME(Phalcon_Mvc_Model_Resultset_Complex, toArray, arginfo_phalcon_mvc_model_resultset_complex_toarray, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model_Resultset_Complex, serialize, arginfo_phalcon_mvc_model_resultset_complex_serialize, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model_Resultset_Complex, unserialize, arginfo_phalcon_mvc_model_resultset_complex_unserialize, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Model_Resultset_Complex, __serialize, arginfo_phalcon_mvc_model_resultset_complex___serialize, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Model_Resultset_Complex, __unserialize, arginfo_phalcon_mvc_model_resultset_complex___unserialize, ZEND_ACC_PUBLIC) PHP_FE_END }; @@ -28586,6 +27539,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, current); static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray); static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, serialize); static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, unserialize); +static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, __serialize); +static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, __unserialize); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset_simple___construct, 0, 0, 3) ZEND_ARG_INFO(0, columnMap) @@ -28610,12 +27565,22 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_simp ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_simple___serialize, 0, 0, IS_ARRAY, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_simple___unserialize, 0, 1, IS_VOID, 0) + + ZEND_ARG_ARRAY_INFO(0, data, 0) +ZEND_END_ARG_INFO() + ZEPHIR_INIT_FUNCS(phalcon_mvc_model_resultset_simple_method_entry) { PHP_ME(Phalcon_Mvc_Model_Resultset_Simple, __construct, arginfo_phalcon_mvc_model_resultset_simple___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) PHP_ME(Phalcon_Mvc_Model_Resultset_Simple, current, arginfo_phalcon_mvc_model_resultset_simple_current, ZEND_ACC_FINAL|ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model_Resultset_Simple, toArray, arginfo_phalcon_mvc_model_resultset_simple_toarray, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model_Resultset_Simple, serialize, arginfo_phalcon_mvc_model_resultset_simple_serialize, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model_Resultset_Simple, unserialize, arginfo_phalcon_mvc_model_resultset_simple_unserialize, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Model_Resultset_Simple, __serialize, arginfo_phalcon_mvc_model_resultset_simple___serialize, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Model_Resultset_Simple, __unserialize, arginfo_phalcon_mvc_model_resultset_simple___unserialize, ZEND_ACC_PUBLIC) PHP_FE_END }; @@ -28636,7 +27601,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Row, writeAttribute); ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_row_jsonserialize, 0, 0, IS_ARRAY, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_row_offsetget, 0, 0, 1) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_row_offsetget, 0, 1, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_row_offsetget, 0, 1, IS_NULL, 0) +#endif ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() @@ -30751,9 +29720,19 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_session_adapter_stream_d ZEND_ARG_INFO(0, sessionId) ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 80100 +ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_phalcon_session_adapter_stream_gc, 0, 1, MAY_BE_LONG|MAY_BE_FALSE) + ZEND_ARG_TYPE_INFO(0, maxlifetime, IS_LONG, 0) +ZEND_END_ARG_INFO() +#elif PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_session_adapter_stream_gc, 0, 0, 1) + ZEND_ARG_TYPE_INFO(0, maxlifetime, IS_LONG, 0) +ZEND_END_ARG_INFO() +#else ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_session_adapter_stream_gc, 0, 0, 1) - ZEND_ARG_INFO(0, maxlifetime) + ZEND_ARG_INFO(0, maxlifetime) ZEND_END_ARG_INFO() +#endif ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_session_adapter_stream_open, 0, 2, _IS_BOOL, 0) ZEND_ARG_INFO(0, savePath) @@ -31116,10 +30095,15 @@ static PHP_METHOD(Phalcon_Storage_Serializer_Base64, phpBase64Decode); ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_base64_serialize, 0, 0, IS_STRING, 0) ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_base64_unserialize, 0, 1, IS_VOID, 0) - - ZEND_ARG_INFO(0, data) + ZEND_ARG_TYPE_INFO(0, serialized, IS_STRING, 0) ZEND_END_ARG_INFO() +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_base64_unserialize, 0, 1, IS_VOID, 0) + ZEND_ARG_INFO(0, serialized) +ZEND_END_ARG_INFO() +#endif ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_base64_phpbase64decode, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0) @@ -31145,10 +30129,15 @@ static PHP_METHOD(Phalcon_Storage_Serializer_Json, getEncode); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_json_serialize, 0, 0, 0) ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_json_unserialize, 0, 1, IS_VOID, 0) - - ZEND_ARG_INFO(0, data) + ZEND_ARG_TYPE_INFO(0, serialized, IS_STRING, 0) +ZEND_END_ARG_INFO() +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_json_unserialize, 0, 1, IS_VOID, 0) + ZEND_ARG_INFO(0, serialized) ZEND_END_ARG_INFO() +#endif ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_json_getdecode, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0) @@ -31222,12 +30211,21 @@ static PHP_METHOD(Phalcon_Storage_Serializer_Php, phpUnserialize); ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_php_serialize, 0, 0, IS_STRING, 0) ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_php_unserialize, 0, 1, IS_VOID, 0) - - ZEND_ARG_INFO(0, data) + ZEND_ARG_TYPE_INFO(0, serialized, IS_STRING, 0) +ZEND_END_ARG_INFO() +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_php_unserialize, 0, 1, IS_VOID, 0) + ZEND_ARG_INFO(0, serialized) ZEND_END_ARG_INFO() +#endif -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_php_phpunserialize, 0, 0, 1) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_php_phpunserialize, 0, 1, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_php_phpunserialize, 0, 1, IS_NULL, 0) +#endif ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0) #if PHP_VERSION_ID >= 80000 ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "[]") @@ -32761,7 +31759,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_registry_offsete ZEND_ARG_INFO(0, element) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_support_registry_offsetget, 0, 0, 1) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_registry_offsetget, 0, 1, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_registry_offsetget, 0, 1, IS_NULL, 0) +#endif ZEND_ARG_INFO(0, element) ZEND_END_ARG_INFO() @@ -33664,11 +32666,8 @@ ZEPHIR_INIT_CLASS(phalcon_0__closure); static PHP_METHOD(phalcon_0__closure, __invoke); -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_0__closure___invoke, 0, 0, 4) - ZEND_ARG_INFO(0, number) - ZEND_ARG_INFO(0, message) - ZEND_ARG_INFO(0, file) - ZEND_ARG_INFO(0, line) +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_0__closure___invoke, 0, 0, 1) + ZEND_ARG_INFO(0, element) ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_0__closure_method_entry) { @@ -33682,12 +32681,11 @@ ZEPHIR_INIT_CLASS(phalcon_1__closure); static PHP_METHOD(phalcon_1__closure, __invoke); -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_1__closure___invoke, 0, 0, 5) +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_1__closure___invoke, 0, 0, 4) ZEND_ARG_INFO(0, number) ZEND_ARG_INFO(0, message) ZEND_ARG_INFO(0, file) ZEND_ARG_INFO(0, line) - ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_1__closure_method_entry) { @@ -33701,8 +32699,12 @@ ZEPHIR_INIT_CLASS(phalcon_2__closure); static PHP_METHOD(phalcon_2__closure, __invoke); -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_2__closure___invoke, 0, 0, 1) - ZEND_ARG_INFO(0, element) +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_2__closure___invoke, 0, 0, 5) + ZEND_ARG_INFO(0, number) + ZEND_ARG_INFO(0, message) + ZEND_ARG_INFO(0, file) + ZEND_ARG_INFO(0, line) + ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_2__closure_method_entry) { @@ -33790,11 +32792,8 @@ ZEPHIR_INIT_CLASS(phalcon_7__closure); static PHP_METHOD(phalcon_7__closure, __invoke); -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_7__closure___invoke, 0, 0, 4) - ZEND_ARG_INFO(0, number) - ZEND_ARG_INFO(0, message) +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_7__closure___invoke, 0, 0, 1) ZEND_ARG_INFO(0, file) - ZEND_ARG_INFO(0, line) ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_7__closure_method_entry) { @@ -33808,12 +32807,8 @@ ZEPHIR_INIT_CLASS(phalcon_8__closure); static PHP_METHOD(phalcon_8__closure, __invoke); -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_8__closure___invoke, 0, 0, 5) - ZEND_ARG_INFO(0, number) - ZEND_ARG_INFO(0, message) - ZEND_ARG_INFO(0, file) - ZEND_ARG_INFO(0, line) - ZEND_ARG_INFO(0, context) +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_8__closure___invoke, 0, 0, 1) + ZEND_ARG_INFO(0, element) ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_8__closure_method_entry) { @@ -33828,7 +32823,7 @@ ZEPHIR_INIT_CLASS(phalcon_9__closure); static PHP_METHOD(phalcon_9__closure, __invoke); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_9__closure___invoke, 0, 0, 1) - ZEND_ARG_INFO(0, file) + ZEND_ARG_INFO(0, element) ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_9__closure_method_entry) { @@ -33843,7 +32838,7 @@ ZEPHIR_INIT_CLASS(phalcon_10__closure); static PHP_METHOD(phalcon_10__closure, __invoke); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_10__closure___invoke, 0, 0, 1) - ZEND_ARG_INFO(0, element) + ZEND_ARG_INFO(0, action) ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_10__closure_method_entry) { @@ -33857,8 +32852,11 @@ ZEPHIR_INIT_CLASS(phalcon_11__closure); static PHP_METHOD(phalcon_11__closure, __invoke); -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_11__closure___invoke, 0, 0, 1) - ZEND_ARG_INFO(0, element) +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_11__closure___invoke, 0, 0, 4) + ZEND_ARG_INFO(0, number) + ZEND_ARG_INFO(0, message) + ZEND_ARG_INFO(0, file) + ZEND_ARG_INFO(0, line) ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_11__closure_method_entry) { @@ -33872,8 +32870,12 @@ ZEPHIR_INIT_CLASS(phalcon_12__closure); static PHP_METHOD(phalcon_12__closure, __invoke); -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_12__closure___invoke, 0, 0, 1) - ZEND_ARG_INFO(0, action) +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_12__closure___invoke, 0, 0, 5) + ZEND_ARG_INFO(0, number) + ZEND_ARG_INFO(0, message) + ZEND_ARG_INFO(0, file) + ZEND_ARG_INFO(0, line) + ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_12__closure_method_entry) { @@ -33887,11 +32889,8 @@ ZEPHIR_INIT_CLASS(phalcon_13__closure); static PHP_METHOD(phalcon_13__closure, __invoke); -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_13__closure___invoke, 0, 0, 4) - ZEND_ARG_INFO(0, number) - ZEND_ARG_INFO(0, message) - ZEND_ARG_INFO(0, file) - ZEND_ARG_INFO(0, line) +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_13__closure___invoke, 0, 0, 1) + ZEND_ARG_INFO(0, element) ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_13__closure_method_entry) { @@ -33905,12 +32904,8 @@ ZEPHIR_INIT_CLASS(phalcon_14__closure); static PHP_METHOD(phalcon_14__closure, __invoke); -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_14__closure___invoke, 0, 0, 5) - ZEND_ARG_INFO(0, number) - ZEND_ARG_INFO(0, message) - ZEND_ARG_INFO(0, file) - ZEND_ARG_INFO(0, line) - ZEND_ARG_INFO(0, context) +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_14__closure___invoke, 0, 0, 1) + ZEND_ARG_INFO(0, element) ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_14__closure_method_entry) { @@ -33918,34 +32913,4 @@ ZEPHIR_INIT_FUNCS(phalcon_14__closure_method_entry) { PHP_FE_END }; -zend_class_entry *phalcon_15__closure_ce; - -ZEPHIR_INIT_CLASS(phalcon_15__closure); - -static PHP_METHOD(phalcon_15__closure, __invoke); - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_15__closure___invoke, 0, 0, 1) - ZEND_ARG_INFO(0, element) -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_15__closure_method_entry) { - PHP_ME(phalcon_15__closure, __invoke, arginfo_phalcon_15__closure___invoke, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) - PHP_FE_END -}; - -zend_class_entry *phalcon_16__closure_ce; - -ZEPHIR_INIT_CLASS(phalcon_16__closure); - -static PHP_METHOD(phalcon_16__closure, __invoke); - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_16__closure___invoke, 0, 0, 1) - ZEND_ARG_INFO(0, element) -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_16__closure_method_entry) { - PHP_ME(phalcon_16__closure, __invoke, arginfo_phalcon_16__closure___invoke, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) - PHP_FE_END -}; - #endif \ No newline at end of file diff --git a/build/phalcon/php_phalcon.h b/build/phalcon/php_phalcon.h index 1248e844a27..c233b2c5300 100644 --- a/build/phalcon/php_phalcon.h +++ b/build/phalcon/php_phalcon.h @@ -106,7 +106,7 @@ typedef zend_function zephir_fcall_cache_entry; #define PHP_PHALCON_VERSION "5.0.0beta3" #define PHP_PHALCON_EXTNAME "phalcon" #define PHP_PHALCON_AUTHOR "Phalcon Team and contributors" -#define PHP_PHALCON_ZEPVERSION "0.15.2-5828ae2" +#define PHP_PHALCON_ZEPVERSION "0.16.0-$Id$" #define PHP_PHALCON_DESCRIPTION "Phalcon is a full stack PHP framework, delivered as a PHP extension, offering lower resource consumption and high performance." typedef struct _zephir_struct_db { From 3c3be29562f347208b8bfd03553e54b2f313c3e0 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 21:30:10 +0100 Subject: [PATCH 75/91] #15598 - Change version in package.xml --- package.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.xml b/package.xml index 786bb98e098..175f64a92a1 100644 --- a/package.xml +++ b/package.xml @@ -25,8 +25,8 @@ 2021-11-16 - 5.0.0beta3 - 5.0.0beta3 + 5.0.0rc1 + 5.0.0rc1 beta From c74dc4e083299ac0627bfb414be49a4f63f3caf8 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 22:07:00 +0100 Subject: [PATCH 76/91] #15598 - Add 'options' for postgres service --- .github/workflows/main.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9ba66363892..52beacf1c59 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -239,10 +239,15 @@ jobs: postgres: image: postgres:12-alpine ports: - - "5435:5432" + - "5432:5432" env: POSTGRES_PASSWORD: secret POSTGRES_DB: phalcon + options: >- + --health-cmd pg_isready + --health-interval 10s + --health-timeout 5s + --health-retries 5 redis: image: redis:5-alpine ports: From a8c6982d45c426aaaced94c2b98d315b530831d0 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 22:36:13 +0100 Subject: [PATCH 77/91] #15598 - Remove mentions of PSR --- phalcon/Mvc/Model/Query.zep | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/phalcon/Mvc/Model/Query.zep b/phalcon/Mvc/Model/Query.zep index 0b568ba1639..848a72517b7 100644 --- a/phalcon/Mvc/Model/Query.zep +++ b/phalcon/Mvc/Model/Query.zep @@ -296,13 +296,10 @@ class Query implements QueryInterface, InjectionAwareInterface let cache = this->container->getShared(cacheService); - if unlikely ( - true !== is_a(cache, "Phalcon\\Cache\\CacheInterface") && - true !== is_a(cache, "Psr\\SimpleCache\\CacheInterface") - ) { + if unlikely (true !== is_a(cache, "Phalcon\\Cache\\CacheInterface")) { throw new Exception( "Cache service must be an object implementing " . - "Phalcon\Cache\CacheInterface or Psr\SimpleCache\CacheInterface" + "Phalcon\Cache\CacheInterface" ); } From 0e8a4e108c3318105592650c57c20f8cb1ec9d00 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 22:38:26 +0100 Subject: [PATCH 78/91] #15598 - Add `*.dep` to ignore list --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 1f3b0465585..f37bf9f31fb 100644 --- a/.gitignore +++ b/.gitignore @@ -43,6 +43,7 @@ ext/run-tests.php *.la *.log *.loT +*.dep *.gch *.h.ghc *.phc From 83f2ed61b9471ba265ff1a02ebb981cf768a2e18 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 22:40:09 +0100 Subject: [PATCH 79/91] #15598 - Implement `__serialize()` and `__unserialize()` methods --- phalcon/Storage/Serializer/AbstractSerializer.zep | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/phalcon/Storage/Serializer/AbstractSerializer.zep b/phalcon/Storage/Serializer/AbstractSerializer.zep index d109163c42e..f529f9f1cc2 100644 --- a/phalcon/Storage/Serializer/AbstractSerializer.zep +++ b/phalcon/Storage/Serializer/AbstractSerializer.zep @@ -81,11 +81,16 @@ abstract class AbstractSerializer implements SerializerInterface public function __serialize() -> array { + var_dump(this->data); + if typeof this->data === "array" { + return this->data; + } + return []; } public function __unserialize(array data) -> void { - // Nothing here + let this->data = data; } } From 0ca88fff6accd19d09173f3f27e8cbc3383c0c49 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 22:40:21 +0100 Subject: [PATCH 80/91] #15598 - Adjust test case --- tests/database/Mvc/Model/FindCest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/database/Mvc/Model/FindCest.php b/tests/database/Mvc/Model/FindCest.php index de3630531a8..36d18f38ad8 100644 --- a/tests/database/Mvc/Model/FindCest.php +++ b/tests/database/Mvc/Model/FindCest.php @@ -227,7 +227,7 @@ public function mvcModelFindWithCacheException(DatabaseTester $I) $I->expectThrowable( new Exception( "Cache service must be an object implementing " . - "Phalcon\Cache\CacheInterface or Psr\SimpleCache\CacheInterface" + "Phalcon\Cache\CacheInterface" ), function () { $options = [ @@ -320,7 +320,7 @@ public function mvcModelFindPrivatePropertyWithRedisCache(DatabaseTester $I) ] ); - $I->assertSame(1, $cached->count()); + $I->assertCount(1, $cached); $record = $cached[0]; $actual = $record->getIsActive(); From f2de3da63ef1293404f09373b0542e62c45c2fab Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 22:44:07 +0100 Subject: [PATCH 81/91] #15598 - Uppercase 'release candidate (RC)' in version --- .github/workflows/main.yml | 2 +- package.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 52beacf1c59..dd5fcfdb223 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ on: env: # All versions should be declared here - PHALCON_VERSION: 5.0.0rc1 + PHALCON_VERSION: 5.0.0RC1 ZEPHIR_PARSER_VERSION: 1.5.0 ZEPHIR_VERSION: 0.16.0 diff --git a/package.xml b/package.xml index 175f64a92a1..5e01a6193a0 100644 --- a/package.xml +++ b/package.xml @@ -22,11 +22,11 @@ ruud@ruudboon.io yes - 2021-11-16 + 2022-05-29 - 5.0.0rc1 - 5.0.0rc1 + 5.0.0RC1 + 5.0.0RC1 beta From adf1aa3399d225be9d811bb60d5cf2eb8fb60e51 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 22:44:19 +0100 Subject: [PATCH 82/91] #15598 - Implement `__serialize()` and `__unserialize()` methods --- phalcon/Mvc/Model.zep | 95 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 92 insertions(+), 3 deletions(-) diff --git a/phalcon/Mvc/Model.zep b/phalcon/Mvc/Model.zep index 42f911995a6..6cc1e4899ea 100644 --- a/phalcon/Mvc/Model.zep +++ b/phalcon/Mvc/Model.zep @@ -5817,12 +5817,101 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface, public function __serialize() -> array { - // Nothing here - return []; + /** + * Use the standard serialize function to serialize the array data + */ + var attributes, manager, dirtyState, snapshot = null; + + let attributes = this->toArray(), + dirtyState = this->dirtyState, + manager = this->getModelsManager(); + + if manager->isKeepingSnapshots(this) && this->snapshot !== null && attributes != this->snapshot { + let snapshot = this->snapshot; + } + + return [ + "attributes": attributes, + "snapshot": snapshot, + "dirtyState": dirtyState + ]; } public function __unserialize(array data) -> void { - // Nothing here + var container, manager, key, value, snapshot, properties, dirtyState; + + if !isset data["attributes"] { + let data = [ + "attributes": data + ]; + } + + /** + * Obtain the default DI + */ + let container = Di::getDefault(); + if container === null { + throw new Exception( + "A dependency injection container is required to access the services related to the ODM" + ); + } + + /** + * Update the dependency injector + */ + let this->container = container; + + /** + * Gets the default modelsManager service + */ + let manager = container->getShared("modelsManager"); + if manager === null { + throw new Exception( + "The injected service 'modelsManager' is not valid" + ); + } + + /** + * Update the models manager + */ + let this->modelsManager = manager; + + /** + * Try to initialize the model + */ + manager->initialize(this); + + /** + * Fetch serialized props + */ + if fetch properties, data["attributes"] { + /** + * Update the objects properties + */ + for key, value in properties { + let this->{key} = value; + } + } else { + let properties = []; + } + + /** + * Fetch serialized dirtyState + */ + if fetch dirtyState, data["dirtyState"] { + let this->dirtyState = dirtyState; + } + + /** + * Fetch serialized snapshot when option is active + */ + if manager->isKeepingSnapshots(this) { + if fetch snapshot, data["snapshot"] { + let this->snapshot = snapshot; + } else { + let this->snapshot = properties; + } + } } } From bea1819de067e148fdf8c32e5b1c5b9ac4c6d20d Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 22:45:31 +0100 Subject: [PATCH 83/91] #15598 - Update postgres port --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dd5fcfdb223..acce25df85a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -353,7 +353,7 @@ jobs: - name: Run Database Tests (Postgres) env: DATA_POSTGRES_USER: postgres - DATA_POSTGRES_PORT: ${{ job.services.postgres.ports['5435'] }} + DATA_POSTGRES_PORT: ${{ job.services.postgres.ports['5432'] }} DATA_REDIS_PORT: ${{ job.services.redis.ports['6379'] }} DATA_MEMCACHED_PORT: ${{ job.services.memcached.ports['11211'] }} if: always() From 8468918b6113254e72220fa86d1700484d81ad27 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 23:00:41 +0100 Subject: [PATCH 84/91] #15598 - Remove debug code --- phalcon/Storage/Serializer/AbstractSerializer.zep | 1 - 1 file changed, 1 deletion(-) diff --git a/phalcon/Storage/Serializer/AbstractSerializer.zep b/phalcon/Storage/Serializer/AbstractSerializer.zep index f529f9f1cc2..d20ec493114 100644 --- a/phalcon/Storage/Serializer/AbstractSerializer.zep +++ b/phalcon/Storage/Serializer/AbstractSerializer.zep @@ -81,7 +81,6 @@ abstract class AbstractSerializer implements SerializerInterface public function __serialize() -> array { - var_dump(this->data); if typeof this->data === "array" { return this->data; } From f1b4732435ce4d2ab1cbc678f1cd197309820aa4 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 23:02:33 +0100 Subject: [PATCH 85/91] #15598 - Remove PSR dependency in config.w32 --- build/config/config.w32 | 1 - build/phalcon/config.w32 | 1 - 2 files changed, 2 deletions(-) diff --git a/build/config/config.w32 b/build/config/config.w32 index 850b5241531..e1efd8ea9b9 100644 --- a/build/config/config.w32 +++ b/build/config/config.w32 @@ -10,5 +10,4 @@ if (PHP_PHALCON != "no") { EXTENSION("phalcon", "phalcon.zep.c", null, "-I"+configure_module_dirname); ADD_FLAG("CFLAGS", "/D ZEPHIR_RELEASE /Oi /Ot /Oy /Ob2 /Gs /GF /Gy /GL"); ADD_FLAG("LDFLAGS", "/LTCG"); - ADD_EXTENSION_DEP("phalcon", "psr"); } diff --git a/build/phalcon/config.w32 b/build/phalcon/config.w32 index 850b5241531..e1efd8ea9b9 100644 --- a/build/phalcon/config.w32 +++ b/build/phalcon/config.w32 @@ -10,5 +10,4 @@ if (PHP_PHALCON != "no") { EXTENSION("phalcon", "phalcon.zep.c", null, "-I"+configure_module_dirname); ADD_FLAG("CFLAGS", "/D ZEPHIR_RELEASE /Oi /Ot /Oy /Ob2 /Gs /GF /Gy /GL"); ADD_FLAG("LDFLAGS", "/LTCG"); - ADD_EXTENSION_DEP("phalcon", "psr"); } From 5e0d3e2e2cf000beaf2c21f14b78388fae12e197 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Mon, 30 May 2022 22:11:26 +0100 Subject: [PATCH 86/91] #15598 - Add 'DATA_POSTGRES_PASS' env variable --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index acce25df85a..9360a774b64 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -353,6 +353,7 @@ jobs: - name: Run Database Tests (Postgres) env: DATA_POSTGRES_USER: postgres + DATA_POSTGRES_PASS: secret DATA_POSTGRES_PORT: ${{ job.services.postgres.ports['5432'] }} DATA_REDIS_PORT: ${{ job.services.redis.ports['6379'] }} DATA_MEMCACHED_PORT: ${{ job.services.memcached.ports['11211'] }} From 6013f323ae9d6af6772c11e6df19db82fb4add42 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Mon, 30 May 2022 22:11:48 +0100 Subject: [PATCH 87/91] #15598 - Implement `__serialize()` and `__unserialize()` methods --- phalcon/Mvc/Model/Resultset/Complex.zep | 61 ++++++++++++++++++++----- phalcon/Mvc/Model/Resultset/Simple.zep | 30 +++++++++--- 2 files changed, 73 insertions(+), 18 deletions(-) diff --git a/phalcon/Mvc/Model/Resultset/Complex.zep b/phalcon/Mvc/Model/Resultset/Complex.zep index 52a2536c4c9..24a889a632a 100644 --- a/phalcon/Mvc/Model/Resultset/Complex.zep +++ b/phalcon/Mvc/Model/Resultset/Complex.zep @@ -165,7 +165,6 @@ class Complex extends Resultset implements ResultsetInterface * Generate the column value according to the hydration type */ switch hydrateMode { - case Resultset::HYDRATE_RECORDS: // Check if the resultset must keep snapshots if !fetch keepSnapshots, column["keepSnapshots"] { @@ -173,7 +172,6 @@ class Complex extends Resultset implements ResultsetInterface } if globals_get("orm.late_state_binding") { - if column["instance"] instanceof Model { let modelName = get_class(column["instance"]); } else { @@ -187,9 +185,7 @@ class Complex extends Resultset implements ResultsetInterface dirtyState, keepSnapshots ); - } else { - /** * Get the base instance. Assign the values to the * attributes using a column map @@ -220,9 +216,7 @@ class Complex extends Resultset implements ResultsetInterface * The complete object is assigned to an attribute with the name of the alias or the model name */ let attribute = column["balias"]; - } else { - /** * Scalar columns are simply assigned to the result object */ @@ -243,7 +237,6 @@ class Complex extends Resultset implements ResultsetInterface } if !fetch eager, column["eager"] { - /** * Assign the instance according to the hydration type */ @@ -308,8 +301,7 @@ class Complex extends Resultset implements ResultsetInterface hydrateMode = this->hydrateMode; let container = Di::getDefault(); - - if unlikely typeof container != "object" { + if container === null { throw new Exception( "The dependency injector container is not valid" ); @@ -381,11 +373,58 @@ class Complex extends Resultset implements ResultsetInterface public function __serialize() -> array { - return []; + var records, cache, columnTypes, hydrateMode; + + /** + * Obtain the records as an array + */ + let records = this->toArray(); + + let cache = this->cache, + columnTypes = this->columnTypes, + hydrateMode = this->hydrateMode; + + return [ + "cache" : cache, + "rows" : records, + "columnTypes" : columnTypes, + "hydrateMode" : hydrateMode + ]; } public function __unserialize(array data) -> void { - // Nothing here + var resultset, container, serializer; + + /** + * Rows are already hydrated + */ + let this->disableHydration = true; + + let container = Di::getDefault(); + if container === null { + throw new Exception( + "The dependency injector container is not valid" + ); + } + + if container->has("serializer") { + let serializer = container->getShared("serializer"); + + serializer->unserialize(data); + let resultset = serializer->getData(); + } else { + let resultset = unserialize(data); + } + + if unlikely typeof resultset != "array" { + throw new Exception("Invalid serialization data"); + } + + let this->rows = resultset["rows"], + this->count = count(resultset["rows"]), + this->cache = resultset["cache"], + this->columnTypes = resultset["columnTypes"], + this->hydrateMode = resultset["hydrateMode"]; } } diff --git a/phalcon/Mvc/Model/Resultset/Simple.zep b/phalcon/Mvc/Model/Resultset/Simple.zep index b0c0e234cf4..320ab145da5 100644 --- a/phalcon/Mvc/Model/Resultset/Simple.zep +++ b/phalcon/Mvc/Model/Resultset/Simple.zep @@ -254,8 +254,7 @@ class Simple extends Resultset array data; let container = Di::getDefault(); - - if unlikely typeof container != "object" { + if container === null { throw new Exception( "The dependency injector container is not valid" ); @@ -292,8 +291,7 @@ class Simple extends Resultset var resultset, keepSnapshots, container, serializer; let container = Di::getDefault(); - - if unlikely typeof container != "object" { + if container === null { throw new Exception( "The dependency injector container is not valid" ); @@ -308,7 +306,7 @@ class Simple extends Resultset let resultset = unserialize(data); } - if unlikely typeof resultset != "array" { + if unlikely typeof resultset !== "array" { throw new Exception("Invalid serialization data"); } @@ -326,11 +324,29 @@ class Simple extends Resultset public function __serialize() -> array { - return []; + return [ + "model" : this->model, + "cache" : this->cache, + "rows" : this->toArray(false), + "columnMap" : this->columnMap, + "hydrateMode" : this->hydrateMode, + "keepSnapshots" : this->keepSnapshots + ]; } public function __unserialize(array data) -> void { - // Nothing here + var keepSnapshots; + + let this->model = data["model"], + this->rows = data["rows"], + this->count = count(data["rows"]), + this->cache = data["cache"], + this->columnMap = data["columnMap"], + this->hydrateMode = data["hydrateMode"]; + + if fetch keepSnapshots, data["keepSnapshots"] { + let this->keepSnapshots = keepSnapshots; + } } } From 1ff4fc0cca8528d8d8214837f56b91a8c61b6d88 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Mon, 30 May 2022 22:34:13 +0100 Subject: [PATCH 88/91] #15598 - Adjust test case --- tests/database/Mvc/Model/FindCest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/database/Mvc/Model/FindCest.php b/tests/database/Mvc/Model/FindCest.php index 36d18f38ad8..5ca5fd3736b 100644 --- a/tests/database/Mvc/Model/FindCest.php +++ b/tests/database/Mvc/Model/FindCest.php @@ -289,7 +289,7 @@ public function mvcModelFindPrivatePropertyWithRedisCache(DatabaseTester $I) ] ); - $I->assertSame(1, $original->count()); + $I->assertCount(1, $original); $record = $original[0]; $actual = $record->getIsActive(); @@ -345,7 +345,7 @@ public function mvcModelFindPrivatePropertyWithRedisCache(DatabaseTester $I) ] ); - $I->assertSame(0, $original->count()); + $I->assertCount(0, $original); /** * Finally get it back from the cache @@ -364,7 +364,7 @@ public function mvcModelFindPrivatePropertyWithRedisCache(DatabaseTester $I) ] ); - $I->assertSame(1, $cached->count()); + $I->assertCount(1, $cached); $record = $cached[0]; $actual = $record->getIsActive(); From ade445f8c8dd618e2af42da74c526f49da4be055 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Mon, 30 May 2022 22:50:34 +0100 Subject: [PATCH 89/91] #15598 - Add 'POSTGRES_USER' env variable --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9360a774b64..f64be095837 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -241,6 +241,7 @@ jobs: ports: - "5432:5432" env: + POSTGRES_USER: phalcon POSTGRES_PASSWORD: secret POSTGRES_DB: phalcon options: >- @@ -352,7 +353,7 @@ jobs: - name: Run Database Tests (Postgres) env: - DATA_POSTGRES_USER: postgres + DATA_POSTGRES_USER: phalcon DATA_POSTGRES_PASS: secret DATA_POSTGRES_PORT: ${{ job.services.postgres.ports['5432'] }} DATA_REDIS_PORT: ${{ job.services.redis.ports['6379'] }} From 72a952245af7fc8ee2aa358744b023f62eca4f4b Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Mon, 30 May 2022 23:04:06 +0100 Subject: [PATCH 90/91] #15598 - Regenerate ext/ directory --- ext/phalcon/mvc/model.zep.c | 142 +++- ext/phalcon/mvc/model/query.zep.c | 802 +++++++++--------- ext/phalcon/mvc/model/resultset/complex.zep.c | 137 ++- ext/phalcon/mvc/model/resultset/simple.zep.c | 81 +- .../serializer/abstractserializer.zep.c | 14 +- 5 files changed, 726 insertions(+), 450 deletions(-) diff --git a/ext/phalcon/mvc/model.zep.c b/ext/phalcon/mvc/model.zep.c index a9c03ffcd96..88f8c4ed74a 100644 --- a/ext/phalcon/mvc/model.zep.c +++ b/ext/phalcon/mvc/model.zep.c @@ -10981,22 +10981,79 @@ PHP_METHOD(Phalcon_Mvc_Model, caseInsensitiveColumnMap) PHP_METHOD(Phalcon_Mvc_Model, __serialize) { + zend_bool _2, _3; + zval attributes, manager, dirtyState, snapshot, _0, _1, _4, _5$$3; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); + ZVAL_UNDEF(&attributes); + ZVAL_UNDEF(&manager); + ZVAL_UNDEF(&dirtyState); + ZVAL_UNDEF(&snapshot); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_4); + ZVAL_UNDEF(&_5$$3); - array_init(return_value); - return; + ZEPHIR_MM_GROW(); + + ZEPHIR_INIT_VAR(&snapshot); + ZVAL_NULL(&snapshot); + ZEPHIR_CALL_METHOD(&attributes, this_ptr, "toarray", NULL, 0); + zephir_check_call_status(); + zephir_read_property(&_0, this_ptr, ZEND_STRL("dirtyState"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CPY_WRT(&dirtyState, &_0); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getmodelsmanager", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CPY_WRT(&manager, &_1); + ZEPHIR_CALL_METHOD(&_1, &manager, "iskeepingsnapshots", NULL, 0, this_ptr); + zephir_check_call_status(); + _2 = zephir_is_true(&_1); + if (_2) { + zephir_read_property(&_0, this_ptr, ZEND_STRL("snapshot"), PH_NOISY_CC | PH_READONLY); + _2 = Z_TYPE_P(&_0) != IS_NULL; + } + _3 = _2; + if (_3) { + zephir_read_property(&_4, this_ptr, ZEND_STRL("snapshot"), PH_NOISY_CC | PH_READONLY); + _3 = !ZEPHIR_IS_EQUAL(&attributes, &_4); + } + if (_3) { + zephir_read_property(&_5$$3, this_ptr, ZEND_STRL("snapshot"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CPY_WRT(&snapshot, &_5$$3); + } + zephir_create_array(return_value, 3, 0); + zephir_array_update_string(return_value, SL("attributes"), &attributes, PH_COPY | PH_SEPARATE); + zephir_array_update_string(return_value, SL("snapshot"), &snapshot, PH_COPY | PH_SEPARATE); + zephir_array_update_string(return_value, SL("dirtyState"), &dirtyState, PH_COPY | PH_SEPARATE); + RETURN_MM(); } PHP_METHOD(Phalcon_Mvc_Model, __unserialize) { + zend_string *_7$$6; + zend_ulong _6$$6; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *data_param = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zephir_fcall_cache_entry *_1 = NULL; + zval *data_param = NULL, container, manager, key, value, snapshot, properties, dirtyState, _2, _3, _0$$3, *_4$$6, _5$$6; zval data; zval *this_ptr = getThis(); ZVAL_UNDEF(&data); + ZVAL_UNDEF(&container); + ZVAL_UNDEF(&manager); + ZVAL_UNDEF(&key); + ZVAL_UNDEF(&value); + ZVAL_UNDEF(&snapshot); + ZVAL_UNDEF(&properties); + ZVAL_UNDEF(&dirtyState); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_0$$3); + ZVAL_UNDEF(&_5$$6); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -11010,6 +11067,85 @@ PHP_METHOD(Phalcon_Mvc_Model, __unserialize) zephir_get_arrval(&data, data_param); + if (!(zephir_array_isset_string(&data, SL("attributes")))) { + ZEPHIR_INIT_VAR(&_0$$3); + zephir_create_array(&_0$$3, 1, 0); + zephir_array_update_string(&_0$$3, SL("attributes"), &data, PH_COPY | PH_SEPARATE); + ZEPHIR_CPY_WRT(&data, &_0$$3); + } + ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_1, 0); + zephir_check_call_status(); + if (Z_TYPE_P(&container) == IS_NULL) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injection container is required to access the services related to the ODM", "phalcon/Mvc/Model.zep", 5857); + return; + } + zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container); + ZEPHIR_INIT_VAR(&_3); + ZVAL_STRING(&_3, "modelsManager"); + ZEPHIR_CALL_METHOD(&_2, &container, "getshared", NULL, 0, &_3); + zephir_check_call_status(); + ZEPHIR_CPY_WRT(&manager, &_2); + if (Z_TYPE_P(&manager) == IS_NULL) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/Mvc/Model.zep", 5872); + return; + } + zephir_update_property_zval(this_ptr, ZEND_STRL("modelsManager"), &manager); + ZEPHIR_CALL_METHOD(NULL, &manager, "initialize", NULL, 0, this_ptr); + zephir_check_call_status(); + ZEPHIR_OBS_VAR(&properties); + if (zephir_array_isset_string_fetch(&properties, &data, SL("attributes"), 0)) { + zephir_is_iterable(&properties, 0, "phalcon/Mvc/Model.zep", 5895); + if (Z_TYPE_P(&properties) == IS_ARRAY) { + ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&properties), _6$$6, _7$$6, _4$$6) + { + ZEPHIR_INIT_NVAR(&key); + if (_7$$6 != NULL) { + ZVAL_STR_COPY(&key, _7$$6); + } else { + ZVAL_LONG(&key, _6$$6); + } + ZEPHIR_INIT_NVAR(&value); + ZVAL_COPY(&value, _4$$6); + zephir_update_property_zval_zval(this_ptr, &key, &value); + } ZEND_HASH_FOREACH_END(); + } else { + ZEPHIR_CALL_METHOD(NULL, &properties, "rewind", NULL, 0); + zephir_check_call_status(); + while (1) { + ZEPHIR_CALL_METHOD(&_5$$6, &properties, "valid", NULL, 0); + zephir_check_call_status(); + if (!zend_is_true(&_5$$6)) { + break; + } + ZEPHIR_CALL_METHOD(&key, &properties, "key", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&value, &properties, "current", NULL, 0); + zephir_check_call_status(); + zephir_update_property_zval_zval(this_ptr, &key, &value); + ZEPHIR_CALL_METHOD(NULL, &properties, "next", NULL, 0); + zephir_check_call_status(); + } + } + ZEPHIR_INIT_NVAR(&value); + ZEPHIR_INIT_NVAR(&key); + } else { + ZEPHIR_INIT_NVAR(&properties); + array_init(&properties); + } + ZEPHIR_OBS_VAR(&dirtyState); + if (zephir_array_isset_string_fetch(&dirtyState, &data, SL("dirtyState"), 0)) { + zephir_update_property_zval(this_ptr, ZEND_STRL("dirtyState"), &dirtyState); + } + ZEPHIR_CALL_METHOD(&_2, &manager, "iskeepingsnapshots", NULL, 0, this_ptr); + zephir_check_call_status(); + if (zephir_is_true(&_2)) { + if (zephir_array_isset_string_fetch(&snapshot, &data, SL("snapshot"), 1)) { + zephir_update_property_zval(this_ptr, ZEND_STRL("snapshot"), &snapshot); + } else { + zephir_update_property_zval(this_ptr, ZEND_STRL("snapshot"), &properties); + } + } + ZEPHIR_MM_RESTORE(); } zend_object *zephir_init_properties_Phalcon_Mvc_Model(zend_class_entry *class_type) diff --git a/ext/phalcon/mvc/model/query.zep.c b/ext/phalcon/mvc/model/query.zep.c index 8cc4530ed47..f46a00ff494 100644 --- a/ext/phalcon/mvc/model/query.zep.c +++ b/ext/phalcon/mvc/model/query.zep.c @@ -358,11 +358,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, clean) */ PHP_METHOD(Phalcon_Mvc_Model_Query, execute) { - zval _7$$8; - zend_bool _4$$3; + zval _5$$8; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *bindParams_param = NULL, *bindTypes_param = NULL, uniqueRow, cacheOptions, key, cacheService, cache, result, preparedResult, defaultBindParams, mergedParams, defaultBindTypes, mergedTypes, type, lifetime, intermediate, _0, _1$$3, _2$$3, _3$$3, _5$$3, _6$$8, _8$$9, _9$$19, _10$$19; + zval *bindParams_param = NULL, *bindTypes_param = NULL, uniqueRow, cacheOptions, key, cacheService, cache, result, preparedResult, defaultBindParams, mergedParams, defaultBindTypes, mergedTypes, type, lifetime, intermediate, _0, _1$$3, _2$$3, _3$$3, _4$$8, _6$$9, _7$$19, _8$$19; zval bindParams, bindTypes; zval *this_ptr = getThis(); @@ -386,12 +385,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, execute) ZVAL_UNDEF(&_1$$3); ZVAL_UNDEF(&_2$$3); ZVAL_UNDEF(&_3$$3); - ZVAL_UNDEF(&_5$$3); - ZVAL_UNDEF(&_6$$8); - ZVAL_UNDEF(&_8$$9); - ZVAL_UNDEF(&_9$$19); - ZVAL_UNDEF(&_10$$19); - ZVAL_UNDEF(&_7$$8); + ZVAL_UNDEF(&_4$$8); + ZVAL_UNDEF(&_6$$9); + ZVAL_UNDEF(&_7$$19); + ZVAL_UNDEF(&_8$$19); + ZVAL_UNDEF(&_5$$8); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 2) @@ -449,22 +447,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, execute) ZVAL_STRING(&_2$$3, "Phalcon\\Cache\\CacheInterface"); ZEPHIR_CALL_FUNCTION(&_3$$3, "is_a", NULL, 83, &cache, &_2$$3); zephir_check_call_status(); - _4$$3 = !ZEPHIR_IS_TRUE_IDENTICAL(&_3$$3); - if (_4$$3) { - ZEPHIR_INIT_NVAR(&_2$$3); - ZVAL_STRING(&_2$$3, "Psr\\SimpleCache\\CacheInterface"); - ZEPHIR_CALL_FUNCTION(&_5$$3, "is_a", NULL, 83, &cache, &_2$$3); - zephir_check_call_status(); - _4$$3 = !ZEPHIR_IS_TRUE_IDENTICAL(&_5$$3); - } - if (UNEXPECTED(_4$$3)) { - ZEPHIR_INIT_VAR(&_6$$8); - object_init_ex(&_6$$8, phalcon_mvc_model_exception_ce); - ZEPHIR_INIT_VAR(&_7$$8); - ZEPHIR_CONCAT_SS(&_7$$8, "Cache service must be an object implementing ", "Phalcon\\Cache\\CacheInterface or Psr\\SimpleCache\\CacheInterface"); - ZEPHIR_CALL_METHOD(NULL, &_6$$8, "__construct", NULL, 29, &_7$$8); + if (UNEXPECTED(!ZEPHIR_IS_TRUE_IDENTICAL(&_3$$3))) { + ZEPHIR_INIT_VAR(&_4$$8); + object_init_ex(&_4$$8, phalcon_mvc_model_exception_ce); + ZEPHIR_INIT_VAR(&_5$$8); + ZEPHIR_CONCAT_SS(&_5$$8, "Cache service must be an object implementing ", "Phalcon\\Cache\\CacheInterface"); + ZEPHIR_CALL_METHOD(NULL, &_4$$8, "__construct", NULL, 29, &_5$$8); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$8, "phalcon/Mvc/Model/Query.zep", 306); + zephir_throw_exception_debug(&_4$$8, "phalcon/Mvc/Model/Query.zep", 303); ZEPHIR_MM_RESTORE(); return; } @@ -472,11 +462,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, execute) zephir_check_call_status(); if (!(ZEPHIR_IS_EMPTY(&result))) { if (UNEXPECTED(Z_TYPE_P(&result) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cache didn't return a valid resultset", "phalcon/Mvc/Model/Query.zep", 315); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cache didn't return a valid resultset", "phalcon/Mvc/Model/Query.zep", 312); return; } - ZVAL_BOOL(&_8$$9, 0); - ZEPHIR_CALL_METHOD(NULL, &result, "setisfresh", NULL, 0, &_8$$9); + ZVAL_BOOL(&_6$$9, 0); + ZEPHIR_CALL_METHOD(NULL, &result, "setisfresh", NULL, 0, &_6$$9); zephir_check_call_status(); if (zephir_is_true(&uniqueRow)) { ZEPHIR_CALL_METHOD(&preparedResult, &result, "getfirst", NULL, 0); @@ -525,20 +515,20 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, execute) zephir_check_call_status(); break; } - ZEPHIR_INIT_VAR(&_9$$19); - object_init_ex(&_9$$19, phalcon_mvc_model_exception_ce); - ZEPHIR_INIT_VAR(&_10$$19); - ZEPHIR_CONCAT_SV(&_10$$19, "Unknown statement ", &type); - ZEPHIR_CALL_METHOD(NULL, &_9$$19, "__construct", NULL, 29, &_10$$19); + ZEPHIR_INIT_VAR(&_7$$19); + object_init_ex(&_7$$19, phalcon_mvc_model_exception_ce); + ZEPHIR_INIT_VAR(&_8$$19); + ZEPHIR_CONCAT_SV(&_8$$19, "Unknown statement ", &type); + ZEPHIR_CALL_METHOD(NULL, &_7$$19, "__construct", NULL, 29, &_8$$19); zephir_check_call_status(); - zephir_throw_exception_debug(&_9$$19, "phalcon/Mvc/Model/Query.zep", 398); + zephir_throw_exception_debug(&_7$$19, "phalcon/Mvc/Model/Query.zep", 395); ZEPHIR_MM_RESTORE(); return; } while(0); if (Z_TYPE_P(&cacheOptions) != IS_NULL) { if (!ZEPHIR_IS_LONG(&type, 309)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only PHQL statements that return resultsets can be cached", "phalcon/Mvc/Model/Query.zep", 411); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only PHQL statements that return resultsets can be cached", "phalcon/Mvc/Model/Query.zep", 408); return; } ZEPHIR_CALL_METHOD(NULL, &cache, "set", NULL, 0, &key, &result, &lifetime); @@ -710,7 +700,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSql) zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "This type of statement generates multiple SQL statements", "phalcon/Mvc/Model/Query.zep", 517); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "This type of statement generates multiple SQL statements", "phalcon/Mvc/Model/Query.zep", 514); return; } @@ -787,7 +777,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, parse) zephir_read_static_property_ce(&_2$$5, phalcon_mvc_model_query_ce, SL("internalPhqlCache"), PH_NOISY_CC | PH_READONLY); if (zephir_array_isset_fetch(&irPhql, &_2$$5, &uniqueId, 0)) { if (Z_TYPE_P(&irPhql) == IS_ARRAY) { - zephir_array_fetch_string(&_3$$7, &ast, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 570); + zephir_array_fetch_string(&_3$$7, &ast, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 567); zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_3$$7); RETURN_CCTOR(&irPhql); } @@ -824,7 +814,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, parse) ZEPHIR_CONCAT_SVSV(&_5$$13, "Unknown statement ", &type, ", when preparing: ", &phql); ZEPHIR_CALL_METHOD(NULL, &_4$$13, "__construct", NULL, 29, &_5$$13); zephir_check_call_status(); - zephir_throw_exception_debug(&_4$$13, "phalcon/Mvc/Model/Query.zep", 604); + zephir_throw_exception_debug(&_4$$13, "phalcon/Mvc/Model/Query.zep", 601); ZEPHIR_MM_RESTORE(); return; } while(0); @@ -832,7 +822,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, parse) } } if (UNEXPECTED(Z_TYPE_P(&irPhql) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted AST", "phalcon/Mvc/Model/Query.zep", 610); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted AST", "phalcon/Mvc/Model/Query.zep", 607); return; } if (Z_TYPE_P(&uniqueId) == IS_LONG) { @@ -967,7 +957,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, setDI) ZEPHIR_CALL_METHOD(&manager, container, "getshared", NULL, 0, &_0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&manager) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsManager' is invalid", "phalcon/Mvc/Model/Query.zep", 674); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsManager' is invalid", "phalcon/Mvc/Model/Query.zep", 671); return; } ZEPHIR_INIT_NVAR(&_0); @@ -975,7 +965,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, setDI) ZEPHIR_CALL_METHOD(&metaData, container, "getshared", NULL, 0, &_0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&metaData) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsMetaData' is invalid", "phalcon/Mvc/Model/Query.zep", 680); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsMetaData' is invalid", "phalcon/Mvc/Model/Query.zep", 677); return; } zephir_update_property_zval(this_ptr, ZEND_STRL("manager"), &manager); @@ -1179,13 +1169,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeDelete) ZEPHIR_OBS_VAR(&models); - zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 748); + zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 745); if (UNEXPECTED(zephir_array_isset_long(&models, 1))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Delete from several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 753); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Delete from several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 750); return; } ZEPHIR_OBS_VAR(&modelName); - zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 756); + zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 753); ZEPHIR_OBS_VAR(&model); zephir_read_property(&_0, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset_fetch(&model, &_0, &modelName, 0))) { @@ -1317,7 +1307,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_OBS_VAR(&modelName); - zephir_array_fetch_string(&modelName, &intermediate, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 837); + zephir_array_fetch_string(&modelName, &intermediate, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 834); zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_0); ZEPHIR_OBS_VAR(&model); @@ -1346,16 +1336,16 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) } } ZEPHIR_OBS_VAR(&values); - zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 872); + zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 869); if (UNEXPECTED(zephir_fast_count_int(&fields) != zephir_fast_count_int(&values))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The column count does not match the values count", "phalcon/Mvc/Model/Query.zep", 881); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The column count does not match the values count", "phalcon/Mvc/Model/Query.zep", 878); return; } ZEPHIR_CALL_METHOD(&dialect, &connection, "getdialect", NULL, 0); zephir_check_call_status(); ZEPHIR_INIT_VAR(&insertValues); array_init(&insertValues); - zephir_is_iterable(&values, 0, "phalcon/Mvc/Model/Query.zep", 952); + zephir_is_iterable(&values, 0, "phalcon/Mvc/Model/Query.zep", 949); if (Z_TYPE_P(&values) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&values), _4, _5, _2) { @@ -1368,8 +1358,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_INIT_NVAR(&value); ZVAL_COPY(&value, _2); ZEPHIR_OBS_NVAR(&exprValue); - zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 891); - zephir_array_fetch_string(&_6$$8, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 893); + zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 888); + zephir_array_fetch_string(&_6$$8, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 890); do { if (ZEPHIR_IS_LONG(&_6$$8, 260) || ZEPHIR_IS_LONG(&_6$$8, 258) || ZEPHIR_IS_LONG(&_6$$8, 259)) { ZEPHIR_CALL_METHOD(&insertValue, &dialect, "getsqlexpression", &_7, 0, &exprValue); @@ -1398,7 +1388,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_CONCAT_SVS(&_13$$12, "Bound parameter '", &wildcard, "' cannot be replaced because it isn't in the placeholders list"); ZEPHIR_CALL_METHOD(NULL, &_12$$12, "__construct", &_14, 29, &_13$$12); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$12, "phalcon/Mvc/Model/Query.zep", 917); + zephir_throw_exception_debug(&_12$$12, "phalcon/Mvc/Model/Query.zep", 914); ZEPHIR_MM_RESTORE(); return; } @@ -1414,7 +1404,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) } while(0); ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 930); + zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 927); _18$$8 = automaticFields; if (_18$$8) { _18$$8 = Z_TYPE_P(&columnMap) == IS_ARRAY; @@ -1428,7 +1418,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_CONCAT_SVS(&_20$$15, "Column '", &fieldName, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_19$$15, "__construct", &_14, 29, &_20$$15); zephir_check_call_status(); - zephir_throw_exception_debug(&_19$$15, "phalcon/Mvc/Model/Query.zep", 940); + zephir_throw_exception_debug(&_19$$15, "phalcon/Mvc/Model/Query.zep", 937); ZEPHIR_MM_RESTORE(); return; } @@ -1451,8 +1441,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_CALL_METHOD(&value, &values, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&exprValue); - zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 891); - zephir_array_fetch_string(&_21$$17, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 893); + zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 888); + zephir_array_fetch_string(&_21$$17, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 890); do { if (ZEPHIR_IS_LONG(&_21$$17, 260) || ZEPHIR_IS_LONG(&_21$$17, 258) || ZEPHIR_IS_LONG(&_21$$17, 259)) { ZEPHIR_CALL_METHOD(&insertValue, &dialect, "getsqlexpression", &_22, 0, &exprValue); @@ -1481,7 +1471,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_CONCAT_SVS(&_28$$21, "Bound parameter '", &wildcard, "' cannot be replaced because it isn't in the placeholders list"); ZEPHIR_CALL_METHOD(NULL, &_27$$21, "__construct", &_14, 29, &_28$$21); zephir_check_call_status(); - zephir_throw_exception_debug(&_27$$21, "phalcon/Mvc/Model/Query.zep", 917); + zephir_throw_exception_debug(&_27$$21, "phalcon/Mvc/Model/Query.zep", 914); ZEPHIR_MM_RESTORE(); return; } @@ -1497,7 +1487,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) } while(0); ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 930); + zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 927); _31$$17 = automaticFields; if (_31$$17) { _31$$17 = Z_TYPE_P(&columnMap) == IS_ARRAY; @@ -1511,7 +1501,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_CONCAT_SVS(&_33$$24, "Column '", &fieldName, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_32$$24, "__construct", &_14, 29, &_33$$24); zephir_check_call_status(); - zephir_throw_exception_debug(&_32$$24, "phalcon/Mvc/Model/Query.zep", 940); + zephir_throw_exception_debug(&_32$$24, "phalcon/Mvc/Model/Query.zep", 937); ZEPHIR_MM_RESTORE(); return; } @@ -1688,8 +1678,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_VAR(&connectionTypes); array_init(&connectionTypes); ZEPHIR_OBS_VAR(&models); - zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 989); - zephir_is_iterable(&models, 0, "phalcon/Mvc/Model/Query.zep", 1017); + zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 986); + zephir_is_iterable(&models, 0, "phalcon/Mvc/Model/Query.zep", 1014); if (Z_TYPE_P(&models) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&models), _1) { @@ -1709,7 +1699,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_check_call_status(); zephir_array_update_zval(&connectionTypes, &_6$$5, &__$true, PH_COPY | PH_SEPARATE); if (UNEXPECTED(zephir_fast_count_int(&connectionTypes) == 2)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1012); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1009); return; } } @@ -1739,7 +1729,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_check_call_status(); zephir_array_update_zval(&connectionTypes, &_9$$9, &__$true, PH_COPY | PH_SEPARATE); if (UNEXPECTED(zephir_fast_count_int(&connectionTypes) == 2)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1012); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1009); return; } } @@ -1749,23 +1739,23 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) } ZEPHIR_INIT_NVAR(&modelName); ZEPHIR_OBS_VAR(&columns); - zephir_array_fetch_string(&columns, &intermediate, SL("columns"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1017); + zephir_array_fetch_string(&columns, &intermediate, SL("columns"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1014); haveObjects = 0; haveScalars = 0; isComplex = 0; numberObjects = 0; ZEPHIR_CPY_WRT(&columns1, &columns); - zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1045); + zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1042); if (Z_TYPE_P(&columns) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&columns), _10) { ZEPHIR_INIT_NVAR(&column); ZVAL_COPY(&column, _10); if (UNEXPECTED(Z_TYPE_P(&column) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1029); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1026); return; } - zephir_array_fetch_string(&_12$$11, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1032); + zephir_array_fetch_string(&_12$$11, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1029); if (ZEPHIR_IS_STRING(&_12$$11, "scalar")) { if (!(zephir_array_isset_string(&column, SL("balias")))) { isComplex = 1; @@ -1788,10 +1778,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_CALL_METHOD(&column, &columns, "current", NULL, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&column) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1029); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1026); return; } - zephir_array_fetch_string(&_13$$16, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1032); + zephir_array_fetch_string(&_13$$16, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1029); if (ZEPHIR_IS_STRING(&_13$$16, "scalar")) { if (!(zephir_array_isset_string(&column, SL("balias")))) { isComplex = 1; @@ -1829,7 +1819,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) array_init(&simpleColumnMap); zephir_read_property(&_0, this_ptr, ZEND_STRL("metaData"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&metaData, &_0); - zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1151); + zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1148); if (Z_TYPE_P(&columns) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&columns), _16, _17, _14) { @@ -1842,11 +1832,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&column); ZVAL_COPY(&column, _14); ZEPHIR_OBS_NVAR(&sqlColumn); - zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1068); - zephir_array_fetch_string(&_18$$28, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1071); + zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1065); + zephir_array_fetch_string(&_18$$28, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1068); if (ZEPHIR_IS_STRING(&_18$$28, "object")) { ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1072); + zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1069); ZEPHIR_OBS_NVAR(&instance); zephir_read_property(&_19$$29, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset_fetch(&instance, &_19$$29, &modelName, 0))) { @@ -1864,7 +1854,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&columnMap); ZVAL_NULL(&columnMap); } - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1108); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1105); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _23$$31) { @@ -1877,7 +1867,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&_26$$34); ZEPHIR_CONCAT_SVSV(&_26$$34, "_", &sqlColumn, "_", &attribute); zephir_array_fast_append(&_25$$34, &_26$$34); - zephir_array_append(&selectColumns, &_25$$34, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1101); + zephir_array_append(&selectColumns, &_25$$34, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1098); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0); @@ -1897,7 +1887,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&_28$$35); ZEPHIR_CONCAT_SVSV(&_28$$35, "_", &sqlColumn, "_", &attribute); zephir_array_fast_append(&_27$$35, &_28$$35); - zephir_array_append(&selectColumns, &_27$$35, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1101); + zephir_array_append(&selectColumns, &_27$$35, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1098); ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0); zephir_check_call_status(); } @@ -1915,7 +1905,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_array_update_multi(&columns1, &_31$$36, SL("zs"), 3, &aliasCopy, SL("keepSnapshots")); } } else { - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1125); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1122); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _32$$37) { @@ -1925,7 +1915,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_34$$38, 2, 0); zephir_array_fast_append(&_34$$38, &attribute); zephir_array_fast_append(&_34$$38, &sqlColumn); - zephir_array_append(&selectColumns, &_34$$38, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1123); + zephir_array_append(&selectColumns, &_34$$38, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1120); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0); @@ -1942,7 +1932,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_35$$39, 2, 0); zephir_array_fast_append(&_35$$39, &attribute); zephir_array_fast_append(&_35$$39, &sqlColumn); - zephir_array_append(&selectColumns, &_35$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1123); + zephir_array_append(&selectColumns, &_35$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1120); ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0); zephir_check_call_status(); } @@ -1965,7 +1955,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_array_fast_append(&_37$$42, &aliasCopy); ZEPHIR_CPY_WRT(&columnAlias, &_37$$42); } - zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1136); + zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1133); } _38$$28 = !isComplex; if (_38$$28) { @@ -1994,11 +1984,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_CALL_METHOD(&column, &columns, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&sqlColumn); - zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1068); - zephir_array_fetch_string(&_39$$46, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1071); + zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1065); + zephir_array_fetch_string(&_39$$46, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1068); if (ZEPHIR_IS_STRING(&_39$$46, "object")) { ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1072); + zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1069); ZEPHIR_OBS_NVAR(&instance); zephir_read_property(&_40$$47, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset_fetch(&instance, &_40$$47, &modelName, 0))) { @@ -2016,7 +2006,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&columnMap); ZVAL_NULL(&columnMap); } - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1108); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1105); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _44$$49) { @@ -2029,7 +2019,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&_47$$52); ZEPHIR_CONCAT_SVSV(&_47$$52, "_", &sqlColumn, "_", &attribute); zephir_array_fast_append(&_46$$52, &_47$$52); - zephir_array_append(&selectColumns, &_46$$52, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1101); + zephir_array_append(&selectColumns, &_46$$52, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1098); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0); @@ -2049,7 +2039,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&_49$$53); ZEPHIR_CONCAT_SVSV(&_49$$53, "_", &sqlColumn, "_", &attribute); zephir_array_fast_append(&_48$$53, &_49$$53); - zephir_array_append(&selectColumns, &_48$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1101); + zephir_array_append(&selectColumns, &_48$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1098); ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0); zephir_check_call_status(); } @@ -2067,7 +2057,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_array_update_multi(&columns1, &_52$$54, SL("zs"), 3, &aliasCopy, SL("keepSnapshots")); } } else { - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1125); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1122); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _53$$55) { @@ -2077,7 +2067,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_55$$56, 2, 0); zephir_array_fast_append(&_55$$56, &attribute); zephir_array_fast_append(&_55$$56, &sqlColumn); - zephir_array_append(&selectColumns, &_55$$56, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1123); + zephir_array_append(&selectColumns, &_55$$56, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1120); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0); @@ -2094,7 +2084,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_56$$57, 2, 0); zephir_array_fast_append(&_56$$57, &attribute); zephir_array_fast_append(&_56$$57, &sqlColumn); - zephir_array_append(&selectColumns, &_56$$57, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1123); + zephir_array_append(&selectColumns, &_56$$57, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1120); ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0); zephir_check_call_status(); } @@ -2116,7 +2106,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_array_fast_append(&_58$$60, &aliasCopy); ZEPHIR_CPY_WRT(&columnAlias, &_58$$60); } - zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1136); + zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1133); } _59$$46 = !isComplex; if (_59$$46) { @@ -2141,7 +2131,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_VAR(&bindCounts); array_init(&bindCounts); zephir_array_update_string(&intermediate, SL("columns"), &selectColumns, PH_COPY | PH_SEPARATE); - zephir_is_iterable(&bindParams, 0, "phalcon/Mvc/Model/Query.zep", 1172); + zephir_is_iterable(&bindParams, 0, "phalcon/Mvc/Model/Query.zep", 1169); if (Z_TYPE_P(&bindParams) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&bindParams), _62, _63, _60) { @@ -2199,7 +2189,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&wildcard); ZEPHIR_INIT_VAR(&processedTypes); array_init(&processedTypes); - zephir_is_iterable(&bindTypes, 0, "phalcon/Mvc/Model/Query.zep", 1185); + zephir_is_iterable(&bindTypes, 0, "phalcon/Mvc/Model/Query.zep", 1182); if (Z_TYPE_P(&bindTypes) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&bindTypes), _68, _69, _66) { @@ -2304,7 +2294,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) array_init(&simpleColumnMap); ZEPHIR_CALL_METHOD(&_74$$90, &metaData, "getattributes", NULL, 0, &resultObject); zephir_check_call_status(); - zephir_is_iterable(&_74$$90, 0, "phalcon/Mvc/Model/Query.zep", 1273); + zephir_is_iterable(&_74$$90, 0, "phalcon/Mvc/Model/Query.zep", 1270); if (Z_TYPE_P(&_74$$90) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_74$$90), _75$$90) { @@ -2314,7 +2304,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_77$$91, 2, 0); zephir_array_fast_append(&_77$$91, &attribute); ZEPHIR_OBS_NVAR(&_78$$91); - zephir_array_fetch(&_78$$91, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1271); + zephir_array_fetch(&_78$$91, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1268); zephir_array_fast_append(&_77$$91, &_78$$91); zephir_array_update_zval(&simpleColumnMap, &attribute, &_77$$91, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -2333,7 +2323,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_79$$92, 2, 0); zephir_array_fast_append(&_79$$92, &attribute); ZEPHIR_OBS_NVAR(&_80$$92); - zephir_array_fetch(&_80$$92, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1271); + zephir_array_fetch(&_80$$92, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1268); zephir_array_fast_append(&_79$$92, &_80$$92); zephir_array_update_zval(&simpleColumnMap, &attribute, &_79$$92, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &_74$$90, "next", NULL, 0); @@ -2343,7 +2333,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&attribute); } else { array_init(&simpleColumnMap); - zephir_is_iterable(&columnMap, 0, "phalcon/Mvc/Model/Query.zep", 1282); + zephir_is_iterable(&columnMap, 0, "phalcon/Mvc/Model/Query.zep", 1279); if (Z_TYPE_P(&columnMap) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&columnMap), _83$$93, _84$$93, _81$$93) { @@ -2359,7 +2349,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_85$$94, 2, 0); zephir_array_fast_append(&_85$$94, &attribute); ZEPHIR_OBS_NVAR(&_86$$94); - zephir_array_fetch(&_86$$94, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1280); + zephir_array_fetch(&_86$$94, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1277); zephir_array_fast_append(&_85$$94, &_86$$94); zephir_array_update_zval(&simpleColumnMap, &column, &_85$$94, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -2380,7 +2370,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_87$$95, 2, 0); zephir_array_fast_append(&_87$$95, &attribute); ZEPHIR_OBS_NVAR(&_88$$95); - zephir_array_fetch(&_88$$95, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1280); + zephir_array_fetch(&_88$$95, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1277); zephir_array_fast_append(&_87$$95, &_88$$95); zephir_array_update_zval(&simpleColumnMap, &column, &_87$$95, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &columnMap, "next", NULL, 0); @@ -2410,7 +2400,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_CONCAT_SVS(&_92$$98, "Resultset class \"", &resultsetClassName, "\" not found"); ZEPHIR_CALL_METHOD(NULL, &_91$$98, "__construct", NULL, 29, &_92$$98); zephir_check_call_status(); - zephir_throw_exception_debug(&_91$$98, "phalcon/Mvc/Model/Query.zep", 1298); + zephir_throw_exception_debug(&_91$$98, "phalcon/Mvc/Model/Query.zep", 1295); ZEPHIR_MM_RESTORE(); return; } @@ -2425,7 +2415,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_CONCAT_SVS(&_96$$99, "Resultset class \"", &resultsetClassName, "\" must be an implementation of Phalcon\\Mvc\\Model\\ResultsetInterface"); ZEPHIR_CALL_METHOD(NULL, &_95$$99, "__construct", NULL, 29, &_96$$99); zephir_check_call_status(); - zephir_throw_exception_debug(&_95$$99, "phalcon/Mvc/Model/Query.zep", 1304); + zephir_throw_exception_debug(&_95$$99, "phalcon/Mvc/Model/Query.zep", 1301); ZEPHIR_MM_RESTORE(); return; } @@ -2536,13 +2526,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_OBS_VAR(&models); - zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1352); + zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1349); if (UNEXPECTED(zephir_array_isset_long(&models, 1))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Updating several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 1357); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Updating several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 1354); return; } ZEPHIR_OBS_VAR(&modelName); - zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1360); + zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1357); ZEPHIR_OBS_VAR(&model); zephir_read_property(&_0, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset_fetch(&model, &_0, &modelName, 0))) { @@ -2555,14 +2545,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_CALL_METHOD(&dialect, &connection, "getdialect", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_VAR(&fields); - zephir_array_fetch_string(&fields, &intermediate, SL("fields"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1379); + zephir_array_fetch_string(&fields, &intermediate, SL("fields"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1376); ZEPHIR_OBS_VAR(&values); - zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1380); + zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1377); ZEPHIR_INIT_VAR(&updateValues); array_init(&updateValues); ZEPHIR_CPY_WRT(&selectBindParams, &bindParams); ZEPHIR_CPY_WRT(&selectBindTypes, &bindTypes); - zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 1452); + zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 1449); if (Z_TYPE_P(&fields) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _4, _5, _2) { @@ -2575,17 +2565,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_INIT_NVAR(&field); ZVAL_COPY(&field, _2); ZEPHIR_OBS_NVAR(&value); - zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1395); + zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1392); ZEPHIR_OBS_NVAR(&exprValue); - zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1396); + zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1393); if (zephir_array_isset_string(&field, SL("balias"))) { ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1399); + zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1396); } else { ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1401); + zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1398); } - zephir_array_fetch_string(&_6$$5, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1404); + zephir_array_fetch_string(&_6$$5, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1401); do { if (ZEPHIR_IS_LONG(&_6$$5, 260) || ZEPHIR_IS_LONG(&_6$$5, 258) || ZEPHIR_IS_LONG(&_6$$5, 259)) { ZEPHIR_CALL_METHOD(&updateValue, &dialect, "getsqlexpression", &_7, 0, &exprValue); @@ -2614,7 +2604,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_CONCAT_SVS(&_13$$11, "Bound parameter '", &wildcard, "' cannot be replaced because it's not in the placeholders list"); ZEPHIR_CALL_METHOD(NULL, &_12$$11, "__construct", &_14, 29, &_13$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 1427); + zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 1424); ZEPHIR_MM_RESTORE(); return; } @@ -2623,7 +2613,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) break; } if (ZEPHIR_IS_LONG(&_6$$5, 277)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1436); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1433); return; } ZEPHIR_INIT_NVAR(&updateValue); @@ -2651,17 +2641,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_CALL_METHOD(&field, &fields, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&value); - zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1395); + zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1392); ZEPHIR_OBS_NVAR(&exprValue); - zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1396); + zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1393); if (zephir_array_isset_string(&field, SL("balias"))) { ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1399); + zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1396); } else { ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1401); + zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1398); } - zephir_array_fetch_string(&_18$$14, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1404); + zephir_array_fetch_string(&_18$$14, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1401); do { if (ZEPHIR_IS_LONG(&_18$$14, 260) || ZEPHIR_IS_LONG(&_18$$14, 258) || ZEPHIR_IS_LONG(&_18$$14, 259)) { ZEPHIR_CALL_METHOD(&updateValue, &dialect, "getsqlexpression", &_19, 0, &exprValue); @@ -2690,7 +2680,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_CONCAT_SVS(&_25$$20, "Bound parameter '", &wildcard, "' cannot be replaced because it's not in the placeholders list"); ZEPHIR_CALL_METHOD(NULL, &_24$$20, "__construct", &_14, 29, &_25$$20); zephir_check_call_status(); - zephir_throw_exception_debug(&_24$$20, "phalcon/Mvc/Model/Query.zep", 1427); + zephir_throw_exception_debug(&_24$$20, "phalcon/Mvc/Model/Query.zep", 1424); ZEPHIR_MM_RESTORE(); return; } @@ -2699,7 +2689,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) break; } if (ZEPHIR_IS_LONG(&_18$$14, 277)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1436); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1433); return; } ZEPHIR_INIT_NVAR(&updateValue); @@ -2792,7 +2782,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getCallArgument) ZEPHIR_OBS_COPY_OR_DUP(&argument, argument_param); - zephir_array_fetch_string(&_0, &argument, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1514); + zephir_array_fetch_string(&_0, &argument, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1511); if (ZEPHIR_IS_LONG(&_0, 352)) { zephir_create_array(return_value, 1, 0); add_assoc_stringl_ex(return_value, SL("type"), SL("all")); @@ -2851,8 +2841,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression) ZEPHIR_INIT_VAR(&whenClauses); array_init(&whenClauses); - zephir_array_fetch_string(&_0, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1532); - zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model/Query.zep", 1547); + zephir_array_fetch_string(&_0, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1529); + zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model/Query.zep", 1544); if (Z_TYPE_P(&_0) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _1) { @@ -2862,24 +2852,24 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression) ZEPHIR_INIT_NVAR(&_3$$4); zephir_create_array(&_3$$4, 3, 0); add_assoc_stringl_ex(&_3$$4, SL("type"), SL("when")); - zephir_array_fetch_string(&_5$$4, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1536); + zephir_array_fetch_string(&_5$$4, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1533); ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 453, &_5$$4); zephir_check_call_status(); zephir_array_update_string(&_3$$4, SL("expr"), &_4$$4, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_7$$4, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1537); + zephir_array_fetch_string(&_7$$4, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1534); ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 453, &_7$$4); zephir_check_call_status(); zephir_array_update_string(&_3$$4, SL("then"), &_4$$4, PH_COPY | PH_SEPARATE); - zephir_array_append(&whenClauses, &_3$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1538); + zephir_array_append(&whenClauses, &_3$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1535); } else { ZEPHIR_INIT_NVAR(&_8$$5); zephir_create_array(&_8$$5, 2, 0); add_assoc_stringl_ex(&_8$$5, SL("type"), SL("else")); - zephir_array_fetch_string(&_10$$5, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1542); + zephir_array_fetch_string(&_10$$5, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1539); ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "getexpression", &_6, 453, &_10$$5); zephir_check_call_status(); zephir_array_update_string(&_8$$5, SL("expr"), &_9$$5, PH_COPY | PH_SEPARATE); - zephir_array_append(&whenClauses, &_8$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1543); + zephir_array_append(&whenClauses, &_8$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1540); } } ZEND_HASH_FOREACH_END(); } else { @@ -2897,24 +2887,24 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression) ZEPHIR_INIT_NVAR(&_11$$7); zephir_create_array(&_11$$7, 3, 0); add_assoc_stringl_ex(&_11$$7, SL("type"), SL("when")); - zephir_array_fetch_string(&_13$$7, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1536); + zephir_array_fetch_string(&_13$$7, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1533); ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 453, &_13$$7); zephir_check_call_status(); zephir_array_update_string(&_11$$7, SL("expr"), &_12$$7, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_14$$7, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1537); + zephir_array_fetch_string(&_14$$7, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1534); ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 453, &_14$$7); zephir_check_call_status(); zephir_array_update_string(&_11$$7, SL("then"), &_12$$7, PH_COPY | PH_SEPARATE); - zephir_array_append(&whenClauses, &_11$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1538); + zephir_array_append(&whenClauses, &_11$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1535); } else { ZEPHIR_INIT_NVAR(&_15$$8); zephir_create_array(&_15$$8, 2, 0); add_assoc_stringl_ex(&_15$$8, SL("type"), SL("else")); - zephir_array_fetch_string(&_17$$8, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1542); + zephir_array_fetch_string(&_17$$8, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1539); ZEPHIR_CALL_METHOD(&_16$$8, this_ptr, "getexpression", &_6, 453, &_17$$8); zephir_check_call_status(); zephir_array_update_string(&_15$$8, SL("expr"), &_16$$8, PH_COPY | PH_SEPARATE); - zephir_array_append(&whenClauses, &_15$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1543); + zephir_array_append(&whenClauses, &_15$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1540); } ZEPHIR_CALL_METHOD(NULL, &_0, "next", NULL, 0); zephir_check_call_status(); @@ -2923,7 +2913,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression) ZEPHIR_INIT_NVAR(&whenExpr); zephir_create_array(return_value, 3, 0); add_assoc_stringl_ex(return_value, SL("type"), SL("case")); - zephir_array_fetch_string(&_19, &expr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1549); + zephir_array_fetch_string(&_19, &expr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1546); ZEPHIR_CALL_METHOD(&_18, this_ptr, "getexpression", &_6, 453, &_19); zephir_check_call_status(); zephir_array_update_string(return_value, SL("expr"), &_18, PH_COPY | PH_SEPARATE); @@ -3274,7 +3264,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) zephir_create_array(&_18$$25, 2, 0); add_assoc_stringl_ex(&_18$$25, SL("type"), SL("literal")); ZEPHIR_OBS_VAR(&_19$$25); - zephir_array_fetch_string(&_19$$25, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1765); + zephir_array_fetch_string(&_19$$25, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1762); zephir_array_update_string(&_18$$25, SL("value"), &_19$$25, PH_COPY | PH_SEPARATE); ZEPHIR_CPY_WRT(&exprReturn, &_18$$25); break; @@ -3297,9 +3287,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) } if (ZEPHIR_IS_LONG(&exprType, 260)) { ZEPHIR_OBS_VAR(&value); - zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1786); + zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1783); if (quoting) { - if (zephir_memnstr_str(&value, SL("'"), "phalcon/Mvc/Model/Query.zep", 1793)) { + if (zephir_memnstr_str(&value, SL("'"), "phalcon/Mvc/Model/Query.zep", 1790)) { ZEPHIR_INIT_VAR(&escapedValue); phalcon_orm_singlequotes(&escapedValue, &value); } else { @@ -3322,7 +3312,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) zephir_create_array(&_23$$33, 2, 0); add_assoc_stringl_ex(&_23$$33, SL("type"), SL("placeholder")); ZEPHIR_INIT_VAR(&_24$$33); - zephir_array_fetch_string(&_25$$33, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1814); + zephir_array_fetch_string(&_25$$33, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1811); ZEPHIR_INIT_VAR(&_26$$33); ZVAL_STRING(&_26$$33, "?"); ZEPHIR_INIT_VAR(&_27$$33); @@ -3336,7 +3326,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_INIT_VAR(&_28$$34); zephir_create_array(&_28$$34, 2, 0); add_assoc_stringl_ex(&_28$$34, SL("type"), SL("placeholder")); - zephir_array_fetch_string(&_29$$34, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1823); + zephir_array_fetch_string(&_29$$34, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1820); ZEPHIR_INIT_VAR(&_30$$34); ZEPHIR_CONCAT_SV(&_30$$34, ":", &_29$$34); zephir_array_update_string(&_28$$34, SL("value"), &_30$$34, PH_COPY | PH_SEPARATE); @@ -3345,14 +3335,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) } if (ZEPHIR_IS_LONG(&exprType, 277)) { ZEPHIR_OBS_NVAR(&value); - zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1828); - if (zephir_memnstr_str(&value, SL(":"), "phalcon/Mvc/Model/Query.zep", 1830)) { + zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1825); + if (zephir_memnstr_str(&value, SL(":"), "phalcon/Mvc/Model/Query.zep", 1827)) { ZEPHIR_INIT_VAR(&valueParts); zephir_fast_explode_str(&valueParts, SL(":"), &value, LONG_MAX); ZEPHIR_OBS_VAR(&name); - zephir_array_fetch_long(&name, &valueParts, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1832); + zephir_array_fetch_long(&name, &valueParts, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1829); ZEPHIR_OBS_VAR(&bindType); - zephir_array_fetch_long(&bindType, &valueParts, 1, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1833); + zephir_array_fetch_long(&bindType, &valueParts, 1, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1830); do { if (ZEPHIR_IS_STRING(&bindType, "str")) { ZEPHIR_INIT_VAR(&_31$$37); @@ -3442,7 +3432,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_CONCAT_SV(&_51$$44, "Bind value is required for array type placeholder: ", &name); ZEPHIR_CALL_METHOD(NULL, &_50$$44, "__construct", NULL, 29, &_51$$44); zephir_check_call_status(); - zephir_throw_exception_debug(&_50$$44, "phalcon/Mvc/Model/Query.zep", 1903); + zephir_throw_exception_debug(&_50$$44, "phalcon/Mvc/Model/Query.zep", 1900); ZEPHIR_MM_RESTORE(); return; } @@ -3453,7 +3443,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_CONCAT_SV(&_53$$45, "Bind type requires an array in placeholder: ", &name); ZEPHIR_CALL_METHOD(NULL, &_52$$45, "__construct", NULL, 29, &_53$$45); zephir_check_call_status(); - zephir_throw_exception_debug(&_52$$45, "phalcon/Mvc/Model/Query.zep", 1909); + zephir_throw_exception_debug(&_52$$45, "phalcon/Mvc/Model/Query.zep", 1906); ZEPHIR_MM_RESTORE(); return; } @@ -3464,7 +3454,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_CONCAT_SV(&_55$$46, "At least one value must be bound in placeholder: ", &name); ZEPHIR_CALL_METHOD(NULL, &_54$$46, "__construct", NULL, 29, &_55$$46); zephir_check_call_status(); - zephir_throw_exception_debug(&_54$$46, "phalcon/Mvc/Model/Query.zep", 1915); + zephir_throw_exception_debug(&_54$$46, "phalcon/Mvc/Model/Query.zep", 1912); ZEPHIR_MM_RESTORE(); return; } @@ -3485,7 +3475,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_CONCAT_SV(&_59$$47, "Unknown bind type: ", &bindType); ZEPHIR_CALL_METHOD(NULL, &_58$$47, "__construct", NULL, 29, &_59$$47); zephir_check_call_status(); - zephir_throw_exception_debug(&_58$$47, "phalcon/Mvc/Model/Query.zep", 1930); + zephir_throw_exception_debug(&_58$$47, "phalcon/Mvc/Model/Query.zep", 1927); ZEPHIR_MM_RESTORE(); return; } while(0); @@ -3667,7 +3657,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) zephir_create_array(&_79$$66, 2, 0); add_assoc_stringl_ex(&_79$$66, SL("type"), SL("literal")); ZEPHIR_OBS_VAR(&_80$$66); - zephir_array_fetch_string(&_80$$66, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2106); + zephir_array_fetch_string(&_80$$66, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2103); zephir_array_update_string(&_79$$66, SL("value"), &_80$$66, PH_COPY | PH_SEPARATE); ZEPHIR_CPY_WRT(&exprReturn, &_79$$66); break; @@ -3699,7 +3689,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_CONCAT_SV(&_85$$70, "Unknown expression type ", &exprType); ZEPHIR_CALL_METHOD(NULL, &_84$$70, "__construct", NULL, 29, &_85$$70); zephir_check_call_status(); - zephir_throw_exception_debug(&_84$$70, "phalcon/Mvc/Model/Query.zep", 2129); + zephir_throw_exception_debug(&_84$$70, "phalcon/Mvc/Model/Query.zep", 2126); ZEPHIR_MM_RESTORE(); return; } while(0); @@ -3714,7 +3704,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) if (zephir_array_isset_long(&expr, 0)) { ZEPHIR_INIT_VAR(&listItems); array_init(&listItems); - zephir_is_iterable(&expr, 0, "phalcon/Mvc/Model/Query.zep", 2152); + zephir_is_iterable(&expr, 0, "phalcon/Mvc/Model/Query.zep", 2149); if (Z_TYPE_P(&expr) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&expr), _86$$72) { @@ -3722,7 +3712,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZVAL_COPY(&exprListItem, _86$$72); ZEPHIR_CALL_METHOD(&_88$$73, this_ptr, "getexpression", NULL, 453, &exprListItem); zephir_check_call_status(); - zephir_array_append(&listItems, &_88$$73, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2149); + zephir_array_append(&listItems, &_88$$73, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2146); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &expr, "rewind", NULL, 0); @@ -3737,7 +3727,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_89$$74, this_ptr, "getexpression", NULL, 453, &exprListItem); zephir_check_call_status(); - zephir_array_append(&listItems, &_89$$74, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2149); + zephir_array_append(&listItems, &_89$$74, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2146); ZEPHIR_CALL_METHOD(NULL, &expr, "next", NULL, 0); zephir_check_call_status(); } @@ -3748,7 +3738,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) zephir_array_fast_append(return_value, &listItems); RETURN_MM(); } - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Unknown expression", "phalcon/Mvc/Model/Query.zep", 2158); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Unknown expression", "phalcon/Mvc/Model/Query.zep", 2155); return; } @@ -3800,7 +3790,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) if (zephir_array_isset_long(&arguments, 0)) { ZEPHIR_INIT_VAR(&functionArgs); array_init(&functionArgs); - zephir_is_iterable(&arguments, 0, "phalcon/Mvc/Model/Query.zep", 2184); + zephir_is_iterable(&arguments, 0, "phalcon/Mvc/Model/Query.zep", 2181); if (Z_TYPE_P(&arguments) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&arguments), _0$$6) { @@ -3808,7 +3798,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) ZVAL_COPY(&argument, _0$$6); ZEPHIR_CALL_METHOD(&_2$$7, this_ptr, "getcallargument", &_3, 457, &argument); zephir_check_call_status(); - zephir_array_append(&functionArgs, &_2$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2182); + zephir_array_append(&functionArgs, &_2$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2179); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &arguments, "rewind", NULL, 0); @@ -3823,7 +3813,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_4$$8, this_ptr, "getcallargument", &_3, 457, &argument); zephir_check_call_status(); - zephir_array_append(&functionArgs, &_4$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2182); + zephir_array_append(&functionArgs, &_4$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2179); ZEPHIR_CALL_METHOD(NULL, &arguments, "next", NULL, 0); zephir_check_call_status(); } @@ -3841,7 +3831,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) zephir_create_array(return_value, 4, 0); add_assoc_stringl_ex(return_value, SL("type"), SL("functionCall")); ZEPHIR_OBS_VAR(&_7$$10); - zephir_array_fetch_string(&_7$$10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2194); + zephir_array_fetch_string(&_7$$10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2191); zephir_array_update_string(return_value, SL("name"), &_7$$10, PH_COPY | PH_SEPARATE); zephir_array_update_string(return_value, SL("arguments"), &functionArgs, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_VAR(&_8$$10); @@ -3852,7 +3842,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) zephir_create_array(return_value, 3, 0); add_assoc_stringl_ex(return_value, SL("type"), SL("functionCall")); ZEPHIR_OBS_VAR(&_9$$11); - zephir_array_fetch_string(&_9$$11, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2201); + zephir_array_fetch_string(&_9$$11, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2198); zephir_array_update_string(return_value, SL("name"), &_9$$11, PH_COPY | PH_SEPARATE); zephir_array_update_string(return_value, SL("arguments"), &functionArgs, PH_COPY | PH_SEPARATE); RETURN_MM(); @@ -3861,7 +3851,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) zephir_create_array(return_value, 2, 0); add_assoc_stringl_ex(return_value, SL("type"), SL("functionCall")); ZEPHIR_OBS_VAR(&_10); - zephir_array_fetch_string(&_10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2210); + zephir_array_fetch_string(&_10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2207); zephir_array_update_string(return_value, SL("name"), &_10, PH_COPY | PH_SEPARATE); RETURN_MM(); } @@ -3902,7 +3892,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getGroupClause) if (zephir_array_isset_long(&group, 0)) { ZEPHIR_INIT_VAR(&groupParts); array_init(&groupParts); - zephir_is_iterable(&group, 0, "phalcon/Mvc/Model/Query.zep", 2230); + zephir_is_iterable(&group, 0, "phalcon/Mvc/Model/Query.zep", 2227); if (Z_TYPE_P(&group) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&group), _0$$3) { @@ -3910,7 +3900,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getGroupClause) ZVAL_COPY(&groupItem, _0$$3); ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "getexpression", &_3, 453, &groupItem); zephir_check_call_status(); - zephir_array_append(&groupParts, &_2$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2228); + zephir_array_append(&groupParts, &_2$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2225); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &group, "rewind", NULL, 0); @@ -3925,7 +3915,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getGroupClause) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_4$$5, this_ptr, "getexpression", &_3, 453, &groupItem); zephir_check_call_status(); - zephir_array_append(&groupParts, &_4$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2228); + zephir_array_append(&groupParts, &_4$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2225); ZEPHIR_CALL_METHOD(NULL, &group, "next", NULL, 0); zephir_check_call_status(); } @@ -4024,10 +4014,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoin) ZEPHIR_OBS_VAR(&qualified); if (zephir_array_isset_string_fetch(&qualified, &join, SL("qualified"), 0)) { - zephir_array_fetch_string(&_0$$3, &qualified, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2266); + zephir_array_fetch_string(&_0$$3, &qualified, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2263); if (ZEPHIR_IS_LONG(&_0$$3, 355)) { ZEPHIR_OBS_VAR(&modelName); - zephir_array_fetch_string(&modelName, &qualified, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2267); + zephir_array_fetch_string(&modelName, &qualified, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2264); ZEPHIR_CALL_METHOD(&model, manager, "load", NULL, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -4042,7 +4032,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoin) RETURN_MM(); } } - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2282); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2279); return; } @@ -4077,7 +4067,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoinType) ZEPHIR_OBS_VAR(&type); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&type, &join, SL("type"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2293); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2290); return; } do { @@ -4105,7 +4095,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoinType) ZEPHIR_CONCAT_SVSV(&_2, "Unknown join type ", &type, ", when preparing: ", &_1); ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 29, &_2); zephir_check_call_status(); - zephir_throw_exception_debug(&_0, "phalcon/Mvc/Model/Query.zep", 2315); + zephir_throw_exception_debug(&_0, "phalcon/Mvc/Model/Query.zep", 2312); ZEPHIR_MM_RESTORE(); return; } @@ -4279,7 +4269,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_0); ZEPHIR_OBS_VAR(&tables); - zephir_array_fetch_string(&tables, &select, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2351); + zephir_array_fetch_string(&tables, &select, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2348); if (!(zephir_array_isset_long(&tables, 0))) { ZEPHIR_INIT_VAR(&selectTables); zephir_create_array(&selectTables, 1, 0); @@ -4288,7 +4278,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CPY_WRT(&selectTables, &tables); } ZEPHIR_OBS_VAR(&joins); - zephir_array_fetch_string(&joins, &select, SL("joins"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2359); + zephir_array_fetch_string(&joins, &select, SL("joins"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2356); if (!(zephir_array_isset_long(&joins, 0))) { ZEPHIR_INIT_VAR(&selectJoins); zephir_create_array(&selectJoins, 1, 0); @@ -4296,7 +4286,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } else { ZEPHIR_CPY_WRT(&selectJoins, &joins); } - zephir_is_iterable(&selectJoins, 0, "phalcon/Mvc/Model/Query.zep", 2510); + zephir_is_iterable(&selectJoins, 0, "phalcon/Mvc/Model/Query.zep", 2507); if (Z_TYPE_P(&selectJoins) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectJoins), _1) { @@ -4305,13 +4295,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&joinData, this_ptr, "getjoin", &_3, 458, &manager, &joinItem); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&source); - zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2373); + zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2370); ZEPHIR_OBS_NVAR(&schema); - zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2374); + zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2371); ZEPHIR_OBS_NVAR(&model); - zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2375); + zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2372); ZEPHIR_OBS_NVAR(&realModelName); - zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2376); + zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2373); ZEPHIR_INIT_NVAR(&completeSource); zephir_create_array(&completeSource, 2, 0); zephir_array_fast_append(&completeSource, &source); @@ -4321,7 +4311,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_OBS_NVAR(&aliasExpr); if (zephir_array_isset_string_fetch(&aliasExpr, &joinItem, SL("alias"), 0)) { ZEPHIR_OBS_NVAR(&alias); - zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2388); + zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2385); if (UNEXPECTED(zephir_array_isset(&joinModels, &alias))) { ZEPHIR_INIT_NVAR(&_5$$9); object_init_ex(&_5$$9, phalcon_mvc_model_exception_ce); @@ -4330,11 +4320,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSV(&_7$$9, "Cannot use '", &alias, "' as join alias because it was already used, when preparing: ", &_6$$9); ZEPHIR_CALL_METHOD(NULL, &_5$$9, "__construct", &_8, 29, &_7$$9); zephir_check_call_status(); - zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model/Query.zep", 2396); + zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model/Query.zep", 2393); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2402); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2399); zephir_array_update_zval(&joinTypes, &alias, &joinType, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&joinModels, &alias, &realModelName, PH_COPY | PH_SEPARATE); @@ -4353,7 +4343,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSV(&_11$$11, "Cannot use '", &realModelName, "' as join alias because it was already used, when preparing: ", &_10$$11); ZEPHIR_CALL_METHOD(NULL, &_9$$11, "__construct", &_8, 29, &_11$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_9$$11, "phalcon/Mvc/Model/Query.zep", 2455); + zephir_throw_exception_debug(&_9$$11, "phalcon/Mvc/Model/Query.zep", 2452); ZEPHIR_MM_RESTORE(); return; } @@ -4383,13 +4373,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&joinData, this_ptr, "getjoin", &_3, 458, &manager, &joinItem); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&source); - zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2373); + zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2370); ZEPHIR_OBS_NVAR(&schema); - zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2374); + zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2371); ZEPHIR_OBS_NVAR(&model); - zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2375); + zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2372); ZEPHIR_OBS_NVAR(&realModelName); - zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2376); + zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2373); ZEPHIR_INIT_NVAR(&_12$$12); zephir_create_array(&_12$$12, 2, 0); zephir_array_fast_append(&_12$$12, &source); @@ -4400,7 +4390,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_OBS_NVAR(&aliasExpr); if (zephir_array_isset_string_fetch(&aliasExpr, &joinItem, SL("alias"), 0)) { ZEPHIR_OBS_NVAR(&alias); - zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2388); + zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2385); if (UNEXPECTED(zephir_array_isset(&joinModels, &alias))) { ZEPHIR_INIT_NVAR(&_13$$14); object_init_ex(&_13$$14, phalcon_mvc_model_exception_ce); @@ -4409,11 +4399,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSV(&_15$$14, "Cannot use '", &alias, "' as join alias because it was already used, when preparing: ", &_14$$14); ZEPHIR_CALL_METHOD(NULL, &_13$$14, "__construct", &_8, 29, &_15$$14); zephir_check_call_status(); - zephir_throw_exception_debug(&_13$$14, "phalcon/Mvc/Model/Query.zep", 2396); + zephir_throw_exception_debug(&_13$$14, "phalcon/Mvc/Model/Query.zep", 2393); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2402); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2399); zephir_array_update_zval(&joinTypes, &alias, &joinType, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&joinModels, &alias, &realModelName, PH_COPY | PH_SEPARATE); @@ -4432,7 +4422,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSV(&_18$$16, "Cannot use '", &realModelName, "' as join alias because it was already used, when preparing: ", &_17$$16); ZEPHIR_CALL_METHOD(NULL, &_16$$16, "__construct", &_8, 29, &_18$$16); zephir_check_call_status(); - zephir_throw_exception_debug(&_16$$16, "phalcon/Mvc/Model/Query.zep", 2455); + zephir_throw_exception_debug(&_16$$16, "phalcon/Mvc/Model/Query.zep", 2452); ZEPHIR_MM_RESTORE(); return; } @@ -4458,7 +4448,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_update_property_zval(this_ptr, ZEND_STRL("sqlModelsAliases"), &sqlModelsAliases); zephir_update_property_zval(this_ptr, ZEND_STRL("sqlAliasesModelsInstances"), &sqlAliasesModelsInstances); zephir_update_property_zval(this_ptr, ZEND_STRL("modelsInstances"), &modelsInstances); - zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2530); + zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2527); if (Z_TYPE_P(&joinPrepared) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinPrepared), _21, _22, _19) { @@ -4505,7 +4495,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_read_property(&_0, this_ptr, ZEND_STRL("enableImplicitJoins"), PH_NOISY_CC | PH_READONLY); if (!(zephir_is_true(&_0))) { ZEPHIR_INIT_VAR(&_26$$21); - zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2542); + zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2539); if (Z_TYPE_P(&joinPrepared) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinPrepared), _29$$21, _30$$21, _27$$21) { @@ -4518,11 +4508,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&_26$$21); ZVAL_COPY(&_26$$21, _27$$21); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2532); + zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2529); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2533); + zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2530); ZEPHIR_OBS_NVAR(&preCondition); - zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2534); + zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2531); ZEPHIR_INIT_NVAR(&_31$$22); zephir_create_array(&_31$$22, 3, 0); zephir_array_update_string(&_31$$22, SL("type"), &joinType, PH_COPY | PH_SEPARATE); @@ -4531,7 +4521,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_32$$22, 1, 0); zephir_array_fast_append(&_32$$22, &preCondition); zephir_array_update_string(&_31$$22, SL("conditions"), &_32$$22, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_31$$22, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2539); + zephir_array_append(&sqlJoins, &_31$$22, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2536); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &joinPrepared, "rewind", NULL, 0); @@ -4547,11 +4537,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&_26$$21, &joinPrepared, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2532); + zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2529); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2533); + zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2530); ZEPHIR_OBS_NVAR(&preCondition); - zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2534); + zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2531); ZEPHIR_INIT_NVAR(&_33$$23); zephir_create_array(&_33$$23, 3, 0); zephir_array_update_string(&_33$$23, SL("type"), &joinType, PH_COPY | PH_SEPARATE); @@ -4560,7 +4550,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_34$$23, 1, 0); zephir_array_fast_append(&_34$$23, &preCondition); zephir_array_update_string(&_33$$23, SL("conditions"), &_34$$23, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_33$$23, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2539); + zephir_array_append(&sqlJoins, &_33$$23, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2536); ZEPHIR_CALL_METHOD(NULL, &joinPrepared, "next", NULL, 0); zephir_check_call_status(); } @@ -4571,15 +4561,15 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_INIT_NVAR(&fromModels); array_init(&fromModels); - zephir_is_iterable(&selectTables, 0, "phalcon/Mvc/Model/Query.zep", 2557); + zephir_is_iterable(&selectTables, 0, "phalcon/Mvc/Model/Query.zep", 2554); if (Z_TYPE_P(&selectTables) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectTables), _35) { ZEPHIR_INIT_NVAR(&tableItem); ZVAL_COPY(&tableItem, _35); - zephir_array_fetch_string(&_37$$24, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2551); + zephir_array_fetch_string(&_37$$24, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2548); ZEPHIR_OBS_NVAR(&_38$$24); - zephir_array_fetch_string(&_38$$24, &_37$$24, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2551); + zephir_array_fetch_string(&_38$$24, &_37$$24, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2548); zephir_array_update_zval(&fromModels, &_38$$24, &__$true, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -4593,9 +4583,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_CALL_METHOD(&tableItem, &selectTables, "current", NULL, 0); zephir_check_call_status(); - zephir_array_fetch_string(&_39$$25, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2551); + zephir_array_fetch_string(&_39$$25, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2548); ZEPHIR_OBS_NVAR(&_40$$25); - zephir_array_fetch_string(&_40$$25, &_39$$25, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2551); + zephir_array_fetch_string(&_40$$25, &_39$$25, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2548); zephir_array_update_zval(&fromModels, &_40$$25, &__$true, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &selectTables, "next", NULL, 0); zephir_check_call_status(); @@ -4603,7 +4593,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_INIT_NVAR(&tableItem); ZEPHIR_INIT_VAR(&_41); - zephir_is_iterable(&fromModels, 0, "phalcon/Mvc/Model/Query.zep", 2677); + zephir_is_iterable(&fromModels, 0, "phalcon/Mvc/Model/Query.zep", 2674); if (Z_TYPE_P(&fromModels) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fromModels), _44, _45, _42) { @@ -4615,7 +4605,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_INIT_NVAR(&_41); ZVAL_COPY(&_41, _42); - zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2675); + zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2672); if (Z_TYPE_P(&joinModels) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinModels), _48$$26, _49$$26, _46$$26) { @@ -4628,13 +4618,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&joinModel); ZVAL_COPY(&joinModel, _46$$26); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2562); + zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2559); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2567); + zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2564); ZEPHIR_OBS_NVAR(&preCondition); if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) { ZEPHIR_OBS_NVAR(&modelNameAlias); - zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2576); + zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2573); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_50, 0, &fromModelName, &modelNameAlias); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) { @@ -4649,17 +4639,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSVSV(&_54$$31, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_53$$31); ZEPHIR_CALL_METHOD(NULL, &_52$$31, "__construct", &_8, 29, &_54$$31); zephir_check_call_status(); - zephir_throw_exception_debug(&_52$$31, "phalcon/Mvc/Model/Query.zep", 2602); + zephir_throw_exception_debug(&_52$$31, "phalcon/Mvc/Model/Query.zep", 2599); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&relation); - zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2608); + zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2605); } } if (Z_TYPE_P(&relation) == IS_OBJECT) { ZEPHIR_OBS_NVAR(&modelAlias); - zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2619); + zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2616); ZEPHIR_CALL_METHOD(&_55$$32, &relation, "isthrough", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(&_55$$32))) { @@ -4670,13 +4660,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { - zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2649); + zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2646); if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _58$$35) { ZEPHIR_INIT_NVAR(&sqlJoinItem); ZVAL_COPY(&sqlJoinItem, _58$$35); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0); @@ -4689,14 +4679,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0); zephir_check_call_status(); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644); ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0); zephir_check_call_status(); } } ZEPHIR_INIT_NVAR(&sqlJoinItem); } else { - zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2650); + zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); } } else { ZEPHIR_INIT_NVAR(&_60$$39); @@ -4706,7 +4696,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&_61$$39); array_init(&_61$$39); zephir_array_update_string(&_60$$39, SL("conditions"), &_61$$39, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_60$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2661); + zephir_array_append(&sqlJoins, &_60$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2658); } } else { ZEPHIR_INIT_NVAR(&_62$$40); @@ -4717,7 +4707,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_63$$40, 1, 0); zephir_array_fast_append(&_63$$40, &preCondition); zephir_array_update_string(&_62$$40, SL("conditions"), &_63$$40, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_62$$40, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2672); + zephir_array_append(&sqlJoins, &_62$$40, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2669); } } ZEND_HASH_FOREACH_END(); } else { @@ -4734,13 +4724,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&joinModel, &joinModels, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2562); + zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2559); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2567); + zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2564); ZEPHIR_OBS_NVAR(&preCondition); if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) { ZEPHIR_OBS_NVAR(&modelNameAlias); - zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2576); + zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2573); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_64, 0, &fromModelName, &modelNameAlias); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) { @@ -4755,17 +4745,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSVSV(&_68$$45, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_67$$45); ZEPHIR_CALL_METHOD(NULL, &_66$$45, "__construct", &_8, 29, &_68$$45); zephir_check_call_status(); - zephir_throw_exception_debug(&_66$$45, "phalcon/Mvc/Model/Query.zep", 2602); + zephir_throw_exception_debug(&_66$$45, "phalcon/Mvc/Model/Query.zep", 2599); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&relation); - zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2608); + zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2605); } } if (Z_TYPE_P(&relation) == IS_OBJECT) { ZEPHIR_OBS_NVAR(&modelAlias); - zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2619); + zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2616); ZEPHIR_CALL_METHOD(&_69$$46, &relation, "isthrough", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(&_69$$46))) { @@ -4776,13 +4766,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { - zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2649); + zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2646); if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _70$$49) { ZEPHIR_INIT_NVAR(&sqlJoinItem); ZVAL_COPY(&sqlJoinItem, _70$$49); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0); @@ -4795,14 +4785,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0); zephir_check_call_status(); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644); ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0); zephir_check_call_status(); } } ZEPHIR_INIT_NVAR(&sqlJoinItem); } else { - zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2650); + zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); } } else { ZEPHIR_INIT_NVAR(&_72$$53); @@ -4812,7 +4802,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&_73$$53); array_init(&_73$$53); zephir_array_update_string(&_72$$53, SL("conditions"), &_73$$53, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_72$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2661); + zephir_array_append(&sqlJoins, &_72$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2658); } } else { ZEPHIR_INIT_NVAR(&_74$$54); @@ -4823,7 +4813,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_75$$54, 1, 0); zephir_array_fast_append(&_75$$54, &preCondition); zephir_array_update_string(&_74$$54, SL("conditions"), &_75$$54, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_74$$54, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2672); + zephir_array_append(&sqlJoins, &_74$$54, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2669); } ZEPHIR_CALL_METHOD(NULL, &joinModels, "next", NULL, 0); zephir_check_call_status(); @@ -4845,7 +4835,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_41, &fromModels, "current", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2675); + zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2672); if (Z_TYPE_P(&joinModels) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinModels), _78$$55, _79$$55, _76$$55) { @@ -4858,13 +4848,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&joinModel); ZVAL_COPY(&joinModel, _76$$55); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2562); + zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2559); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2567); + zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2564); ZEPHIR_OBS_NVAR(&preCondition); if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) { ZEPHIR_OBS_NVAR(&modelNameAlias); - zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2576); + zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2573); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_80, 0, &fromModelName, &modelNameAlias); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) { @@ -4879,17 +4869,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSVSV(&_84$$60, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_83$$60); ZEPHIR_CALL_METHOD(NULL, &_82$$60, "__construct", &_8, 29, &_84$$60); zephir_check_call_status(); - zephir_throw_exception_debug(&_82$$60, "phalcon/Mvc/Model/Query.zep", 2602); + zephir_throw_exception_debug(&_82$$60, "phalcon/Mvc/Model/Query.zep", 2599); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&relation); - zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2608); + zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2605); } } if (Z_TYPE_P(&relation) == IS_OBJECT) { ZEPHIR_OBS_NVAR(&modelAlias); - zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2619); + zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2616); ZEPHIR_CALL_METHOD(&_85$$61, &relation, "isthrough", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(&_85$$61))) { @@ -4900,13 +4890,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { - zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2649); + zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2646); if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _86$$64) { ZEPHIR_INIT_NVAR(&sqlJoinItem); ZVAL_COPY(&sqlJoinItem, _86$$64); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0); @@ -4919,14 +4909,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0); zephir_check_call_status(); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644); ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0); zephir_check_call_status(); } } ZEPHIR_INIT_NVAR(&sqlJoinItem); } else { - zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2650); + zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); } } else { ZEPHIR_INIT_NVAR(&_88$$68); @@ -4936,7 +4926,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&_89$$68); array_init(&_89$$68); zephir_array_update_string(&_88$$68, SL("conditions"), &_89$$68, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_88$$68, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2661); + zephir_array_append(&sqlJoins, &_88$$68, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2658); } } else { ZEPHIR_INIT_NVAR(&_90$$69); @@ -4947,7 +4937,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_91$$69, 1, 0); zephir_array_fast_append(&_91$$69, &preCondition); zephir_array_update_string(&_90$$69, SL("conditions"), &_91$$69, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_90$$69, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2672); + zephir_array_append(&sqlJoins, &_90$$69, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2669); } } ZEND_HASH_FOREACH_END(); } else { @@ -4964,13 +4954,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&joinModel, &joinModels, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2562); + zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2559); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2567); + zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2564); ZEPHIR_OBS_NVAR(&preCondition); if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) { ZEPHIR_OBS_NVAR(&modelNameAlias); - zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2576); + zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2573); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_92, 0, &fromModelName, &modelNameAlias); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) { @@ -4985,17 +4975,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSVSV(&_96$$74, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_95$$74); ZEPHIR_CALL_METHOD(NULL, &_94$$74, "__construct", &_8, 29, &_96$$74); zephir_check_call_status(); - zephir_throw_exception_debug(&_94$$74, "phalcon/Mvc/Model/Query.zep", 2602); + zephir_throw_exception_debug(&_94$$74, "phalcon/Mvc/Model/Query.zep", 2599); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&relation); - zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2608); + zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2605); } } if (Z_TYPE_P(&relation) == IS_OBJECT) { ZEPHIR_OBS_NVAR(&modelAlias); - zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2619); + zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2616); ZEPHIR_CALL_METHOD(&_97$$75, &relation, "isthrough", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(&_97$$75))) { @@ -5006,13 +4996,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { - zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2649); + zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2646); if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _98$$78) { ZEPHIR_INIT_NVAR(&sqlJoinItem); ZVAL_COPY(&sqlJoinItem, _98$$78); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0); @@ -5025,14 +5015,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0); zephir_check_call_status(); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644); ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0); zephir_check_call_status(); } } ZEPHIR_INIT_NVAR(&sqlJoinItem); } else { - zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2650); + zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); } } else { ZEPHIR_INIT_NVAR(&_100$$82); @@ -5042,7 +5032,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&_101$$82); array_init(&_101$$82); zephir_array_update_string(&_100$$82, SL("conditions"), &_101$$82, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_100$$82, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2661); + zephir_array_append(&sqlJoins, &_100$$82, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2658); } } else { ZEPHIR_INIT_NVAR(&_102$$83); @@ -5053,7 +5043,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_103$$83, 1, 0); zephir_array_fast_append(&_103$$83, &preCondition); zephir_array_update_string(&_102$$83, SL("conditions"), &_103$$83, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_102$$83, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2672); + zephir_array_append(&sqlJoins, &_102$$83, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2669); } ZEPHIR_CALL_METHOD(NULL, &joinModels, "next", NULL, 0); zephir_check_call_status(); @@ -5183,7 +5173,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin) ZEPHIR_CALL_METHOD(&referencedModelName, relation, "getreferencedmodel", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&fields) == IS_ARRAY) { - zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 2794); + zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 2791); if (Z_TYPE_P(&fields) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _3$$3, _4$$3, _1$$3) { @@ -5203,12 +5193,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin) ZEPHIR_CONCAT_SVSVSV(&_7$$5, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_6$$5); ZEPHIR_CALL_METHOD(NULL, &_5$$5, "__construct", &_8, 29, &_7$$5); zephir_check_call_status(); - zephir_throw_exception_debug(&_5$$5, "phalcon/Mvc/Model/Query.zep", 2761); + zephir_throw_exception_debug(&_5$$5, "phalcon/Mvc/Model/Query.zep", 2758); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&intermediateField); - zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2767); + zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2764); ZEPHIR_INIT_NVAR(&sqlEqualsJoinCondition); zephir_create_array(&sqlEqualsJoinCondition, 4, 0); add_assoc_stringl_ex(&sqlEqualsJoinCondition, SL("type"), SL("binary-op")); @@ -5251,12 +5241,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin) ZEPHIR_CONCAT_SVSVSV(&_15$$7, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_14$$7); ZEPHIR_CALL_METHOD(NULL, &_13$$7, "__construct", &_8, 29, &_15$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_13$$7, "phalcon/Mvc/Model/Query.zep", 2761); + zephir_throw_exception_debug(&_13$$7, "phalcon/Mvc/Model/Query.zep", 2758); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&intermediateField); - zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2767); + zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2764); ZEPHIR_INIT_NVAR(&_16$$6); zephir_create_array(&_16$$6, 4, 0); add_assoc_stringl_ex(&_16$$6, SL("type"), SL("binary-op")); @@ -5408,13 +5398,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause) } ZEPHIR_INIT_VAR(&orderParts); array_init(&orderParts); - zephir_is_iterable(&orderColumns, 0, "phalcon/Mvc/Model/Query.zep", 2903); + zephir_is_iterable(&orderColumns, 0, "phalcon/Mvc/Model/Query.zep", 2900); if (Z_TYPE_P(&orderColumns) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&orderColumns), _0) { ZEPHIR_INIT_NVAR(&orderItem); ZVAL_COPY(&orderItem, _0); - zephir_array_fetch_string(&_2$$5, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2885); + zephir_array_fetch_string(&_2$$5, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2882); ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 453, &_2$$5); zephir_check_call_status(); if (zephir_array_isset_string_fetch(&orderSort, &orderItem, SL("sort"), 1)) { @@ -5440,7 +5430,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause) zephir_array_fast_append(&_7$$9, &orderPartExpr); ZEPHIR_CPY_WRT(&orderPartSort, &_7$$9); } - zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2900); + zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2897); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &orderColumns, "rewind", NULL, 0); @@ -5453,7 +5443,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause) } ZEPHIR_CALL_METHOD(&orderItem, &orderColumns, "current", NULL, 0); zephir_check_call_status(); - zephir_array_fetch_string(&_8$$10, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2885); + zephir_array_fetch_string(&_8$$10, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2882); ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 453, &_8$$10); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&orderSort); @@ -5481,7 +5471,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause) zephir_array_fast_append(&_13$$14, &orderPartExpr); ZEPHIR_CPY_WRT(&orderPartSort, &_13$$14); } - zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2900); + zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2897); ZEPHIR_CALL_METHOD(NULL, &orderColumns, "next", NULL, 0); zephir_check_call_status(); } @@ -5569,13 +5559,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_OBS_VAR(&columnName); - zephir_array_fetch_string(&columnName, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2917); + zephir_array_fetch_string(&columnName, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2914); zephir_read_property(&_0, this_ptr, ZEND_STRL("nestingLevel"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&nestingLevel, &_0); zephir_read_property(&_0, this_ptr, ZEND_STRL("sqlColumnAliases"), PH_NOISY_CC | PH_READONLY); if (zephir_array_isset(&_0, &nestingLevel)) { zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("sqlColumnAliases"), PH_NOISY_CC | PH_READONLY); - zephir_array_fetch(&_2$$3, &_1$$3, &nestingLevel, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2925); + zephir_array_fetch(&_2$$3, &_1$$3, &nestingLevel, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2922); ZEPHIR_CPY_WRT(&sqlColumnAliases, &_2$$3); } else { ZEPHIR_INIT_NVAR(&sqlColumnAliases); @@ -5585,7 +5575,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) if (_3) { _4 = !(zephir_array_isset_string(&expr, SL("domain"))); if (!(_4)) { - zephir_array_fetch_string(&_5, &expr, SL("domain"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2930); + zephir_array_fetch_string(&_5, &expr, SL("domain"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2927); _4 = ZEPHIR_IS_EMPTY(&_5); } _3 = _4; @@ -5611,7 +5601,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_10$$7, "Unknown model or alias '", &columnDomain, "' (11), when preparing: ", &_9$$7); ZEPHIR_CALL_METHOD(NULL, &_8$$7, "__construct", NULL, 29, &_10$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_8$$7, "phalcon/Mvc/Model/Query.zep", 2951); + zephir_throw_exception_debug(&_8$$7, "phalcon/Mvc/Model/Query.zep", 2948); ZEPHIR_MM_RESTORE(); return; } @@ -5627,7 +5617,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_14$$9, "There is no model related to model or alias '", &columnDomain, "', when executing: ", &_13$$9); ZEPHIR_CALL_METHOD(NULL, &_12$$9, "__construct", NULL, 29, &_14$$9); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$9, "phalcon/Mvc/Model/Query.zep", 2970); + zephir_throw_exception_debug(&_12$$9, "phalcon/Mvc/Model/Query.zep", 2967); ZEPHIR_MM_RESTORE(); return; } @@ -5647,7 +5637,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSVSV(&_17$$12, "Column '", &columnName, "' doesn't belong to the model or alias '", &columnDomain, "', when executing: ", &_16$$12); ZEPHIR_CALL_METHOD(NULL, &_15$$12, "__construct", NULL, 29, &_17$$12); zephir_check_call_status(); - zephir_throw_exception_debug(&_15$$12, "phalcon/Mvc/Model/Query.zep", 2982); + zephir_throw_exception_debug(&_15$$12, "phalcon/Mvc/Model/Query.zep", 2979); ZEPHIR_MM_RESTORE(); return; } @@ -5659,7 +5649,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_INIT_VAR(&hasModel); ZVAL_BOOL(&hasModel, 0); zephir_read_property(&_18$$14, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY); - zephir_is_iterable(&_18$$14, 0, "phalcon/Mvc/Model/Query.zep", 3016); + zephir_is_iterable(&_18$$14, 0, "phalcon/Mvc/Model/Query.zep", 3013); if (Z_TYPE_P(&_18$$14) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_18$$14), _19$$14) { @@ -5677,7 +5667,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_25$$17, "The column '", &columnName, "' is ambiguous, when preparing: ", &_24$$17); ZEPHIR_CALL_METHOD(NULL, &_23$$17, "__construct", NULL, 29, &_25$$17); zephir_check_call_status(); - zephir_throw_exception_debug(&_23$$17, "phalcon/Mvc/Model/Query.zep", 3005); + zephir_throw_exception_debug(&_23$$17, "phalcon/Mvc/Model/Query.zep", 3002); ZEPHIR_MM_RESTORE(); return; } @@ -5707,7 +5697,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_30$$20, "The column '", &columnName, "' is ambiguous, when preparing: ", &_29$$20); ZEPHIR_CALL_METHOD(NULL, &_28$$20, "__construct", NULL, 29, &_30$$20); zephir_check_call_status(); - zephir_throw_exception_debug(&_28$$20, "phalcon/Mvc/Model/Query.zep", 3005); + zephir_throw_exception_debug(&_28$$20, "phalcon/Mvc/Model/Query.zep", 3002); ZEPHIR_MM_RESTORE(); return; } @@ -5726,14 +5716,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_33$$21, "Column '", &columnName, "' doesn't belong to any of the selected models (1), when preparing: ", &_32$$21); ZEPHIR_CALL_METHOD(NULL, &_31$$21, "__construct", NULL, 29, &_33$$21); zephir_check_call_status(); - zephir_throw_exception_debug(&_31$$21, "phalcon/Mvc/Model/Query.zep", 3019); + zephir_throw_exception_debug(&_31$$21, "phalcon/Mvc/Model/Query.zep", 3016); ZEPHIR_MM_RESTORE(); return; } zephir_read_property(&_34$$14, this_ptr, ZEND_STRL("models"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&models, &_34$$14); if (UNEXPECTED(Z_TYPE_P(&models) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The models list was not loaded correctly", "phalcon/Mvc/Model/Query.zep", 3030); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The models list was not loaded correctly", "phalcon/Mvc/Model/Query.zep", 3027); return; } ZEPHIR_INIT_VAR(&className); @@ -5747,7 +5737,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_37$$23, "Can't obtain model's source from models list: '", &className, "', when preparing: ", &_36$$23); ZEPHIR_CALL_METHOD(NULL, &_35$$23, "__construct", NULL, 29, &_37$$23); zephir_check_call_status(); - zephir_throw_exception_debug(&_35$$23, "phalcon/Mvc/Model/Query.zep", 3041); + zephir_throw_exception_debug(&_35$$23, "phalcon/Mvc/Model/Query.zep", 3038); ZEPHIR_MM_RESTORE(); return; } @@ -5768,7 +5758,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_40$$27, "Column '", &columnName, "' doesn't belong to any of the selected models (3), when preparing: ", &_39$$27); ZEPHIR_CALL_METHOD(NULL, &_38$$27, "__construct", NULL, 29, &_40$$27); zephir_check_call_status(); - zephir_throw_exception_debug(&_38$$27, "phalcon/Mvc/Model/Query.zep", 3060); + zephir_throw_exception_debug(&_38$$27, "phalcon/Mvc/Model/Query.zep", 3057); ZEPHIR_MM_RESTORE(); return; } @@ -5854,7 +5844,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getReadConnection) ZEPHIR_CALL_METHOD(&connection, model, "selectreadconnection", NULL, 0, &intermediate, &bindParams, &bindTypes); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&connection) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectReadConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3104); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectReadConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3101); return; } RETURN_CCTOR(&connection); @@ -5926,10 +5916,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getRelatedRecords) zephir_array_fast_append(&_0, &_1); zephir_array_update_string(&selectIr, SL("columns"), &_0, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_VAR(&_4); - zephir_array_fetch_string(&_4, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3134); + zephir_array_fetch_string(&_4, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3131); zephir_array_update_string(&selectIr, SL("models"), &_4, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_4); - zephir_array_fetch_string(&_4, &intermediate, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3136); + zephir_array_fetch_string(&_4, &intermediate, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3133); zephir_array_update_string(&selectIr, SL("tables"), &_4, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_VAR(&whereConditions); if (zephir_array_isset_string_fetch(&whereConditions, &intermediate, SL("where"), 0)) { @@ -6018,7 +6008,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) ZEPHIR_OBS_VAR(&columnType); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&columnType, &column, SL("type"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3176); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3173); return; } ZEPHIR_INIT_VAR(&sqlColumns); @@ -6027,7 +6017,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) zephir_array_isset_string_fetch(&eager, &column, SL("eager"), 0); if (ZEPHIR_IS_LONG(&columnType, 352)) { zephir_read_property(&_0$$4, this_ptr, ZEND_STRL("models"), PH_NOISY_CC | PH_READONLY); - zephir_is_iterable(&_0$$4, 0, "phalcon/Mvc/Model/Query.zep", 3206); + zephir_is_iterable(&_0$$4, 0, "phalcon/Mvc/Model/Query.zep", 3203); if (Z_TYPE_P(&_0$$4) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_0$$4), _3$$4, _4$$4, _1$$4) { @@ -6049,10 +6039,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) zephir_array_update_string(&sqlColumn, SL("balias"), &_5$$5, PH_COPY | PH_SEPARATE); if (Z_TYPE_P(&eager) != IS_NULL) { zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_7$$6, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3200); + zephir_array_fetch_string(&_7$$6, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3197); zephir_array_update_string(&sqlColumn, SL("eagerType"), &_7$$6, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3203); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3200); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &_0$$4, "rewind", NULL, 0); @@ -6078,10 +6068,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) ZEPHIR_CPY_WRT(&sqlColumn, &_8$$7); if (Z_TYPE_P(&eager) != IS_NULL) { zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_10$$8, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3200); + zephir_array_fetch_string(&_10$$8, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3197); zephir_array_update_string(&sqlColumn, SL("eagerType"), &_10$$8, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3203); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3200); ZEPHIR_CALL_METHOD(NULL, &_0$$4, "next", NULL, 0); zephir_check_call_status(); } @@ -6091,14 +6081,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) RETURN_CTOR(&sqlColumns); } if (UNEXPECTED(!(zephir_array_isset_string(&column, SL("column"))))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3210); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3207); return; } if (ZEPHIR_IS_LONG(&columnType, 353)) { zephir_read_property(&_11$$10, this_ptr, ZEND_STRL("sqlAliases"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&sqlAliases, &_11$$10); ZEPHIR_OBS_VAR(&columnDomain); - zephir_array_fetch_string(&columnDomain, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3222); + zephir_array_fetch_string(&columnDomain, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3219); ZEPHIR_OBS_NVAR(&source); if (UNEXPECTED(!(zephir_array_isset_fetch(&source, &sqlAliases, &columnDomain, 0)))) { ZEPHIR_INIT_VAR(&_12$$11); @@ -6108,7 +6098,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) ZEPHIR_CONCAT_SVSV(&_14$$11, "Unknown model or alias '", &columnDomain, "' (2), when preparing: ", &_13$$11); ZEPHIR_CALL_METHOD(NULL, &_12$$11, "__construct", NULL, 29, &_14$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 3227); + zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 3224); ZEPHIR_MM_RESTORE(); return; } @@ -6118,7 +6108,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) zephir_read_property(&_11$$10, this_ptr, ZEND_STRL("sqlAliasesModels"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&sqlAliasesModels, &_11$$10); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch(&modelName, &sqlAliasesModels, &columnDomain, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3241); + zephir_array_fetch(&modelName, &sqlAliasesModels, &columnDomain, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3238); if (Z_TYPE_P(&preparedAlias) != IS_STRING) { if (ZEPHIR_IS_EQUAL(&columnDomain, &modelName)) { ZEPHIR_CALL_FUNCTION(&preparedAlias, "lcfirst", &_6, 73, &modelName); @@ -6136,10 +6126,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) ZEPHIR_CPY_WRT(&sqlColumn, &_15$$10); if (Z_TYPE_P(&eager) != IS_NULL) { zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_16$$15, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3268); + zephir_array_fetch_string(&_16$$15, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3265); zephir_array_update_string(&sqlColumn, SL("eagerType"), &_16$$15, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3271); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3268); RETURN_CTOR(&sqlColumns); } if (ZEPHIR_IS_LONG(&columnType, 354)) { @@ -6148,7 +6138,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) add_assoc_stringl_ex(&_17$$16, SL("type"), SL("scalar")); ZEPHIR_CPY_WRT(&sqlColumn, &_17$$16); ZEPHIR_OBS_VAR(&columnData); - zephir_array_fetch_string(&columnData, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3285); + zephir_array_fetch_string(&columnData, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3282); ZEPHIR_CALL_METHOD(&sqlExprColumn, this_ptr, "getexpression", NULL, 453, &columnData); zephir_check_call_status(); ZEPHIR_OBS_VAR(&balias); @@ -6158,11 +6148,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) } if (Z_TYPE_P(&eager) != IS_NULL) { zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_18$$18, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3298); + zephir_array_fetch_string(&_18$$18, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3295); zephir_array_update_string(&sqlColumn, SL("eagerType"), &_18$$18, PH_COPY | PH_SEPARATE); } zephir_array_update_string(&sqlColumn, SL("column"), &sqlExprColumn, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3302); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3299); RETURN_CTOR(&sqlColumns); } ZEPHIR_INIT_VAR(&_19); @@ -6171,7 +6161,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) ZEPHIR_CONCAT_SV(&_20, "Unknown type of column ", &columnType); ZEPHIR_CALL_METHOD(NULL, &_19, "__construct", NULL, 29, &_20); zephir_check_call_status(); - zephir_throw_exception_debug(&_19, "phalcon/Mvc/Model/Query.zep", 3307); + zephir_throw_exception_debug(&_19, "phalcon/Mvc/Model/Query.zep", 3304); ZEPHIR_MM_RESTORE(); return; } @@ -6286,7 +6276,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) } else { ZEPHIR_INIT_VAR(&sqlJoinPartialConditions); array_init(&sqlJoinPartialConditions); - zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3397); + zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3394); if (Z_TYPE_P(&fields) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _7$$4, _8$$4, _5$$4) { @@ -6307,7 +6297,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) ZEPHIR_CONCAT_SVSVSV(&_11$$6, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_10$$6); ZEPHIR_CALL_METHOD(NULL, &_9$$6, "__construct", &_12, 29, &_11$$6); zephir_check_call_status(); - zephir_throw_exception_debug(&_9$$6, "phalcon/Mvc/Model/Query.zep", 3369); + zephir_throw_exception_debug(&_9$$6, "phalcon/Mvc/Model/Query.zep", 3366); ZEPHIR_MM_RESTORE(); return; } @@ -6331,7 +6321,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) ZEPHIR_CALL_METHOD(&_14$$5, this_ptr, "getqualified", NULL, 454, &_16$$5); zephir_check_call_status(); zephir_array_update_string(&_13$$5, SL("right"), &_14$$5, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoinPartialConditions, &_13$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3394); + zephir_array_append(&sqlJoinPartialConditions, &_13$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3391); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &fields, "rewind", NULL, 0); @@ -6355,7 +6345,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) ZEPHIR_CONCAT_SVSVSV(&_19$$8, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_18$$8); ZEPHIR_CALL_METHOD(NULL, &_17$$8, "__construct", &_12, 29, &_19$$8); zephir_check_call_status(); - zephir_throw_exception_debug(&_17$$8, "phalcon/Mvc/Model/Query.zep", 3369); + zephir_throw_exception_debug(&_17$$8, "phalcon/Mvc/Model/Query.zep", 3366); ZEPHIR_MM_RESTORE(); return; } @@ -6379,7 +6369,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) ZEPHIR_CALL_METHOD(&_21$$7, this_ptr, "getqualified", NULL, 454, &_23$$7); zephir_check_call_status(); zephir_array_update_string(&_20$$7, SL("right"), &_21$$7, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoinPartialConditions, &_20$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3394); + zephir_array_append(&sqlJoinPartialConditions, &_20$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3391); ZEPHIR_CALL_METHOD(NULL, &fields, "next", NULL, 0); zephir_check_call_status(); } @@ -6429,7 +6419,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getTable) ZEPHIR_OBS_VAR(&modelName); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&modelName, &qualifiedName, SL("name"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3419); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3416); return; } ZEPHIR_CALL_METHOD(&model, manager, "load", NULL, 0, &modelName); @@ -6517,7 +6507,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getWriteConnection) ZEPHIR_CALL_METHOD(&connection, model, "selectwriteconnection", NULL, 0, &intermediate, &bindParams, &bindTypes); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&connection) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectWriteConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3457); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectWriteConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3454); return; } RETURN_CCTOR(&connection); @@ -6579,12 +6569,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) ZEPHIR_CPY_WRT(&ast, &_0); ZEPHIR_OBS_VAR(&delete); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&delete, &ast, SL("delete"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3479); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3476); return; } ZEPHIR_OBS_VAR(&tables); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&tables, &delete, SL("tables"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3483); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3480); return; } ZEPHIR_INIT_VAR(&models); @@ -6608,16 +6598,16 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) } zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_0); - zephir_is_iterable(&deleteTables, 0, "phalcon/Mvc/Model/Query.zep", 3543); + zephir_is_iterable(&deleteTables, 0, "phalcon/Mvc/Model/Query.zep", 3540); if (Z_TYPE_P(&deleteTables) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&deleteTables), _1) { ZEPHIR_INIT_NVAR(&table); ZVAL_COPY(&table, _1); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3507); + zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3504); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3508); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3505); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_3, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -6641,17 +6631,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) ZEPHIR_OBS_NVAR(&alias); if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) { zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3525); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3526); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3522); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3523); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE); } else { zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3532); + zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3529); zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3536); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3533); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -6666,9 +6656,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) ZEPHIR_CALL_METHOD(&table, &deleteTables, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3507); + zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3504); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3508); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3505); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_6, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -6691,17 +6681,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) ZEPHIR_OBS_NVAR(&alias); if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) { zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3525); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3526); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3522); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3523); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE); } else { zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3532); + zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3529); zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3536); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3533); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &deleteTables, "next", NULL, 0); zephir_check_call_status(); @@ -6789,23 +6779,23 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) zephir_read_property(&_0, this_ptr, ZEND_STRL("ast"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&ast, &_0); if (UNEXPECTED(!(zephir_array_isset_string(&ast, SL("qualifiedName"))))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3577); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3574); return; } if (UNEXPECTED(!(zephir_array_isset_string(&ast, SL("values"))))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3581); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3578); return; } ZEPHIR_OBS_VAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &ast, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3584); + zephir_array_fetch_string(&qualifiedName, &ast, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3581); if (UNEXPECTED(!(zephir_array_isset_string(&qualifiedName, SL("name"))))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3588); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3585); return; } zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_0); ZEPHIR_OBS_VAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3592); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3589); ZEPHIR_CALL_METHOD(&model, &manager, "load", NULL, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -6822,8 +6812,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) notQuoting = 0; ZEPHIR_INIT_VAR(&exprValues); array_init(&exprValues); - zephir_array_fetch_string(&_2, &ast, SL("values"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3605); - zephir_is_iterable(&_2, 0, "phalcon/Mvc/Model/Query.zep", 3613); + zephir_array_fetch_string(&_2, &ast, SL("values"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3602); + zephir_is_iterable(&_2, 0, "phalcon/Mvc/Model/Query.zep", 3610); if (Z_TYPE_P(&_2) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_2), _3) { @@ -6832,7 +6822,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_INIT_NVAR(&_5$$7); zephir_create_array(&_5$$7, 2, 0); ZEPHIR_OBS_NVAR(&_6$$7); - zephir_array_fetch_string(&_6$$7, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3608); + zephir_array_fetch_string(&_6$$7, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3605); zephir_array_update_string(&_5$$7, SL("type"), &_6$$7, PH_COPY | PH_SEPARATE); if (notQuoting) { ZVAL_BOOL(&_8$$7, 1); @@ -6842,7 +6832,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_CALL_METHOD(&_7$$7, this_ptr, "getexpression", &_9, 453, &exprValue, &_8$$7); zephir_check_call_status(); zephir_array_update_string(&_5$$7, SL("value"), &_7$$7, PH_COPY | PH_SEPARATE); - zephir_array_append(&exprValues, &_5$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3610); + zephir_array_append(&exprValues, &_5$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3607); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &_2, "rewind", NULL, 0); @@ -6858,7 +6848,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_INIT_NVAR(&_10$$8); zephir_create_array(&_10$$8, 2, 0); ZEPHIR_OBS_NVAR(&_11$$8); - zephir_array_fetch_string(&_11$$8, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3608); + zephir_array_fetch_string(&_11$$8, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3605); zephir_array_update_string(&_10$$8, SL("type"), &_11$$8, PH_COPY | PH_SEPARATE); if (notQuoting) { ZVAL_BOOL(&_13$$8, 1); @@ -6868,7 +6858,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_CALL_METHOD(&_12$$8, this_ptr, "getexpression", &_9, 453, &exprValue, &_13$$8); zephir_check_call_status(); zephir_array_update_string(&_10$$8, SL("value"), &_12$$8, PH_COPY | PH_SEPARATE); - zephir_array_append(&exprValues, &_10$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3610); + zephir_array_append(&exprValues, &_10$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3607); ZEPHIR_CALL_METHOD(NULL, &_2, "next", NULL, 0); zephir_check_call_status(); } @@ -6884,14 +6874,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) if (zephir_array_isset_string_fetch(&fields, &ast, SL("fields"), 0)) { ZEPHIR_INIT_VAR(&sqlFields); array_init(&sqlFields); - zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3637); + zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3634); if (Z_TYPE_P(&fields) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&fields), _14$$9) { ZEPHIR_INIT_NVAR(&field); ZVAL_COPY(&field, _14$$9); ZEPHIR_OBS_NVAR(&name); - zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3624); + zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3621); ZEPHIR_CALL_METHOD(&_16$$10, &metaData, "hasattribute", &_17, 0, &model, &name); zephir_check_call_status(); if (UNEXPECTED(!zephir_is_true(&_16$$10))) { @@ -6902,11 +6892,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_CONCAT_SVSVSV(&_20$$11, "The model '", &modelName, "' doesn't have the attribute '", &name, "', when preparing: ", &_19$$11); ZEPHIR_CALL_METHOD(NULL, &_18$$11, "__construct", &_21, 29, &_20$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_18$$11, "phalcon/Mvc/Model/Query.zep", 3630); + zephir_throw_exception_debug(&_18$$11, "phalcon/Mvc/Model/Query.zep", 3627); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3634); + zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3631); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &fields, "rewind", NULL, 0); @@ -6920,7 +6910,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_CALL_METHOD(&field, &fields, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); - zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3624); + zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3621); ZEPHIR_CALL_METHOD(&_22$$12, &metaData, "hasattribute", &_23, 0, &model, &name); zephir_check_call_status(); if (UNEXPECTED(!zephir_is_true(&_22$$12))) { @@ -6931,11 +6921,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_CONCAT_SVSVSV(&_26$$13, "The model '", &modelName, "' doesn't have the attribute '", &name, "', when preparing: ", &_25$$13); ZEPHIR_CALL_METHOD(NULL, &_24$$13, "__construct", &_21, 29, &_26$$13); zephir_check_call_status(); - zephir_throw_exception_debug(&_24$$13, "phalcon/Mvc/Model/Query.zep", 3630); + zephir_throw_exception_debug(&_24$$13, "phalcon/Mvc/Model/Query.zep", 3627); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3634); + zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3631); ZEPHIR_CALL_METHOD(NULL, &fields, "next", NULL, 0); zephir_check_call_status(); } @@ -7141,12 +7131,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) } ZEPHIR_OBS_VAR(&tables); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&tables, &select, SL("tables"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3673); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3670); return; } ZEPHIR_OBS_VAR(&columns); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&columns, &select, SL("columns"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3677); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3674); return; } RETURN_ON_FAILURE(zephir_property_incr(this_ptr, SL("nestingLevel"))); @@ -7187,26 +7177,26 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_read_property(&_1, this_ptr, ZEND_STRL("metaData"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&metaData, &_1); if (UNEXPECTED(Z_TYPE_P(&manager) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A models-manager is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3744); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A models-manager is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3741); return; } if (UNEXPECTED(Z_TYPE_P(&metaData) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A meta-data is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3750); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A meta-data is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3747); return; } number = 0; ZEPHIR_INIT_VAR(&automaticJoins); array_init(&automaticJoins); - zephir_is_iterable(&selectedModels, 0, "phalcon/Mvc/Model/Query.zep", 3880); + zephir_is_iterable(&selectedModels, 0, "phalcon/Mvc/Model/Query.zep", 3877); if (Z_TYPE_P(&selectedModels) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectedModels), _2) { ZEPHIR_INIT_NVAR(&selectedModel); ZVAL_COPY(&selectedModel, _2); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3758); + zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3755); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3759); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3756); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_4, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&schema, &model, "getschema", NULL, 0); @@ -7231,7 +7221,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSV(&_7$$17, "Alias '", &alias, "' is used more than once, when preparing: ", &_6$$17); ZEPHIR_CALL_METHOD(NULL, &_5$$17, "__construct", &_8, 29, &_7$$17); zephir_check_call_status(); - zephir_throw_exception_debug(&_5$$17, "phalcon/Mvc/Model/Query.zep", 3784); + zephir_throw_exception_debug(&_5$$17, "phalcon/Mvc/Model/Query.zep", 3781); ZEPHIR_MM_RESTORE(); return; } @@ -7240,7 +7230,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_zval(&sqlModelsAliases, &modelName, &alias, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); if (Z_TYPE_P(&completeSource) == IS_ARRAY) { - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3796); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3793); } else { ZEPHIR_INIT_NVAR(&_9$$19); zephir_create_array(&_9$$19, 3, 0); @@ -7267,7 +7257,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) } else { ZEPHIR_CPY_WRT(&withs, &with); } - zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3872); + zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3869); if (Z_TYPE_P(&withs) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&withs), _10$$21) { @@ -7279,7 +7269,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_13$$24, "AA", &_12$$24); ZEPHIR_CPY_WRT(&joinAlias, &_13$$24); ZEPHIR_OBS_NVAR(&relationModel); - zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3822); + zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3819); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_14, 0, &modelName, &relationModel); zephir_check_call_status(); if (Z_TYPE_P(&relation) == IS_OBJECT) { @@ -7302,7 +7292,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSVSV(&_19$$27, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_18$$27); ZEPHIR_CALL_METHOD(NULL, &_17$$27, "__construct", &_8, 29, &_19$$27); zephir_check_call_status(); - zephir_throw_exception_debug(&_17$$27, "phalcon/Mvc/Model/Query.zep", 3842); + zephir_throw_exception_debug(&_17$$27, "phalcon/Mvc/Model/Query.zep", 3839); ZEPHIR_MM_RESTORE(); return; } @@ -7322,7 +7312,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_string(&_21$$24, SL("eager"), &alias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_21$$24, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_21$$24, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE); - zephir_array_append(&selectColumns, &_21$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3856); + zephir_array_append(&selectColumns, &_21$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3853); ZEPHIR_INIT_NVAR(&_22$$24); zephir_create_array(&_22$$24, 3, 0); add_assoc_long_ex(&_22$$24, SL("type"), 360); @@ -7336,7 +7326,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) add_assoc_long_ex(&_23$$24, SL("type"), 355); zephir_array_update_string(&_23$$24, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_22$$24, SL("alias"), &_23$$24, PH_COPY | PH_SEPARATE); - zephir_array_append(&automaticJoins, &_22$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3868); + zephir_array_append(&automaticJoins, &_22$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3865); number++; } ZEND_HASH_FOREACH_END(); } else { @@ -7356,7 +7346,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_25$$28, "AA", &_24$$28); ZEPHIR_CPY_WRT(&joinAlias, &_25$$28); ZEPHIR_OBS_NVAR(&relationModel); - zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3822); + zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3819); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_26, 0, &modelName, &relationModel); zephir_check_call_status(); if (Z_TYPE_P(&relation) == IS_OBJECT) { @@ -7379,7 +7369,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSVSV(&_31$$31, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_30$$31); ZEPHIR_CALL_METHOD(NULL, &_29$$31, "__construct", &_8, 29, &_31$$31); zephir_check_call_status(); - zephir_throw_exception_debug(&_29$$31, "phalcon/Mvc/Model/Query.zep", 3842); + zephir_throw_exception_debug(&_29$$31, "phalcon/Mvc/Model/Query.zep", 3839); ZEPHIR_MM_RESTORE(); return; } @@ -7399,7 +7389,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_string(&_33$$28, SL("eager"), &alias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_33$$28, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_33$$28, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE); - zephir_array_append(&selectColumns, &_33$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3856); + zephir_array_append(&selectColumns, &_33$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3853); ZEPHIR_INIT_NVAR(&_34$$28); zephir_create_array(&_34$$28, 3, 0); add_assoc_long_ex(&_34$$28, SL("type"), 360); @@ -7413,7 +7403,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) add_assoc_long_ex(&_35$$28, SL("type"), 355); zephir_array_update_string(&_35$$28, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_34$$28, SL("alias"), &_35$$28, PH_COPY | PH_SEPARATE); - zephir_array_append(&automaticJoins, &_34$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3868); + zephir_array_append(&automaticJoins, &_34$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3865); number++; ZEPHIR_CALL_METHOD(NULL, &withs, "next", NULL, 0); zephir_check_call_status(); @@ -7421,8 +7411,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) } ZEPHIR_INIT_NVAR(&withItem); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3874); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3875); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3871); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3872); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -7437,9 +7427,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CALL_METHOD(&selectedModel, &selectedModels, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3758); + zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3755); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3759); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3756); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_36, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&schema, &model, "getschema", NULL, 0); @@ -7465,7 +7455,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSV(&_40$$36, "Alias '", &alias, "' is used more than once, when preparing: ", &_39$$36); ZEPHIR_CALL_METHOD(NULL, &_38$$36, "__construct", &_8, 29, &_40$$36); zephir_check_call_status(); - zephir_throw_exception_debug(&_38$$36, "phalcon/Mvc/Model/Query.zep", 3784); + zephir_throw_exception_debug(&_38$$36, "phalcon/Mvc/Model/Query.zep", 3781); ZEPHIR_MM_RESTORE(); return; } @@ -7474,7 +7464,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_zval(&sqlModelsAliases, &modelName, &alias, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); if (Z_TYPE_P(&completeSource) == IS_ARRAY) { - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3796); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3793); } else { ZEPHIR_INIT_NVAR(&_41$$38); zephir_create_array(&_41$$38, 3, 0); @@ -7502,7 +7492,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) } else { ZEPHIR_CPY_WRT(&withs, &with); } - zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3872); + zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3869); if (Z_TYPE_P(&withs) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&withs), _43$$40) { @@ -7514,7 +7504,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_46$$43, "AA", &_45$$43); ZEPHIR_CPY_WRT(&joinAlias, &_46$$43); ZEPHIR_OBS_NVAR(&relationModel); - zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3822); + zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3819); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_47, 0, &modelName, &relationModel); zephir_check_call_status(); if (Z_TYPE_P(&relation) == IS_OBJECT) { @@ -7537,7 +7527,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSVSV(&_52$$46, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_51$$46); ZEPHIR_CALL_METHOD(NULL, &_50$$46, "__construct", &_8, 29, &_52$$46); zephir_check_call_status(); - zephir_throw_exception_debug(&_50$$46, "phalcon/Mvc/Model/Query.zep", 3842); + zephir_throw_exception_debug(&_50$$46, "phalcon/Mvc/Model/Query.zep", 3839); ZEPHIR_MM_RESTORE(); return; } @@ -7557,7 +7547,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_string(&_54$$43, SL("eager"), &alias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_54$$43, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_54$$43, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE); - zephir_array_append(&selectColumns, &_54$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3856); + zephir_array_append(&selectColumns, &_54$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3853); ZEPHIR_INIT_NVAR(&_55$$43); zephir_create_array(&_55$$43, 3, 0); add_assoc_long_ex(&_55$$43, SL("type"), 360); @@ -7571,7 +7561,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) add_assoc_long_ex(&_56$$43, SL("type"), 355); zephir_array_update_string(&_56$$43, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_55$$43, SL("alias"), &_56$$43, PH_COPY | PH_SEPARATE); - zephir_array_append(&automaticJoins, &_55$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3868); + zephir_array_append(&automaticJoins, &_55$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3865); number++; } ZEND_HASH_FOREACH_END(); } else { @@ -7591,7 +7581,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_58$$47, "AA", &_57$$47); ZEPHIR_CPY_WRT(&joinAlias, &_58$$47); ZEPHIR_OBS_NVAR(&relationModel); - zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3822); + zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3819); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_59, 0, &modelName, &relationModel); zephir_check_call_status(); if (Z_TYPE_P(&relation) == IS_OBJECT) { @@ -7614,7 +7604,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSVSV(&_64$$50, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_63$$50); ZEPHIR_CALL_METHOD(NULL, &_62$$50, "__construct", &_8, 29, &_64$$50); zephir_check_call_status(); - zephir_throw_exception_debug(&_62$$50, "phalcon/Mvc/Model/Query.zep", 3842); + zephir_throw_exception_debug(&_62$$50, "phalcon/Mvc/Model/Query.zep", 3839); ZEPHIR_MM_RESTORE(); return; } @@ -7634,7 +7624,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_string(&_66$$47, SL("eager"), &alias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_66$$47, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_66$$47, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE); - zephir_array_append(&selectColumns, &_66$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3856); + zephir_array_append(&selectColumns, &_66$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3853); ZEPHIR_INIT_NVAR(&_67$$47); zephir_create_array(&_67$$47, 3, 0); add_assoc_long_ex(&_67$$47, SL("type"), 360); @@ -7648,7 +7638,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) add_assoc_long_ex(&_68$$47, SL("type"), 355); zephir_array_update_string(&_68$$47, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_67$$47, SL("alias"), &_68$$47, PH_COPY | PH_SEPARATE); - zephir_array_append(&automaticJoins, &_67$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3868); + zephir_array_append(&automaticJoins, &_67$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3865); number++; ZEPHIR_CALL_METHOD(NULL, &withs, "next", NULL, 0); zephir_check_call_status(); @@ -7656,8 +7646,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) } ZEPHIR_INIT_NVAR(&withItem); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3874); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3875); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3871); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3872); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &selectedModels, "next", NULL, 0); zephir_check_call_status(); @@ -7718,7 +7708,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_fast_array_merge(&_81$$55, &joins, &automaticJoins); zephir_array_update_string(&select, SL("joins"), &_81$$55, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&automaticJoins, &joins, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3911); + zephir_array_append(&automaticJoins, &joins, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3908); zephir_array_update_string(&select, SL("joins"), &automaticJoins, PH_COPY | PH_SEPARATE); } } @@ -7737,7 +7727,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) position = 0; ZEPHIR_INIT_VAR(&sqlColumnAliases); array_init(&sqlColumnAliases); - zephir_is_iterable(&selectColumns, 0, "phalcon/Mvc/Model/Query.zep", 3962); + zephir_is_iterable(&selectColumns, 0, "phalcon/Mvc/Model/Query.zep", 3959); if (Z_TYPE_P(&selectColumns) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectColumns), _82) { @@ -7745,7 +7735,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZVAL_COPY(&column, _82); ZEPHIR_CALL_METHOD(&_84$$60, this_ptr, "getselectcolumn", &_85, 469, &column); zephir_check_call_status(); - zephir_is_iterable(&_84$$60, 0, "phalcon/Mvc/Model/Query.zep", 3960); + zephir_is_iterable(&_84$$60, 0, "phalcon/Mvc/Model/Query.zep", 3957); if (Z_TYPE_P(&_84$$60) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_84$$60), _86$$60) { @@ -7762,7 +7752,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) { zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_string(&_88$$65, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3950); + zephir_array_fetch_string(&_88$$65, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3947); if (ZEPHIR_IS_STRING(&_88$$65, "scalar")) { ZEPHIR_INIT_NVAR(&_89$$66); ZVAL_LONG(&_89$$66, position); @@ -7770,7 +7760,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_90$$66, "_", &_89$$66); zephir_array_update_zval(&sqlColumns, &_90$$66, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3953); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3950); } } } @@ -7798,7 +7788,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) { zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_string(&_91$$72, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3950); + zephir_array_fetch_string(&_91$$72, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3947); if (ZEPHIR_IS_STRING(&_91$$72, "scalar")) { ZEPHIR_INIT_NVAR(&_92$$73); ZVAL_LONG(&_92$$73, position); @@ -7806,7 +7796,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_93$$73, "_", &_92$$73); zephir_array_update_zval(&sqlColumns, &_93$$73, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3953); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3950); } } } @@ -7830,7 +7820,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_94$$75, this_ptr, "getselectcolumn", &_85, 469, &column); zephir_check_call_status(); - zephir_is_iterable(&_94$$75, 0, "phalcon/Mvc/Model/Query.zep", 3960); + zephir_is_iterable(&_94$$75, 0, "phalcon/Mvc/Model/Query.zep", 3957); if (Z_TYPE_P(&_94$$75) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_94$$75), _95$$75) { @@ -7847,7 +7837,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) { zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_string(&_97$$80, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3950); + zephir_array_fetch_string(&_97$$80, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3947); if (ZEPHIR_IS_STRING(&_97$$80, "scalar")) { ZEPHIR_INIT_NVAR(&_98$$81); ZVAL_LONG(&_98$$81, position); @@ -7855,7 +7845,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_99$$81, "_", &_98$$81); zephir_array_update_zval(&sqlColumns, &_99$$81, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3953); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3950); } } } @@ -7883,7 +7873,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) { zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_string(&_100$$87, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3950); + zephir_array_fetch_string(&_100$$87, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3947); if (ZEPHIR_IS_STRING(&_100$$87, "scalar")) { ZEPHIR_INIT_NVAR(&_101$$88); ZVAL_LONG(&_101$$88, position); @@ -7891,7 +7881,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_102$$88, "_", &_101$$88); zephir_array_update_zval(&sqlColumns, &_102$$88, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3953); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3950); } } } @@ -8041,17 +8031,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_CPY_WRT(&ast, &_0); ZEPHIR_OBS_VAR(&update); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&update, &ast, SL("update"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4039); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4036); return; } ZEPHIR_OBS_VAR(&tables); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&tables, &update, SL("tables"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4043); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4040); return; } ZEPHIR_OBS_VAR(&values); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&values, &update, SL("values"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4047); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4044); return; } ZEPHIR_INIT_VAR(&models); @@ -8075,16 +8065,16 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_0); - zephir_is_iterable(&updateTables, 0, "phalcon/Mvc/Model/Query.zep", 4113); + zephir_is_iterable(&updateTables, 0, "phalcon/Mvc/Model/Query.zep", 4110); if (Z_TYPE_P(&updateTables) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&updateTables), _1) { ZEPHIR_INIT_NVAR(&table); ZVAL_COPY(&table, _1); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4071); + zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4068); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4072); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4069); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_3, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -8108,17 +8098,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_OBS_NVAR(&alias); if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) { zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4095); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4096); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4092); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4093); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE); } else { zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4102); + zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4099); zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4106); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4103); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -8133,9 +8123,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_CALL_METHOD(&table, &updateTables, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4071); + zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4068); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4072); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4069); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_6, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -8158,17 +8148,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_OBS_NVAR(&alias); if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) { zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4095); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4096); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4092); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4093); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE); } else { zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4102); + zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4099); zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4106); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4103); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &updateTables, "next", NULL, 0); zephir_check_call_status(); @@ -8191,13 +8181,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_CPY_WRT(&updateValues, &values); } notQuoting = 0; - zephir_is_iterable(&updateValues, 0, "phalcon/Mvc/Model/Query.zep", 4137); + zephir_is_iterable(&updateValues, 0, "phalcon/Mvc/Model/Query.zep", 4134); if (Z_TYPE_P(&updateValues) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&updateValues), _9) { ZEPHIR_INIT_NVAR(&updateValue); ZVAL_COPY(&updateValue, _9); - zephir_array_fetch_string(&_12$$20, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4129); + zephir_array_fetch_string(&_12$$20, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4126); if (notQuoting) { ZVAL_BOOL(&_13$$20, 1); } else { @@ -8205,13 +8195,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } ZEPHIR_CALL_METHOD(&_11$$20, this_ptr, "getexpression", &_14, 453, &_12$$20, &_13$$20); zephir_check_call_status(); - zephir_array_append(&sqlFields, &_11$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4129); + zephir_array_append(&sqlFields, &_11$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4126); ZEPHIR_OBS_NVAR(&exprColumn); - zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4130); + zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4127); ZEPHIR_INIT_NVAR(&_15$$20); zephir_create_array(&_15$$20, 2, 0); ZEPHIR_OBS_NVAR(&_16$$20); - zephir_array_fetch_string(&_16$$20, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4132); + zephir_array_fetch_string(&_16$$20, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4129); zephir_array_update_string(&_15$$20, SL("type"), &_16$$20, PH_COPY | PH_SEPARATE); if (notQuoting) { ZVAL_BOOL(&_18$$20, 1); @@ -8221,7 +8211,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_CALL_METHOD(&_17$$20, this_ptr, "getexpression", &_14, 453, &exprColumn, &_18$$20); zephir_check_call_status(); zephir_array_update_string(&_15$$20, SL("value"), &_17$$20, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlValues, &_15$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4134); + zephir_array_append(&sqlValues, &_15$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4131); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &updateValues, "rewind", NULL, 0); @@ -8234,7 +8224,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } ZEPHIR_CALL_METHOD(&updateValue, &updateValues, "current", NULL, 0); zephir_check_call_status(); - zephir_array_fetch_string(&_20$$21, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4129); + zephir_array_fetch_string(&_20$$21, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4126); if (notQuoting) { ZVAL_BOOL(&_21$$21, 1); } else { @@ -8242,13 +8232,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } ZEPHIR_CALL_METHOD(&_19$$21, this_ptr, "getexpression", &_14, 453, &_20$$21, &_21$$21); zephir_check_call_status(); - zephir_array_append(&sqlFields, &_19$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4129); + zephir_array_append(&sqlFields, &_19$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4126); ZEPHIR_OBS_NVAR(&exprColumn); - zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4130); + zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4127); ZEPHIR_INIT_NVAR(&_22$$21); zephir_create_array(&_22$$21, 2, 0); ZEPHIR_OBS_NVAR(&_23$$21); - zephir_array_fetch_string(&_23$$21, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4132); + zephir_array_fetch_string(&_23$$21, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4129); zephir_array_update_string(&_22$$21, SL("type"), &_23$$21, PH_COPY | PH_SEPARATE); if (notQuoting) { ZVAL_BOOL(&_25$$21, 1); @@ -8258,7 +8248,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_CALL_METHOD(&_24$$21, this_ptr, "getexpression", &_14, 453, &exprColumn, &_25$$21); zephir_check_call_status(); zephir_array_update_string(&_22$$21, SL("value"), &_24$$21, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlValues, &_22$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4134); + zephir_array_append(&sqlValues, &_22$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4131); ZEPHIR_CALL_METHOD(NULL, &updateValues, "next", NULL, 0); zephir_check_call_status(); } diff --git a/ext/phalcon/mvc/model/resultset/complex.zep.c b/ext/phalcon/mvc/model/resultset/complex.zep.c index ad6ca7baed6..b510d0f23d4 100644 --- a/ext/phalcon/mvc/model/resultset/complex.zep.c +++ b/ext/phalcon/mvc/model/resultset/complex.zep.c @@ -210,7 +210,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) dirtyState = 0; zephir_read_property(&_1, this_ptr, ZEND_STRL("columnTypes"), PH_NOISY_CC | PH_READONLY); - zephir_is_iterable(&_1, 0, "phalcon/Mvc/Model/Resultset/Complex.zep", 266); + zephir_is_iterable(&_1, 0, "phalcon/Mvc/Model/Resultset/Complex.zep", 259); if (Z_TYPE_P(&_1) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_1), _4, _5, _2) { @@ -279,22 +279,22 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) } if (ZEPHIR_GLOBAL(orm).late_state_binding) { ZEPHIR_OBS_NVAR(&_10$$16); - zephir_array_fetch_string(&_10$$16, &column, SL("instance"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 177); + zephir_array_fetch_string(&_10$$16, &column, SL("instance"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 175); if (zephir_instance_of_ev(&_10$$16, phalcon_mvc_model_ce)) { - zephir_array_fetch_string(&_11$$17, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 178); + zephir_array_fetch_string(&_11$$17, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 176); ZEPHIR_INIT_NVAR(&modelName); zephir_get_class(&modelName, &_11$$17, 0); } else { ZEPHIR_INIT_NVAR(&modelName); ZVAL_STRING(&modelName, "Phalcon\\Mvc\\Model"); } - zephir_array_fetch_string(&_12$$16, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 184); + zephir_array_fetch_string(&_12$$16, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 182); ZVAL_LONG(&_13$$16, dirtyState); _14$$16 = zephir_fetch_class(&modelName); ZEPHIR_CALL_CE_STATIC(&value, _14$$16, "cloneresultmap", NULL, 0, &_12$$16, &rowModel, &columnMap, &_13$$16, &keepSnapshots); zephir_check_call_status(); } else { - zephir_array_fetch_string(&_16$$19, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 198); + zephir_array_fetch_string(&_16$$19, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 194); ZVAL_LONG(&_17$$19, dirtyState); ZEPHIR_CALL_CE_STATIC(&value, phalcon_mvc_model_ce, "cloneresultmap", &_15, 0, &_16$$19, &rowModel, &columnMap, &_17$$19, &keepSnapshots); zephir_check_call_status(); @@ -307,12 +307,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) } while(0); ZEPHIR_OBS_NVAR(&attribute); - zephir_array_fetch_string(&attribute, &column, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 222); + zephir_array_fetch_string(&attribute, &column, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 218); } else { ZEPHIR_OBS_NVAR(&sqlAlias); if (zephir_array_isset_string_fetch(&sqlAlias, &column, SL("sqlAlias"), 0)) { ZEPHIR_OBS_NVAR(&value); - zephir_array_fetch(&value, &row, &sqlAlias, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 230); + zephir_array_fetch(&value, &row, &sqlAlias, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 224); } else { ZEPHIR_OBS_NVAR(&value); zephir_array_isset_fetch(&value, &row, &alias, 0); @@ -410,22 +410,22 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) } if (ZEPHIR_GLOBAL(orm).late_state_binding) { ZEPHIR_OBS_NVAR(&_25$$36); - zephir_array_fetch_string(&_25$$36, &column, SL("instance"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 177); + zephir_array_fetch_string(&_25$$36, &column, SL("instance"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 175); if (zephir_instance_of_ev(&_25$$36, phalcon_mvc_model_ce)) { - zephir_array_fetch_string(&_26$$37, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 178); + zephir_array_fetch_string(&_26$$37, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 176); ZEPHIR_INIT_NVAR(&modelName); zephir_get_class(&modelName, &_26$$37, 0); } else { ZEPHIR_INIT_NVAR(&modelName); ZVAL_STRING(&modelName, "Phalcon\\Mvc\\Model"); } - zephir_array_fetch_string(&_27$$36, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 184); + zephir_array_fetch_string(&_27$$36, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 182); ZVAL_LONG(&_28$$36, dirtyState); _29$$36 = zephir_fetch_class(&modelName); ZEPHIR_CALL_CE_STATIC(&value, _29$$36, "cloneresultmap", NULL, 0, &_27$$36, &rowModel, &columnMap, &_28$$36, &keepSnapshots); zephir_check_call_status(); } else { - zephir_array_fetch_string(&_30$$39, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 198); + zephir_array_fetch_string(&_30$$39, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 194); ZVAL_LONG(&_31$$39, dirtyState); ZEPHIR_CALL_CE_STATIC(&value, phalcon_mvc_model_ce, "cloneresultmap", &_15, 0, &_30$$39, &rowModel, &columnMap, &_31$$39, &keepSnapshots); zephir_check_call_status(); @@ -438,12 +438,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) } while(0); ZEPHIR_OBS_NVAR(&attribute); - zephir_array_fetch_string(&attribute, &column, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 222); + zephir_array_fetch_string(&attribute, &column, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 218); } else { ZEPHIR_OBS_NVAR(&sqlAlias); if (zephir_array_isset_string_fetch(&sqlAlias, &column, SL("sqlAlias"), 0)) { ZEPHIR_OBS_NVAR(&value); - zephir_array_fetch(&value, &row, &sqlAlias, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 230); + zephir_array_fetch(&value, &row, &sqlAlias, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 224); } else { ZEPHIR_OBS_NVAR(&value); zephir_array_isset_fetch(&value, &row, &alias, 0); @@ -513,7 +513,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, toArray) } ZEPHIR_CALL_METHOD(¤t, this_ptr, "current", &_2, 475); zephir_check_call_status(); - zephir_array_append(&records, ¤t, PH_SEPARATE, "phalcon/Mvc/Model/Resultset/Complex.zep", 286); + zephir_array_append(&records, ¤t, PH_SEPARATE, "phalcon/Mvc/Model/Resultset/Complex.zep", 279); ZEPHIR_CALL_METHOD(NULL, this_ptr, "next", &_3, 0); zephir_check_call_status(); } @@ -559,8 +559,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, serialize) ZEPHIR_CPY_WRT(&hydrateMode, &_0); ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_1, 0); zephir_check_call_status(); - if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Complex.zep", 315); + if (Z_TYPE_P(&container) == IS_NULL) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Complex.zep", 307); return; } ZEPHIR_INIT_VAR(&_3); @@ -643,7 +643,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, unserialize) ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_0, 0); zephir_check_call_status(); if (Z_TYPE_P(&container) == IS_NULL) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Complex.zep", 359); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Complex.zep", 351); return; } ZEPHIR_INIT_VAR(&_2); @@ -665,42 +665,81 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, unserialize) zephir_check_call_status(); } if (UNEXPECTED(Z_TYPE_P(&resultset) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid serialization data", "phalcon/Mvc/Model/Resultset/Complex.zep", 372); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid serialization data", "phalcon/Mvc/Model/Resultset/Complex.zep", 364); return; } - zephir_array_fetch_string(&_5, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 375); + zephir_array_fetch_string(&_5, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 367); zephir_update_property_zval(this_ptr, ZEND_STRL("rows"), &_5); - zephir_array_fetch_string(&_6, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 376); + zephir_array_fetch_string(&_6, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 368); ZEPHIR_INIT_ZVAL_NREF(_7); ZVAL_LONG(&_7, zephir_fast_count_int(&_6)); zephir_update_property_zval(this_ptr, ZEND_STRL("count"), &_7); - zephir_array_fetch_string(&_8, &resultset, SL("cache"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 377); + zephir_array_fetch_string(&_8, &resultset, SL("cache"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 369); zephir_update_property_zval(this_ptr, ZEND_STRL("cache"), &_8); - zephir_array_fetch_string(&_9, &resultset, SL("columnTypes"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 378); + zephir_array_fetch_string(&_9, &resultset, SL("columnTypes"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 370); zephir_update_property_zval(this_ptr, ZEND_STRL("columnTypes"), &_9); - zephir_array_fetch_string(&_10, &resultset, SL("hydrateMode"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 379); + zephir_array_fetch_string(&_10, &resultset, SL("hydrateMode"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 371); zephir_update_property_zval(this_ptr, ZEND_STRL("hydrateMode"), &_10); ZEPHIR_MM_RESTORE(); } PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, __serialize) { + zval records, cache, columnTypes, hydrateMode, _0; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); + ZVAL_UNDEF(&records); + ZVAL_UNDEF(&cache); + ZVAL_UNDEF(&columnTypes); + ZVAL_UNDEF(&hydrateMode); + ZVAL_UNDEF(&_0); + + ZEPHIR_MM_GROW(); - array_init(return_value); - return; + ZEPHIR_CALL_METHOD(&records, this_ptr, "toarray", NULL, 0); + zephir_check_call_status(); + zephir_read_property(&_0, this_ptr, ZEND_STRL("cache"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CPY_WRT(&cache, &_0); + zephir_read_property(&_0, this_ptr, ZEND_STRL("columnTypes"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CPY_WRT(&columnTypes, &_0); + zephir_read_property(&_0, this_ptr, ZEND_STRL("hydrateMode"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CPY_WRT(&hydrateMode, &_0); + zephir_create_array(return_value, 4, 0); + zephir_array_update_string(return_value, SL("cache"), &cache, PH_COPY | PH_SEPARATE); + zephir_array_update_string(return_value, SL("rows"), &records, PH_COPY | PH_SEPARATE); + zephir_array_update_string(return_value, SL("columnTypes"), &columnTypes, PH_COPY | PH_SEPARATE); + zephir_array_update_string(return_value, SL("hydrateMode"), &hydrateMode, PH_COPY | PH_SEPARATE); + RETURN_MM(); } PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, __unserialize) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *data_param = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zephir_fcall_cache_entry *_0 = NULL; + zval *data_param = NULL, __$true, __$false, resultset, container, serializer, _1, _2, _5, _6, _7, _8, _9, _10, _3$$4, _4$$4; zval data; zval *this_ptr = getThis(); ZVAL_UNDEF(&data); + ZVAL_BOOL(&__$true, 1); + ZVAL_BOOL(&__$false, 0); + ZVAL_UNDEF(&resultset); + ZVAL_UNDEF(&container); + ZVAL_UNDEF(&serializer); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_5); + ZVAL_UNDEF(&_6); + ZVAL_UNDEF(&_7); + ZVAL_UNDEF(&_8); + ZVAL_UNDEF(&_9); + ZVAL_UNDEF(&_10); + ZVAL_UNDEF(&_3$$4); + ZVAL_UNDEF(&_4$$4); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -714,5 +753,51 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, __unserialize) zephir_get_arrval(&data, data_param); + if (1) { + zephir_update_property_zval(this_ptr, ZEND_STRL("disableHydration"), &__$true); + } else { + zephir_update_property_zval(this_ptr, ZEND_STRL("disableHydration"), &__$false); + } + ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_0, 0); + zephir_check_call_status(); + if (Z_TYPE_P(&container) == IS_NULL) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Complex.zep", 408); + return; + } + ZEPHIR_INIT_VAR(&_2); + ZVAL_STRING(&_2, "serializer"); + ZEPHIR_CALL_METHOD(&_1, &container, "has", NULL, 0, &_2); + zephir_check_call_status(); + if (zephir_is_true(&_1)) { + ZEPHIR_INIT_VAR(&_4$$4); + ZVAL_STRING(&_4$$4, "serializer"); + ZEPHIR_CALL_METHOD(&_3$$4, &container, "getshared", NULL, 0, &_4$$4); + zephir_check_call_status(); + ZEPHIR_CPY_WRT(&serializer, &_3$$4); + ZEPHIR_CALL_METHOD(NULL, &serializer, "unserialize", NULL, 0, &data); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&resultset, &serializer, "getdata", NULL, 0); + zephir_check_call_status(); + } else { + ZEPHIR_CALL_FUNCTION(&resultset, "unserialize", NULL, 16, &data); + zephir_check_call_status(); + } + if (UNEXPECTED(Z_TYPE_P(&resultset) != IS_ARRAY)) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid serialization data", "phalcon/Mvc/Model/Resultset/Complex.zep", 421); + return; + } + zephir_array_fetch_string(&_5, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 424); + zephir_update_property_zval(this_ptr, ZEND_STRL("rows"), &_5); + zephir_array_fetch_string(&_6, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 425); + ZEPHIR_INIT_ZVAL_NREF(_7); + ZVAL_LONG(&_7, zephir_fast_count_int(&_6)); + zephir_update_property_zval(this_ptr, ZEND_STRL("count"), &_7); + zephir_array_fetch_string(&_8, &resultset, SL("cache"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 426); + zephir_update_property_zval(this_ptr, ZEND_STRL("cache"), &_8); + zephir_array_fetch_string(&_9, &resultset, SL("columnTypes"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 427); + zephir_update_property_zval(this_ptr, ZEND_STRL("columnTypes"), &_9); + zephir_array_fetch_string(&_10, &resultset, SL("hydrateMode"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 428); + zephir_update_property_zval(this_ptr, ZEND_STRL("hydrateMode"), &_10); + ZEPHIR_MM_RESTORE(); } diff --git a/ext/phalcon/mvc/model/resultset/simple.zep.c b/ext/phalcon/mvc/model/resultset/simple.zep.c index 542b6205cbe..c1c7ac50129 100644 --- a/ext/phalcon/mvc/model/resultset/simple.zep.c +++ b/ext/phalcon/mvc/model/resultset/simple.zep.c @@ -537,8 +537,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, serialize) ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_0, 0); zephir_check_call_status(); - if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Simple.zep", 261); + if (Z_TYPE_P(&container) == IS_NULL) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Simple.zep", 260); return; } ZEPHIR_INIT_VAR(&data); @@ -625,8 +625,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, unserialize) ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_0, 0); zephir_check_call_status(); - if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Simple.zep", 299); + if (Z_TYPE_P(&container) == IS_NULL) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Simple.zep", 297); return; } ZEPHIR_INIT_VAR(&_2); @@ -648,22 +648,22 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, unserialize) zephir_check_call_status(); } if (UNEXPECTED(Z_TYPE_P(&resultset) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid serialization data", "phalcon/Mvc/Model/Resultset/Simple.zep", 312); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid serialization data", "phalcon/Mvc/Model/Resultset/Simple.zep", 310); return; } - zephir_array_fetch_string(&_5, &resultset, SL("model"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 315); + zephir_array_fetch_string(&_5, &resultset, SL("model"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 313); zephir_update_property_zval(this_ptr, ZEND_STRL("model"), &_5); - zephir_array_fetch_string(&_6, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 316); + zephir_array_fetch_string(&_6, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 314); zephir_update_property_zval(this_ptr, ZEND_STRL("rows"), &_6); - zephir_array_fetch_string(&_7, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 317); + zephir_array_fetch_string(&_7, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 315); ZEPHIR_INIT_ZVAL_NREF(_8); ZVAL_LONG(&_8, zephir_fast_count_int(&_7)); zephir_update_property_zval(this_ptr, ZEND_STRL("count"), &_8); - zephir_array_fetch_string(&_9, &resultset, SL("cache"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 318); + zephir_array_fetch_string(&_9, &resultset, SL("cache"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 316); zephir_update_property_zval(this_ptr, ZEND_STRL("cache"), &_9); - zephir_array_fetch_string(&_10, &resultset, SL("columnMap"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 319); + zephir_array_fetch_string(&_10, &resultset, SL("columnMap"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 317); zephir_update_property_zval(this_ptr, ZEND_STRL("columnMap"), &_10); - zephir_array_fetch_string(&_11, &resultset, SL("hydrateMode"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 320); + zephir_array_fetch_string(&_11, &resultset, SL("hydrateMode"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 318); zephir_update_property_zval(this_ptr, ZEND_STRL("hydrateMode"), &_11); if (zephir_array_isset_string_fetch(&keepSnapshots, &resultset, SL("keepSnapshots"), 1)) { zephir_update_property_zval(this_ptr, ZEND_STRL("keepSnapshots"), &keepSnapshots); @@ -673,22 +673,57 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, unserialize) PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, __serialize) { + zval _0, _1, _2; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2); + + ZEPHIR_MM_GROW(); - array_init(return_value); - return; + zephir_create_array(return_value, 6, 0); + ZEPHIR_OBS_VAR(&_0); + zephir_read_property(&_0, this_ptr, ZEND_STRL("model"), PH_NOISY_CC); + zephir_array_update_string(return_value, SL("model"), &_0, PH_COPY | PH_SEPARATE); + ZEPHIR_OBS_NVAR(&_0); + zephir_read_property(&_0, this_ptr, ZEND_STRL("cache"), PH_NOISY_CC); + zephir_array_update_string(return_value, SL("cache"), &_0, PH_COPY | PH_SEPARATE); + ZVAL_BOOL(&_2, 0); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "toarray", NULL, 0, &_2); + zephir_check_call_status(); + zephir_array_update_string(return_value, SL("rows"), &_1, PH_COPY | PH_SEPARATE); + ZEPHIR_OBS_NVAR(&_0); + zephir_read_property(&_0, this_ptr, ZEND_STRL("columnMap"), PH_NOISY_CC); + zephir_array_update_string(return_value, SL("columnMap"), &_0, PH_COPY | PH_SEPARATE); + ZEPHIR_OBS_NVAR(&_0); + zephir_read_property(&_0, this_ptr, ZEND_STRL("hydrateMode"), PH_NOISY_CC); + zephir_array_update_string(return_value, SL("hydrateMode"), &_0, PH_COPY | PH_SEPARATE); + ZEPHIR_OBS_NVAR(&_0); + zephir_read_property(&_0, this_ptr, ZEND_STRL("keepSnapshots"), PH_NOISY_CC); + zephir_array_update_string(return_value, SL("keepSnapshots"), &_0, PH_COPY | PH_SEPARATE); + RETURN_MM(); } PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, __unserialize) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *data_param = NULL; + zval *data_param = NULL, keepSnapshots, _0, _1, _2, _3, _4, _5, _6; zval data; zval *this_ptr = getThis(); ZVAL_UNDEF(&data); + ZVAL_UNDEF(&keepSnapshots); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_4); + ZVAL_UNDEF(&_5); + ZVAL_UNDEF(&_6); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -702,5 +737,23 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, __unserialize) zephir_get_arrval(&data, data_param); + zephir_array_fetch_string(&_0, &data, SL("model"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 341); + zephir_update_property_zval(this_ptr, ZEND_STRL("model"), &_0); + zephir_array_fetch_string(&_1, &data, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 342); + zephir_update_property_zval(this_ptr, ZEND_STRL("rows"), &_1); + zephir_array_fetch_string(&_2, &data, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 343); + ZEPHIR_INIT_ZVAL_NREF(_3); + ZVAL_LONG(&_3, zephir_fast_count_int(&_2)); + zephir_update_property_zval(this_ptr, ZEND_STRL("count"), &_3); + zephir_array_fetch_string(&_4, &data, SL("cache"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 344); + zephir_update_property_zval(this_ptr, ZEND_STRL("cache"), &_4); + zephir_array_fetch_string(&_5, &data, SL("columnMap"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 345); + zephir_update_property_zval(this_ptr, ZEND_STRL("columnMap"), &_5); + zephir_array_fetch_string(&_6, &data, SL("hydrateMode"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 346); + zephir_update_property_zval(this_ptr, ZEND_STRL("hydrateMode"), &_6); + if (zephir_array_isset_string_fetch(&keepSnapshots, &data, SL("keepSnapshots"), 1)) { + zephir_update_property_zval(this_ptr, ZEND_STRL("keepSnapshots"), &keepSnapshots); + } + ZEPHIR_MM_RESTORE(); } diff --git a/ext/phalcon/storage/serializer/abstractserializer.zep.c b/ext/phalcon/storage/serializer/abstractserializer.zep.c index 9fa7c63a26f..816ddee272d 100644 --- a/ext/phalcon/storage/serializer/abstractserializer.zep.c +++ b/ext/phalcon/storage/serializer/abstractserializer.zep.c @@ -170,12 +170,22 @@ PHP_METHOD(Phalcon_Storage_Serializer_AbstractSerializer, isSerializable) PHP_METHOD(Phalcon_Storage_Serializer_AbstractSerializer, __serialize) { + zval _0; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zval *this_ptr = getThis(); + ZVAL_UNDEF(&_0); + + ZEPHIR_MM_GROW(); + ZEPHIR_OBS_VAR(&_0); + zephir_read_property(&_0, this_ptr, ZEND_STRL("data"), PH_NOISY_CC); + if (Z_TYPE_P(&_0) == IS_ARRAY) { + RETURN_MM_MEMBER(getThis(), "data"); + } array_init(return_value); - return; + RETURN_MM(); } PHP_METHOD(Phalcon_Storage_Serializer_AbstractSerializer, __unserialize) @@ -199,5 +209,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_AbstractSerializer, __unserialize) zephir_get_arrval(&data, data_param); + zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &data); + ZEPHIR_MM_RESTORE(); } From 6ad8dd5f23d02471fddedad1966b9b7fc69fb843 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Mon, 30 May 2022 23:04:29 +0100 Subject: [PATCH 91/91] #15598 - Regenerate build/ directory --- build/phalcon/phalcon.zep.c | 1176 +++++++++++++++++++++-------------- 1 file changed, 726 insertions(+), 450 deletions(-) diff --git a/build/phalcon/phalcon.zep.c b/build/phalcon/phalcon.zep.c index 5ee0a2c4aab..ef09f457a72 100644 --- a/build/phalcon/phalcon.zep.c +++ b/build/phalcon/phalcon.zep.c @@ -132699,22 +132699,79 @@ static PHP_METHOD(Phalcon_Mvc_Model, caseInsensitiveColumnMap) static PHP_METHOD(Phalcon_Mvc_Model, __serialize) { + zend_bool _2, _3; + zval attributes, manager, dirtyState, snapshot, _0, _1, _4, _5$$3; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); + ZVAL_UNDEF(&attributes); + ZVAL_UNDEF(&manager); + ZVAL_UNDEF(&dirtyState); + ZVAL_UNDEF(&snapshot); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_4); + ZVAL_UNDEF(&_5$$3); + + ZEPHIR_MM_GROW(); - array_init(return_value); - return; + ZEPHIR_INIT_VAR(&snapshot); + ZVAL_NULL(&snapshot); + ZEPHIR_CALL_METHOD(&attributes, this_ptr, "toarray", NULL, 0); + zephir_check_call_status(); + zephir_read_property(&_0, this_ptr, ZEND_STRL("dirtyState"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CPY_WRT(&dirtyState, &_0); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getmodelsmanager", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CPY_WRT(&manager, &_1); + ZEPHIR_CALL_METHOD(&_1, &manager, "iskeepingsnapshots", NULL, 0, this_ptr); + zephir_check_call_status(); + _2 = zephir_is_true(&_1); + if (_2) { + zephir_read_property(&_0, this_ptr, ZEND_STRL("snapshot"), PH_NOISY_CC | PH_READONLY); + _2 = Z_TYPE_P(&_0) != IS_NULL; + } + _3 = _2; + if (_3) { + zephir_read_property(&_4, this_ptr, ZEND_STRL("snapshot"), PH_NOISY_CC | PH_READONLY); + _3 = !ZEPHIR_IS_EQUAL(&attributes, &_4); + } + if (_3) { + zephir_read_property(&_5$$3, this_ptr, ZEND_STRL("snapshot"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CPY_WRT(&snapshot, &_5$$3); + } + zephir_create_array(return_value, 3, 0); + zephir_array_update_string(return_value, SL("attributes"), &attributes, PH_COPY | PH_SEPARATE); + zephir_array_update_string(return_value, SL("snapshot"), &snapshot, PH_COPY | PH_SEPARATE); + zephir_array_update_string(return_value, SL("dirtyState"), &dirtyState, PH_COPY | PH_SEPARATE); + RETURN_MM(); } static PHP_METHOD(Phalcon_Mvc_Model, __unserialize) { + zend_string *_7$$6; + zend_ulong _6$$6; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *data_param = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zephir_fcall_cache_entry *_1 = NULL; + zval *data_param = NULL, container, manager, key, value, snapshot, properties, dirtyState, _2, _3, _0$$3, *_4$$6, _5$$6; zval data; zval *this_ptr = getThis(); ZVAL_UNDEF(&data); + ZVAL_UNDEF(&container); + ZVAL_UNDEF(&manager); + ZVAL_UNDEF(&key); + ZVAL_UNDEF(&value); + ZVAL_UNDEF(&snapshot); + ZVAL_UNDEF(&properties); + ZVAL_UNDEF(&dirtyState); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_0$$3); + ZVAL_UNDEF(&_5$$6); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -132728,6 +132785,85 @@ static PHP_METHOD(Phalcon_Mvc_Model, __unserialize) zephir_get_arrval(&data, data_param); + if (!(zephir_array_isset_string(&data, SL("attributes")))) { + ZEPHIR_INIT_VAR(&_0$$3); + zephir_create_array(&_0$$3, 1, 0); + zephir_array_update_string(&_0$$3, SL("attributes"), &data, PH_COPY | PH_SEPARATE); + ZEPHIR_CPY_WRT(&data, &_0$$3); + } + ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_1, 0); + zephir_check_call_status(); + if (Z_TYPE_P(&container) == IS_NULL) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injection container is required to access the services related to the ODM", "phalcon/Mvc/Model.zep", 5857); + return; + } + zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container); + ZEPHIR_INIT_VAR(&_3); + ZVAL_STRING(&_3, "modelsManager"); + ZEPHIR_CALL_METHOD(&_2, &container, "getshared", NULL, 0, &_3); + zephir_check_call_status(); + ZEPHIR_CPY_WRT(&manager, &_2); + if (Z_TYPE_P(&manager) == IS_NULL) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/Mvc/Model.zep", 5872); + return; + } + zephir_update_property_zval(this_ptr, ZEND_STRL("modelsManager"), &manager); + ZEPHIR_CALL_METHOD(NULL, &manager, "initialize", NULL, 0, this_ptr); + zephir_check_call_status(); + ZEPHIR_OBS_VAR(&properties); + if (zephir_array_isset_string_fetch(&properties, &data, SL("attributes"), 0)) { + zephir_is_iterable(&properties, 0, "phalcon/Mvc/Model.zep", 5895); + if (Z_TYPE_P(&properties) == IS_ARRAY) { + ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&properties), _6$$6, _7$$6, _4$$6) + { + ZEPHIR_INIT_NVAR(&key); + if (_7$$6 != NULL) { + ZVAL_STR_COPY(&key, _7$$6); + } else { + ZVAL_LONG(&key, _6$$6); + } + ZEPHIR_INIT_NVAR(&value); + ZVAL_COPY(&value, _4$$6); + zephir_update_property_zval_zval(this_ptr, &key, &value); + } ZEND_HASH_FOREACH_END(); + } else { + ZEPHIR_CALL_METHOD(NULL, &properties, "rewind", NULL, 0); + zephir_check_call_status(); + while (1) { + ZEPHIR_CALL_METHOD(&_5$$6, &properties, "valid", NULL, 0); + zephir_check_call_status(); + if (!zend_is_true(&_5$$6)) { + break; + } + ZEPHIR_CALL_METHOD(&key, &properties, "key", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&value, &properties, "current", NULL, 0); + zephir_check_call_status(); + zephir_update_property_zval_zval(this_ptr, &key, &value); + ZEPHIR_CALL_METHOD(NULL, &properties, "next", NULL, 0); + zephir_check_call_status(); + } + } + ZEPHIR_INIT_NVAR(&value); + ZEPHIR_INIT_NVAR(&key); + } else { + ZEPHIR_INIT_NVAR(&properties); + array_init(&properties); + } + ZEPHIR_OBS_VAR(&dirtyState); + if (zephir_array_isset_string_fetch(&dirtyState, &data, SL("dirtyState"), 0)) { + zephir_update_property_zval(this_ptr, ZEND_STRL("dirtyState"), &dirtyState); + } + ZEPHIR_CALL_METHOD(&_2, &manager, "iskeepingsnapshots", NULL, 0, this_ptr); + zephir_check_call_status(); + if (zephir_is_true(&_2)) { + if (zephir_array_isset_string_fetch(&snapshot, &data, SL("snapshot"), 1)) { + zephir_update_property_zval(this_ptr, ZEND_STRL("snapshot"), &snapshot); + } else { + zephir_update_property_zval(this_ptr, ZEND_STRL("snapshot"), &properties); + } + } + ZEPHIR_MM_RESTORE(); } zend_object *zephir_init_properties_Phalcon_Mvc_Model(zend_class_entry *class_type) @@ -148180,11 +148316,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, clean) static PHP_METHOD(Phalcon_Mvc_Model_Query, execute) { - zval _7$$8; - zend_bool _4$$3; + zval _5$$8; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *bindParams_param = NULL, *bindTypes_param = NULL, uniqueRow, cacheOptions, key, cacheService, cache, result, preparedResult, defaultBindParams, mergedParams, defaultBindTypes, mergedTypes, type, lifetime, intermediate, _0, _1$$3, _2$$3, _3$$3, _5$$3, _6$$8, _8$$9, _9$$19, _10$$19; + zval *bindParams_param = NULL, *bindTypes_param = NULL, uniqueRow, cacheOptions, key, cacheService, cache, result, preparedResult, defaultBindParams, mergedParams, defaultBindTypes, mergedTypes, type, lifetime, intermediate, _0, _1$$3, _2$$3, _3$$3, _4$$8, _6$$9, _7$$19, _8$$19; zval bindParams, bindTypes; zval *this_ptr = getThis(); @@ -148208,12 +148343,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, execute) ZVAL_UNDEF(&_1$$3); ZVAL_UNDEF(&_2$$3); ZVAL_UNDEF(&_3$$3); - ZVAL_UNDEF(&_5$$3); - ZVAL_UNDEF(&_6$$8); - ZVAL_UNDEF(&_8$$9); - ZVAL_UNDEF(&_9$$19); - ZVAL_UNDEF(&_10$$19); - ZVAL_UNDEF(&_7$$8); + ZVAL_UNDEF(&_4$$8); + ZVAL_UNDEF(&_6$$9); + ZVAL_UNDEF(&_7$$19); + ZVAL_UNDEF(&_8$$19); + ZVAL_UNDEF(&_5$$8); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 2) @@ -148271,22 +148405,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, execute) ZVAL_STRING(&_2$$3, "Phalcon\\Cache\\CacheInterface"); ZEPHIR_CALL_FUNCTION(&_3$$3, "is_a", NULL, 83, &cache, &_2$$3); zephir_check_call_status(); - _4$$3 = !ZEPHIR_IS_TRUE_IDENTICAL(&_3$$3); - if (_4$$3) { - ZEPHIR_INIT_NVAR(&_2$$3); - ZVAL_STRING(&_2$$3, "Psr\\SimpleCache\\CacheInterface"); - ZEPHIR_CALL_FUNCTION(&_5$$3, "is_a", NULL, 83, &cache, &_2$$3); - zephir_check_call_status(); - _4$$3 = !ZEPHIR_IS_TRUE_IDENTICAL(&_5$$3); - } - if (UNEXPECTED(_4$$3)) { - ZEPHIR_INIT_VAR(&_6$$8); - object_init_ex(&_6$$8, phalcon_mvc_model_exception_ce); - ZEPHIR_INIT_VAR(&_7$$8); - ZEPHIR_CONCAT_SS(&_7$$8, "Cache service must be an object implementing ", "Phalcon\\Cache\\CacheInterface or Psr\\SimpleCache\\CacheInterface"); - ZEPHIR_CALL_METHOD(NULL, &_6$$8, "__construct", NULL, 29, &_7$$8); + if (UNEXPECTED(!ZEPHIR_IS_TRUE_IDENTICAL(&_3$$3))) { + ZEPHIR_INIT_VAR(&_4$$8); + object_init_ex(&_4$$8, phalcon_mvc_model_exception_ce); + ZEPHIR_INIT_VAR(&_5$$8); + ZEPHIR_CONCAT_SS(&_5$$8, "Cache service must be an object implementing ", "Phalcon\\Cache\\CacheInterface"); + ZEPHIR_CALL_METHOD(NULL, &_4$$8, "__construct", NULL, 29, &_5$$8); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$8, "phalcon/Mvc/Model/Query.zep", 306); + zephir_throw_exception_debug(&_4$$8, "phalcon/Mvc/Model/Query.zep", 303); ZEPHIR_MM_RESTORE(); return; } @@ -148294,11 +148420,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, execute) zephir_check_call_status(); if (!(ZEPHIR_IS_EMPTY(&result))) { if (UNEXPECTED(Z_TYPE_P(&result) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cache didn't return a valid resultset", "phalcon/Mvc/Model/Query.zep", 315); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cache didn't return a valid resultset", "phalcon/Mvc/Model/Query.zep", 312); return; } - ZVAL_BOOL(&_8$$9, 0); - ZEPHIR_CALL_METHOD(NULL, &result, "setisfresh", NULL, 0, &_8$$9); + ZVAL_BOOL(&_6$$9, 0); + ZEPHIR_CALL_METHOD(NULL, &result, "setisfresh", NULL, 0, &_6$$9); zephir_check_call_status(); if (zephir_is_true(&uniqueRow)) { ZEPHIR_CALL_METHOD(&preparedResult, &result, "getfirst", NULL, 0); @@ -148347,20 +148473,20 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, execute) zephir_check_call_status(); break; } - ZEPHIR_INIT_VAR(&_9$$19); - object_init_ex(&_9$$19, phalcon_mvc_model_exception_ce); - ZEPHIR_INIT_VAR(&_10$$19); - ZEPHIR_CONCAT_SV(&_10$$19, "Unknown statement ", &type); - ZEPHIR_CALL_METHOD(NULL, &_9$$19, "__construct", NULL, 29, &_10$$19); + ZEPHIR_INIT_VAR(&_7$$19); + object_init_ex(&_7$$19, phalcon_mvc_model_exception_ce); + ZEPHIR_INIT_VAR(&_8$$19); + ZEPHIR_CONCAT_SV(&_8$$19, "Unknown statement ", &type); + ZEPHIR_CALL_METHOD(NULL, &_7$$19, "__construct", NULL, 29, &_8$$19); zephir_check_call_status(); - zephir_throw_exception_debug(&_9$$19, "phalcon/Mvc/Model/Query.zep", 398); + zephir_throw_exception_debug(&_7$$19, "phalcon/Mvc/Model/Query.zep", 395); ZEPHIR_MM_RESTORE(); return; } while(0); if (Z_TYPE_P(&cacheOptions) != IS_NULL) { if (!ZEPHIR_IS_LONG(&type, 309)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only PHQL statements that return resultsets can be cached", "phalcon/Mvc/Model/Query.zep", 411); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only PHQL statements that return resultsets can be cached", "phalcon/Mvc/Model/Query.zep", 408); return; } ZEPHIR_CALL_METHOD(NULL, &cache, "set", NULL, 0, &key, &result, &lifetime); @@ -148507,7 +148633,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSql) zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "This type of statement generates multiple SQL statements", "phalcon/Mvc/Model/Query.zep", 517); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "This type of statement generates multiple SQL statements", "phalcon/Mvc/Model/Query.zep", 514); return; } @@ -148572,7 +148698,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, parse) zephir_read_static_property_ce(&_2$$5, phalcon_mvc_model_query_ce, SL("internalPhqlCache"), PH_NOISY_CC | PH_READONLY); if (zephir_array_isset_fetch(&irPhql, &_2$$5, &uniqueId, 0)) { if (Z_TYPE_P(&irPhql) == IS_ARRAY) { - zephir_array_fetch_string(&_3$$7, &ast, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 570); + zephir_array_fetch_string(&_3$$7, &ast, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 567); zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_3$$7); RETURN_CCTOR(&irPhql); } @@ -148609,7 +148735,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, parse) ZEPHIR_CONCAT_SVSV(&_5$$13, "Unknown statement ", &type, ", when preparing: ", &phql); ZEPHIR_CALL_METHOD(NULL, &_4$$13, "__construct", NULL, 29, &_5$$13); zephir_check_call_status(); - zephir_throw_exception_debug(&_4$$13, "phalcon/Mvc/Model/Query.zep", 604); + zephir_throw_exception_debug(&_4$$13, "phalcon/Mvc/Model/Query.zep", 601); ZEPHIR_MM_RESTORE(); return; } while(0); @@ -148617,7 +148743,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, parse) } } if (UNEXPECTED(Z_TYPE_P(&irPhql) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted AST", "phalcon/Mvc/Model/Query.zep", 610); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted AST", "phalcon/Mvc/Model/Query.zep", 607); return; } if (Z_TYPE_P(&uniqueId) == IS_LONG) { @@ -148743,7 +148869,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, setDI) ZEPHIR_CALL_METHOD(&manager, container, "getshared", NULL, 0, &_0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&manager) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsManager' is invalid", "phalcon/Mvc/Model/Query.zep", 674); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsManager' is invalid", "phalcon/Mvc/Model/Query.zep", 671); return; } ZEPHIR_INIT_NVAR(&_0); @@ -148751,7 +148877,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, setDI) ZEPHIR_CALL_METHOD(&metaData, container, "getshared", NULL, 0, &_0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&metaData) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsMetaData' is invalid", "phalcon/Mvc/Model/Query.zep", 680); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsMetaData' is invalid", "phalcon/Mvc/Model/Query.zep", 677); return; } zephir_update_property_zval(this_ptr, ZEND_STRL("manager"), &manager); @@ -148935,13 +149061,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeDelete) ZEPHIR_OBS_VAR(&models); - zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 748); + zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 745); if (UNEXPECTED(zephir_array_isset_long(&models, 1))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Delete from several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 753); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Delete from several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 750); return; } ZEPHIR_OBS_VAR(&modelName); - zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 756); + zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 753); ZEPHIR_OBS_VAR(&model); zephir_read_property(&_0, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset_fetch(&model, &_0, &modelName, 0))) { @@ -149069,7 +149195,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_OBS_VAR(&modelName); - zephir_array_fetch_string(&modelName, &intermediate, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 837); + zephir_array_fetch_string(&modelName, &intermediate, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 834); zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_0); ZEPHIR_OBS_VAR(&model); @@ -149098,16 +149224,16 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) } } ZEPHIR_OBS_VAR(&values); - zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 872); + zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 869); if (UNEXPECTED(zephir_fast_count_int(&fields) != zephir_fast_count_int(&values))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The column count does not match the values count", "phalcon/Mvc/Model/Query.zep", 881); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The column count does not match the values count", "phalcon/Mvc/Model/Query.zep", 878); return; } ZEPHIR_CALL_METHOD(&dialect, &connection, "getdialect", NULL, 0); zephir_check_call_status(); ZEPHIR_INIT_VAR(&insertValues); array_init(&insertValues); - zephir_is_iterable(&values, 0, "phalcon/Mvc/Model/Query.zep", 952); + zephir_is_iterable(&values, 0, "phalcon/Mvc/Model/Query.zep", 949); if (Z_TYPE_P(&values) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&values), _4, _5, _2) { @@ -149120,8 +149246,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_INIT_NVAR(&value); ZVAL_COPY(&value, _2); ZEPHIR_OBS_NVAR(&exprValue); - zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 891); - zephir_array_fetch_string(&_6$$8, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 893); + zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 888); + zephir_array_fetch_string(&_6$$8, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 890); do { if (ZEPHIR_IS_LONG(&_6$$8, 260) || ZEPHIR_IS_LONG(&_6$$8, 258) || ZEPHIR_IS_LONG(&_6$$8, 259)) { ZEPHIR_CALL_METHOD(&insertValue, &dialect, "getsqlexpression", &_7, 0, &exprValue); @@ -149150,7 +149276,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_CONCAT_SVS(&_13$$12, "Bound parameter '", &wildcard, "' cannot be replaced because it isn't in the placeholders list"); ZEPHIR_CALL_METHOD(NULL, &_12$$12, "__construct", &_14, 29, &_13$$12); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$12, "phalcon/Mvc/Model/Query.zep", 917); + zephir_throw_exception_debug(&_12$$12, "phalcon/Mvc/Model/Query.zep", 914); ZEPHIR_MM_RESTORE(); return; } @@ -149166,7 +149292,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) } while(0); ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 930); + zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 927); _18$$8 = automaticFields; if (_18$$8) { _18$$8 = Z_TYPE_P(&columnMap) == IS_ARRAY; @@ -149180,7 +149306,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_CONCAT_SVS(&_20$$15, "Column '", &fieldName, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_19$$15, "__construct", &_14, 29, &_20$$15); zephir_check_call_status(); - zephir_throw_exception_debug(&_19$$15, "phalcon/Mvc/Model/Query.zep", 940); + zephir_throw_exception_debug(&_19$$15, "phalcon/Mvc/Model/Query.zep", 937); ZEPHIR_MM_RESTORE(); return; } @@ -149203,8 +149329,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_CALL_METHOD(&value, &values, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&exprValue); - zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 891); - zephir_array_fetch_string(&_21$$17, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 893); + zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 888); + zephir_array_fetch_string(&_21$$17, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 890); do { if (ZEPHIR_IS_LONG(&_21$$17, 260) || ZEPHIR_IS_LONG(&_21$$17, 258) || ZEPHIR_IS_LONG(&_21$$17, 259)) { ZEPHIR_CALL_METHOD(&insertValue, &dialect, "getsqlexpression", &_22, 0, &exprValue); @@ -149233,7 +149359,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_CONCAT_SVS(&_28$$21, "Bound parameter '", &wildcard, "' cannot be replaced because it isn't in the placeholders list"); ZEPHIR_CALL_METHOD(NULL, &_27$$21, "__construct", &_14, 29, &_28$$21); zephir_check_call_status(); - zephir_throw_exception_debug(&_27$$21, "phalcon/Mvc/Model/Query.zep", 917); + zephir_throw_exception_debug(&_27$$21, "phalcon/Mvc/Model/Query.zep", 914); ZEPHIR_MM_RESTORE(); return; } @@ -149249,7 +149375,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) } while(0); ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 930); + zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 927); _31$$17 = automaticFields; if (_31$$17) { _31$$17 = Z_TYPE_P(&columnMap) == IS_ARRAY; @@ -149263,7 +149389,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_CONCAT_SVS(&_33$$24, "Column '", &fieldName, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_32$$24, "__construct", &_14, 29, &_33$$24); zephir_check_call_status(); - zephir_throw_exception_debug(&_32$$24, "phalcon/Mvc/Model/Query.zep", 940); + zephir_throw_exception_debug(&_32$$24, "phalcon/Mvc/Model/Query.zep", 937); ZEPHIR_MM_RESTORE(); return; } @@ -149436,8 +149562,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_VAR(&connectionTypes); array_init(&connectionTypes); ZEPHIR_OBS_VAR(&models); - zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 989); - zephir_is_iterable(&models, 0, "phalcon/Mvc/Model/Query.zep", 1017); + zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 986); + zephir_is_iterable(&models, 0, "phalcon/Mvc/Model/Query.zep", 1014); if (Z_TYPE_P(&models) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&models), _1) { @@ -149457,7 +149583,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_check_call_status(); zephir_array_update_zval(&connectionTypes, &_6$$5, &__$true, PH_COPY | PH_SEPARATE); if (UNEXPECTED(zephir_fast_count_int(&connectionTypes) == 2)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1012); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1009); return; } } @@ -149487,7 +149613,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_check_call_status(); zephir_array_update_zval(&connectionTypes, &_9$$9, &__$true, PH_COPY | PH_SEPARATE); if (UNEXPECTED(zephir_fast_count_int(&connectionTypes) == 2)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1012); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1009); return; } } @@ -149497,23 +149623,23 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) } ZEPHIR_INIT_NVAR(&modelName); ZEPHIR_OBS_VAR(&columns); - zephir_array_fetch_string(&columns, &intermediate, SL("columns"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1017); + zephir_array_fetch_string(&columns, &intermediate, SL("columns"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1014); haveObjects = 0; haveScalars = 0; isComplex = 0; numberObjects = 0; ZEPHIR_CPY_WRT(&columns1, &columns); - zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1045); + zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1042); if (Z_TYPE_P(&columns) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&columns), _10) { ZEPHIR_INIT_NVAR(&column); ZVAL_COPY(&column, _10); if (UNEXPECTED(Z_TYPE_P(&column) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1029); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1026); return; } - zephir_array_fetch_string(&_12$$11, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1032); + zephir_array_fetch_string(&_12$$11, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1029); if (ZEPHIR_IS_STRING(&_12$$11, "scalar")) { if (!(zephir_array_isset_string(&column, SL("balias")))) { isComplex = 1; @@ -149536,10 +149662,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_CALL_METHOD(&column, &columns, "current", NULL, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&column) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1029); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1026); return; } - zephir_array_fetch_string(&_13$$16, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1032); + zephir_array_fetch_string(&_13$$16, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1029); if (ZEPHIR_IS_STRING(&_13$$16, "scalar")) { if (!(zephir_array_isset_string(&column, SL("balias")))) { isComplex = 1; @@ -149577,7 +149703,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) array_init(&simpleColumnMap); zephir_read_property(&_0, this_ptr, ZEND_STRL("metaData"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&metaData, &_0); - zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1151); + zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1148); if (Z_TYPE_P(&columns) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&columns), _16, _17, _14) { @@ -149590,11 +149716,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&column); ZVAL_COPY(&column, _14); ZEPHIR_OBS_NVAR(&sqlColumn); - zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1068); - zephir_array_fetch_string(&_18$$28, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1071); + zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1065); + zephir_array_fetch_string(&_18$$28, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1068); if (ZEPHIR_IS_STRING(&_18$$28, "object")) { ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1072); + zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1069); ZEPHIR_OBS_NVAR(&instance); zephir_read_property(&_19$$29, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset_fetch(&instance, &_19$$29, &modelName, 0))) { @@ -149612,7 +149738,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&columnMap); ZVAL_NULL(&columnMap); } - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1108); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1105); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _23$$31) { @@ -149625,7 +149751,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&_26$$34); ZEPHIR_CONCAT_SVSV(&_26$$34, "_", &sqlColumn, "_", &attribute); zephir_array_fast_append(&_25$$34, &_26$$34); - zephir_array_append(&selectColumns, &_25$$34, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1101); + zephir_array_append(&selectColumns, &_25$$34, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1098); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0); @@ -149645,7 +149771,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&_28$$35); ZEPHIR_CONCAT_SVSV(&_28$$35, "_", &sqlColumn, "_", &attribute); zephir_array_fast_append(&_27$$35, &_28$$35); - zephir_array_append(&selectColumns, &_27$$35, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1101); + zephir_array_append(&selectColumns, &_27$$35, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1098); ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0); zephir_check_call_status(); } @@ -149663,7 +149789,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_array_update_multi(&columns1, &_31$$36, SL("zs"), 3, &aliasCopy, SL("keepSnapshots")); } } else { - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1125); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1122); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _32$$37) { @@ -149673,7 +149799,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_34$$38, 2, 0); zephir_array_fast_append(&_34$$38, &attribute); zephir_array_fast_append(&_34$$38, &sqlColumn); - zephir_array_append(&selectColumns, &_34$$38, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1123); + zephir_array_append(&selectColumns, &_34$$38, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1120); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0); @@ -149690,7 +149816,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_35$$39, 2, 0); zephir_array_fast_append(&_35$$39, &attribute); zephir_array_fast_append(&_35$$39, &sqlColumn); - zephir_array_append(&selectColumns, &_35$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1123); + zephir_array_append(&selectColumns, &_35$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1120); ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0); zephir_check_call_status(); } @@ -149713,7 +149839,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_array_fast_append(&_37$$42, &aliasCopy); ZEPHIR_CPY_WRT(&columnAlias, &_37$$42); } - zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1136); + zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1133); } _38$$28 = !isComplex; if (_38$$28) { @@ -149742,11 +149868,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_CALL_METHOD(&column, &columns, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&sqlColumn); - zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1068); - zephir_array_fetch_string(&_39$$46, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1071); + zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1065); + zephir_array_fetch_string(&_39$$46, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1068); if (ZEPHIR_IS_STRING(&_39$$46, "object")) { ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1072); + zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1069); ZEPHIR_OBS_NVAR(&instance); zephir_read_property(&_40$$47, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset_fetch(&instance, &_40$$47, &modelName, 0))) { @@ -149764,7 +149890,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&columnMap); ZVAL_NULL(&columnMap); } - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1108); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1105); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _44$$49) { @@ -149777,7 +149903,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&_47$$52); ZEPHIR_CONCAT_SVSV(&_47$$52, "_", &sqlColumn, "_", &attribute); zephir_array_fast_append(&_46$$52, &_47$$52); - zephir_array_append(&selectColumns, &_46$$52, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1101); + zephir_array_append(&selectColumns, &_46$$52, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1098); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0); @@ -149797,7 +149923,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&_49$$53); ZEPHIR_CONCAT_SVSV(&_49$$53, "_", &sqlColumn, "_", &attribute); zephir_array_fast_append(&_48$$53, &_49$$53); - zephir_array_append(&selectColumns, &_48$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1101); + zephir_array_append(&selectColumns, &_48$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1098); ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0); zephir_check_call_status(); } @@ -149815,7 +149941,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_array_update_multi(&columns1, &_52$$54, SL("zs"), 3, &aliasCopy, SL("keepSnapshots")); } } else { - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1125); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1122); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _53$$55) { @@ -149825,7 +149951,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_55$$56, 2, 0); zephir_array_fast_append(&_55$$56, &attribute); zephir_array_fast_append(&_55$$56, &sqlColumn); - zephir_array_append(&selectColumns, &_55$$56, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1123); + zephir_array_append(&selectColumns, &_55$$56, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1120); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0); @@ -149842,7 +149968,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_56$$57, 2, 0); zephir_array_fast_append(&_56$$57, &attribute); zephir_array_fast_append(&_56$$57, &sqlColumn); - zephir_array_append(&selectColumns, &_56$$57, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1123); + zephir_array_append(&selectColumns, &_56$$57, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1120); ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0); zephir_check_call_status(); } @@ -149864,7 +149990,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_array_fast_append(&_58$$60, &aliasCopy); ZEPHIR_CPY_WRT(&columnAlias, &_58$$60); } - zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1136); + zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1133); } _59$$46 = !isComplex; if (_59$$46) { @@ -149889,7 +150015,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_VAR(&bindCounts); array_init(&bindCounts); zephir_array_update_string(&intermediate, SL("columns"), &selectColumns, PH_COPY | PH_SEPARATE); - zephir_is_iterable(&bindParams, 0, "phalcon/Mvc/Model/Query.zep", 1172); + zephir_is_iterable(&bindParams, 0, "phalcon/Mvc/Model/Query.zep", 1169); if (Z_TYPE_P(&bindParams) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&bindParams), _62, _63, _60) { @@ -149947,7 +150073,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&wildcard); ZEPHIR_INIT_VAR(&processedTypes); array_init(&processedTypes); - zephir_is_iterable(&bindTypes, 0, "phalcon/Mvc/Model/Query.zep", 1185); + zephir_is_iterable(&bindTypes, 0, "phalcon/Mvc/Model/Query.zep", 1182); if (Z_TYPE_P(&bindTypes) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&bindTypes), _68, _69, _66) { @@ -150052,7 +150178,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) array_init(&simpleColumnMap); ZEPHIR_CALL_METHOD(&_74$$90, &metaData, "getattributes", NULL, 0, &resultObject); zephir_check_call_status(); - zephir_is_iterable(&_74$$90, 0, "phalcon/Mvc/Model/Query.zep", 1273); + zephir_is_iterable(&_74$$90, 0, "phalcon/Mvc/Model/Query.zep", 1270); if (Z_TYPE_P(&_74$$90) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_74$$90), _75$$90) { @@ -150062,7 +150188,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_77$$91, 2, 0); zephir_array_fast_append(&_77$$91, &attribute); ZEPHIR_OBS_NVAR(&_78$$91); - zephir_array_fetch(&_78$$91, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1271); + zephir_array_fetch(&_78$$91, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1268); zephir_array_fast_append(&_77$$91, &_78$$91); zephir_array_update_zval(&simpleColumnMap, &attribute, &_77$$91, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -150081,7 +150207,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_79$$92, 2, 0); zephir_array_fast_append(&_79$$92, &attribute); ZEPHIR_OBS_NVAR(&_80$$92); - zephir_array_fetch(&_80$$92, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1271); + zephir_array_fetch(&_80$$92, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1268); zephir_array_fast_append(&_79$$92, &_80$$92); zephir_array_update_zval(&simpleColumnMap, &attribute, &_79$$92, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &_74$$90, "next", NULL, 0); @@ -150091,7 +150217,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&attribute); } else { array_init(&simpleColumnMap); - zephir_is_iterable(&columnMap, 0, "phalcon/Mvc/Model/Query.zep", 1282); + zephir_is_iterable(&columnMap, 0, "phalcon/Mvc/Model/Query.zep", 1279); if (Z_TYPE_P(&columnMap) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&columnMap), _83$$93, _84$$93, _81$$93) { @@ -150107,7 +150233,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_85$$94, 2, 0); zephir_array_fast_append(&_85$$94, &attribute); ZEPHIR_OBS_NVAR(&_86$$94); - zephir_array_fetch(&_86$$94, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1280); + zephir_array_fetch(&_86$$94, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1277); zephir_array_fast_append(&_85$$94, &_86$$94); zephir_array_update_zval(&simpleColumnMap, &column, &_85$$94, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -150128,7 +150254,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_87$$95, 2, 0); zephir_array_fast_append(&_87$$95, &attribute); ZEPHIR_OBS_NVAR(&_88$$95); - zephir_array_fetch(&_88$$95, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1280); + zephir_array_fetch(&_88$$95, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1277); zephir_array_fast_append(&_87$$95, &_88$$95); zephir_array_update_zval(&simpleColumnMap, &column, &_87$$95, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &columnMap, "next", NULL, 0); @@ -150158,7 +150284,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_CONCAT_SVS(&_92$$98, "Resultset class \"", &resultsetClassName, "\" not found"); ZEPHIR_CALL_METHOD(NULL, &_91$$98, "__construct", NULL, 29, &_92$$98); zephir_check_call_status(); - zephir_throw_exception_debug(&_91$$98, "phalcon/Mvc/Model/Query.zep", 1298); + zephir_throw_exception_debug(&_91$$98, "phalcon/Mvc/Model/Query.zep", 1295); ZEPHIR_MM_RESTORE(); return; } @@ -150173,7 +150299,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_CONCAT_SVS(&_96$$99, "Resultset class \"", &resultsetClassName, "\" must be an implementation of Phalcon\\Mvc\\Model\\ResultsetInterface"); ZEPHIR_CALL_METHOD(NULL, &_95$$99, "__construct", NULL, 29, &_96$$99); zephir_check_call_status(); - zephir_throw_exception_debug(&_95$$99, "phalcon/Mvc/Model/Query.zep", 1304); + zephir_throw_exception_debug(&_95$$99, "phalcon/Mvc/Model/Query.zep", 1301); ZEPHIR_MM_RESTORE(); return; } @@ -150280,13 +150406,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_OBS_VAR(&models); - zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1352); + zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1349); if (UNEXPECTED(zephir_array_isset_long(&models, 1))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Updating several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 1357); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Updating several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 1354); return; } ZEPHIR_OBS_VAR(&modelName); - zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1360); + zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1357); ZEPHIR_OBS_VAR(&model); zephir_read_property(&_0, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset_fetch(&model, &_0, &modelName, 0))) { @@ -150299,14 +150425,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_CALL_METHOD(&dialect, &connection, "getdialect", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_VAR(&fields); - zephir_array_fetch_string(&fields, &intermediate, SL("fields"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1379); + zephir_array_fetch_string(&fields, &intermediate, SL("fields"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1376); ZEPHIR_OBS_VAR(&values); - zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1380); + zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1377); ZEPHIR_INIT_VAR(&updateValues); array_init(&updateValues); ZEPHIR_CPY_WRT(&selectBindParams, &bindParams); ZEPHIR_CPY_WRT(&selectBindTypes, &bindTypes); - zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 1452); + zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 1449); if (Z_TYPE_P(&fields) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _4, _5, _2) { @@ -150319,17 +150445,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_INIT_NVAR(&field); ZVAL_COPY(&field, _2); ZEPHIR_OBS_NVAR(&value); - zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1395); + zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1392); ZEPHIR_OBS_NVAR(&exprValue); - zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1396); + zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1393); if (zephir_array_isset_string(&field, SL("balias"))) { ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1399); + zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1396); } else { ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1401); + zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1398); } - zephir_array_fetch_string(&_6$$5, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1404); + zephir_array_fetch_string(&_6$$5, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1401); do { if (ZEPHIR_IS_LONG(&_6$$5, 260) || ZEPHIR_IS_LONG(&_6$$5, 258) || ZEPHIR_IS_LONG(&_6$$5, 259)) { ZEPHIR_CALL_METHOD(&updateValue, &dialect, "getsqlexpression", &_7, 0, &exprValue); @@ -150358,7 +150484,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_CONCAT_SVS(&_13$$11, "Bound parameter '", &wildcard, "' cannot be replaced because it's not in the placeholders list"); ZEPHIR_CALL_METHOD(NULL, &_12$$11, "__construct", &_14, 29, &_13$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 1427); + zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 1424); ZEPHIR_MM_RESTORE(); return; } @@ -150367,7 +150493,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) break; } if (ZEPHIR_IS_LONG(&_6$$5, 277)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1436); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1433); return; } ZEPHIR_INIT_NVAR(&updateValue); @@ -150395,17 +150521,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_CALL_METHOD(&field, &fields, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&value); - zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1395); + zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1392); ZEPHIR_OBS_NVAR(&exprValue); - zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1396); + zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1393); if (zephir_array_isset_string(&field, SL("balias"))) { ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1399); + zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1396); } else { ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1401); + zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1398); } - zephir_array_fetch_string(&_18$$14, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1404); + zephir_array_fetch_string(&_18$$14, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1401); do { if (ZEPHIR_IS_LONG(&_18$$14, 260) || ZEPHIR_IS_LONG(&_18$$14, 258) || ZEPHIR_IS_LONG(&_18$$14, 259)) { ZEPHIR_CALL_METHOD(&updateValue, &dialect, "getsqlexpression", &_19, 0, &exprValue); @@ -150434,7 +150560,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_CONCAT_SVS(&_25$$20, "Bound parameter '", &wildcard, "' cannot be replaced because it's not in the placeholders list"); ZEPHIR_CALL_METHOD(NULL, &_24$$20, "__construct", &_14, 29, &_25$$20); zephir_check_call_status(); - zephir_throw_exception_debug(&_24$$20, "phalcon/Mvc/Model/Query.zep", 1427); + zephir_throw_exception_debug(&_24$$20, "phalcon/Mvc/Model/Query.zep", 1424); ZEPHIR_MM_RESTORE(); return; } @@ -150443,7 +150569,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) break; } if (ZEPHIR_IS_LONG(&_18$$14, 277)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1436); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1433); return; } ZEPHIR_INIT_NVAR(&updateValue); @@ -150533,7 +150659,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getCallArgument) ZEPHIR_OBS_COPY_OR_DUP(&argument, argument_param); - zephir_array_fetch_string(&_0, &argument, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1514); + zephir_array_fetch_string(&_0, &argument, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1511); if (ZEPHIR_IS_LONG(&_0, 352)) { zephir_create_array(return_value, 1, 0); add_assoc_stringl_ex(return_value, SL("type"), SL("all")); @@ -150589,8 +150715,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression) ZEPHIR_INIT_VAR(&whenClauses); array_init(&whenClauses); - zephir_array_fetch_string(&_0, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1532); - zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model/Query.zep", 1547); + zephir_array_fetch_string(&_0, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1529); + zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model/Query.zep", 1544); if (Z_TYPE_P(&_0) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _1) { @@ -150600,24 +150726,24 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression) ZEPHIR_INIT_NVAR(&_3$$4); zephir_create_array(&_3$$4, 3, 0); add_assoc_stringl_ex(&_3$$4, SL("type"), SL("when")); - zephir_array_fetch_string(&_5$$4, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1536); + zephir_array_fetch_string(&_5$$4, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1533); ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 453, &_5$$4); zephir_check_call_status(); zephir_array_update_string(&_3$$4, SL("expr"), &_4$$4, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_7$$4, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1537); + zephir_array_fetch_string(&_7$$4, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1534); ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 453, &_7$$4); zephir_check_call_status(); zephir_array_update_string(&_3$$4, SL("then"), &_4$$4, PH_COPY | PH_SEPARATE); - zephir_array_append(&whenClauses, &_3$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1538); + zephir_array_append(&whenClauses, &_3$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1535); } else { ZEPHIR_INIT_NVAR(&_8$$5); zephir_create_array(&_8$$5, 2, 0); add_assoc_stringl_ex(&_8$$5, SL("type"), SL("else")); - zephir_array_fetch_string(&_10$$5, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1542); + zephir_array_fetch_string(&_10$$5, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1539); ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "getexpression", &_6, 453, &_10$$5); zephir_check_call_status(); zephir_array_update_string(&_8$$5, SL("expr"), &_9$$5, PH_COPY | PH_SEPARATE); - zephir_array_append(&whenClauses, &_8$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1543); + zephir_array_append(&whenClauses, &_8$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1540); } } ZEND_HASH_FOREACH_END(); } else { @@ -150635,24 +150761,24 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression) ZEPHIR_INIT_NVAR(&_11$$7); zephir_create_array(&_11$$7, 3, 0); add_assoc_stringl_ex(&_11$$7, SL("type"), SL("when")); - zephir_array_fetch_string(&_13$$7, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1536); + zephir_array_fetch_string(&_13$$7, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1533); ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 453, &_13$$7); zephir_check_call_status(); zephir_array_update_string(&_11$$7, SL("expr"), &_12$$7, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_14$$7, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1537); + zephir_array_fetch_string(&_14$$7, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1534); ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 453, &_14$$7); zephir_check_call_status(); zephir_array_update_string(&_11$$7, SL("then"), &_12$$7, PH_COPY | PH_SEPARATE); - zephir_array_append(&whenClauses, &_11$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1538); + zephir_array_append(&whenClauses, &_11$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1535); } else { ZEPHIR_INIT_NVAR(&_15$$8); zephir_create_array(&_15$$8, 2, 0); add_assoc_stringl_ex(&_15$$8, SL("type"), SL("else")); - zephir_array_fetch_string(&_17$$8, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1542); + zephir_array_fetch_string(&_17$$8, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1539); ZEPHIR_CALL_METHOD(&_16$$8, this_ptr, "getexpression", &_6, 453, &_17$$8); zephir_check_call_status(); zephir_array_update_string(&_15$$8, SL("expr"), &_16$$8, PH_COPY | PH_SEPARATE); - zephir_array_append(&whenClauses, &_15$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1543); + zephir_array_append(&whenClauses, &_15$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1540); } ZEPHIR_CALL_METHOD(NULL, &_0, "next", NULL, 0); zephir_check_call_status(); @@ -150661,7 +150787,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression) ZEPHIR_INIT_NVAR(&whenExpr); zephir_create_array(return_value, 3, 0); add_assoc_stringl_ex(return_value, SL("type"), SL("case")); - zephir_array_fetch_string(&_19, &expr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1549); + zephir_array_fetch_string(&_19, &expr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1546); ZEPHIR_CALL_METHOD(&_18, this_ptr, "getexpression", &_6, 453, &_19); zephir_check_call_status(); zephir_array_update_string(return_value, SL("expr"), &_18, PH_COPY | PH_SEPARATE); @@ -151009,7 +151135,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) zephir_create_array(&_18$$25, 2, 0); add_assoc_stringl_ex(&_18$$25, SL("type"), SL("literal")); ZEPHIR_OBS_VAR(&_19$$25); - zephir_array_fetch_string(&_19$$25, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1765); + zephir_array_fetch_string(&_19$$25, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1762); zephir_array_update_string(&_18$$25, SL("value"), &_19$$25, PH_COPY | PH_SEPARATE); ZEPHIR_CPY_WRT(&exprReturn, &_18$$25); break; @@ -151032,9 +151158,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) } if (ZEPHIR_IS_LONG(&exprType, 260)) { ZEPHIR_OBS_VAR(&value); - zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1786); + zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1783); if (quoting) { - if (zephir_memnstr_str(&value, SL("'"), "phalcon/Mvc/Model/Query.zep", 1793)) { + if (zephir_memnstr_str(&value, SL("'"), "phalcon/Mvc/Model/Query.zep", 1790)) { ZEPHIR_INIT_VAR(&escapedValue); phalcon_orm_singlequotes(&escapedValue, &value); } else { @@ -151057,7 +151183,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) zephir_create_array(&_23$$33, 2, 0); add_assoc_stringl_ex(&_23$$33, SL("type"), SL("placeholder")); ZEPHIR_INIT_VAR(&_24$$33); - zephir_array_fetch_string(&_25$$33, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1814); + zephir_array_fetch_string(&_25$$33, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1811); ZEPHIR_INIT_VAR(&_26$$33); ZVAL_STRING(&_26$$33, "?"); ZEPHIR_INIT_VAR(&_27$$33); @@ -151071,7 +151197,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_INIT_VAR(&_28$$34); zephir_create_array(&_28$$34, 2, 0); add_assoc_stringl_ex(&_28$$34, SL("type"), SL("placeholder")); - zephir_array_fetch_string(&_29$$34, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1823); + zephir_array_fetch_string(&_29$$34, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1820); ZEPHIR_INIT_VAR(&_30$$34); ZEPHIR_CONCAT_SV(&_30$$34, ":", &_29$$34); zephir_array_update_string(&_28$$34, SL("value"), &_30$$34, PH_COPY | PH_SEPARATE); @@ -151080,14 +151206,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) } if (ZEPHIR_IS_LONG(&exprType, 277)) { ZEPHIR_OBS_NVAR(&value); - zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1828); - if (zephir_memnstr_str(&value, SL(":"), "phalcon/Mvc/Model/Query.zep", 1830)) { + zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1825); + if (zephir_memnstr_str(&value, SL(":"), "phalcon/Mvc/Model/Query.zep", 1827)) { ZEPHIR_INIT_VAR(&valueParts); zephir_fast_explode_str(&valueParts, SL(":"), &value, LONG_MAX); ZEPHIR_OBS_VAR(&name); - zephir_array_fetch_long(&name, &valueParts, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1832); + zephir_array_fetch_long(&name, &valueParts, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1829); ZEPHIR_OBS_VAR(&bindType); - zephir_array_fetch_long(&bindType, &valueParts, 1, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1833); + zephir_array_fetch_long(&bindType, &valueParts, 1, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1830); do { if (ZEPHIR_IS_STRING(&bindType, "str")) { ZEPHIR_INIT_VAR(&_31$$37); @@ -151177,7 +151303,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_CONCAT_SV(&_51$$44, "Bind value is required for array type placeholder: ", &name); ZEPHIR_CALL_METHOD(NULL, &_50$$44, "__construct", NULL, 29, &_51$$44); zephir_check_call_status(); - zephir_throw_exception_debug(&_50$$44, "phalcon/Mvc/Model/Query.zep", 1903); + zephir_throw_exception_debug(&_50$$44, "phalcon/Mvc/Model/Query.zep", 1900); ZEPHIR_MM_RESTORE(); return; } @@ -151188,7 +151314,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_CONCAT_SV(&_53$$45, "Bind type requires an array in placeholder: ", &name); ZEPHIR_CALL_METHOD(NULL, &_52$$45, "__construct", NULL, 29, &_53$$45); zephir_check_call_status(); - zephir_throw_exception_debug(&_52$$45, "phalcon/Mvc/Model/Query.zep", 1909); + zephir_throw_exception_debug(&_52$$45, "phalcon/Mvc/Model/Query.zep", 1906); ZEPHIR_MM_RESTORE(); return; } @@ -151199,7 +151325,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_CONCAT_SV(&_55$$46, "At least one value must be bound in placeholder: ", &name); ZEPHIR_CALL_METHOD(NULL, &_54$$46, "__construct", NULL, 29, &_55$$46); zephir_check_call_status(); - zephir_throw_exception_debug(&_54$$46, "phalcon/Mvc/Model/Query.zep", 1915); + zephir_throw_exception_debug(&_54$$46, "phalcon/Mvc/Model/Query.zep", 1912); ZEPHIR_MM_RESTORE(); return; } @@ -151220,7 +151346,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_CONCAT_SV(&_59$$47, "Unknown bind type: ", &bindType); ZEPHIR_CALL_METHOD(NULL, &_58$$47, "__construct", NULL, 29, &_59$$47); zephir_check_call_status(); - zephir_throw_exception_debug(&_58$$47, "phalcon/Mvc/Model/Query.zep", 1930); + zephir_throw_exception_debug(&_58$$47, "phalcon/Mvc/Model/Query.zep", 1927); ZEPHIR_MM_RESTORE(); return; } while(0); @@ -151402,7 +151528,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) zephir_create_array(&_79$$66, 2, 0); add_assoc_stringl_ex(&_79$$66, SL("type"), SL("literal")); ZEPHIR_OBS_VAR(&_80$$66); - zephir_array_fetch_string(&_80$$66, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2106); + zephir_array_fetch_string(&_80$$66, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2103); zephir_array_update_string(&_79$$66, SL("value"), &_80$$66, PH_COPY | PH_SEPARATE); ZEPHIR_CPY_WRT(&exprReturn, &_79$$66); break; @@ -151434,7 +151560,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_CONCAT_SV(&_85$$70, "Unknown expression type ", &exprType); ZEPHIR_CALL_METHOD(NULL, &_84$$70, "__construct", NULL, 29, &_85$$70); zephir_check_call_status(); - zephir_throw_exception_debug(&_84$$70, "phalcon/Mvc/Model/Query.zep", 2129); + zephir_throw_exception_debug(&_84$$70, "phalcon/Mvc/Model/Query.zep", 2126); ZEPHIR_MM_RESTORE(); return; } while(0); @@ -151449,7 +151575,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) if (zephir_array_isset_long(&expr, 0)) { ZEPHIR_INIT_VAR(&listItems); array_init(&listItems); - zephir_is_iterable(&expr, 0, "phalcon/Mvc/Model/Query.zep", 2152); + zephir_is_iterable(&expr, 0, "phalcon/Mvc/Model/Query.zep", 2149); if (Z_TYPE_P(&expr) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&expr), _86$$72) { @@ -151457,7 +151583,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZVAL_COPY(&exprListItem, _86$$72); ZEPHIR_CALL_METHOD(&_88$$73, this_ptr, "getexpression", NULL, 453, &exprListItem); zephir_check_call_status(); - zephir_array_append(&listItems, &_88$$73, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2149); + zephir_array_append(&listItems, &_88$$73, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2146); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &expr, "rewind", NULL, 0); @@ -151472,7 +151598,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_89$$74, this_ptr, "getexpression", NULL, 453, &exprListItem); zephir_check_call_status(); - zephir_array_append(&listItems, &_89$$74, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2149); + zephir_array_append(&listItems, &_89$$74, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2146); ZEPHIR_CALL_METHOD(NULL, &expr, "next", NULL, 0); zephir_check_call_status(); } @@ -151483,7 +151609,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) zephir_array_fast_append(return_value, &listItems); RETURN_MM(); } - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Unknown expression", "phalcon/Mvc/Model/Query.zep", 2158); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Unknown expression", "phalcon/Mvc/Model/Query.zep", 2155); return; } @@ -151532,7 +151658,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) if (zephir_array_isset_long(&arguments, 0)) { ZEPHIR_INIT_VAR(&functionArgs); array_init(&functionArgs); - zephir_is_iterable(&arguments, 0, "phalcon/Mvc/Model/Query.zep", 2184); + zephir_is_iterable(&arguments, 0, "phalcon/Mvc/Model/Query.zep", 2181); if (Z_TYPE_P(&arguments) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&arguments), _0$$6) { @@ -151540,7 +151666,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) ZVAL_COPY(&argument, _0$$6); ZEPHIR_CALL_METHOD(&_2$$7, this_ptr, "getcallargument", &_3, 457, &argument); zephir_check_call_status(); - zephir_array_append(&functionArgs, &_2$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2182); + zephir_array_append(&functionArgs, &_2$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2179); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &arguments, "rewind", NULL, 0); @@ -151555,7 +151681,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_4$$8, this_ptr, "getcallargument", &_3, 457, &argument); zephir_check_call_status(); - zephir_array_append(&functionArgs, &_4$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2182); + zephir_array_append(&functionArgs, &_4$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2179); ZEPHIR_CALL_METHOD(NULL, &arguments, "next", NULL, 0); zephir_check_call_status(); } @@ -151573,7 +151699,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) zephir_create_array(return_value, 4, 0); add_assoc_stringl_ex(return_value, SL("type"), SL("functionCall")); ZEPHIR_OBS_VAR(&_7$$10); - zephir_array_fetch_string(&_7$$10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2194); + zephir_array_fetch_string(&_7$$10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2191); zephir_array_update_string(return_value, SL("name"), &_7$$10, PH_COPY | PH_SEPARATE); zephir_array_update_string(return_value, SL("arguments"), &functionArgs, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_VAR(&_8$$10); @@ -151584,7 +151710,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) zephir_create_array(return_value, 3, 0); add_assoc_stringl_ex(return_value, SL("type"), SL("functionCall")); ZEPHIR_OBS_VAR(&_9$$11); - zephir_array_fetch_string(&_9$$11, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2201); + zephir_array_fetch_string(&_9$$11, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2198); zephir_array_update_string(return_value, SL("name"), &_9$$11, PH_COPY | PH_SEPARATE); zephir_array_update_string(return_value, SL("arguments"), &functionArgs, PH_COPY | PH_SEPARATE); RETURN_MM(); @@ -151593,7 +151719,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) zephir_create_array(return_value, 2, 0); add_assoc_stringl_ex(return_value, SL("type"), SL("functionCall")); ZEPHIR_OBS_VAR(&_10); - zephir_array_fetch_string(&_10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2210); + zephir_array_fetch_string(&_10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2207); zephir_array_update_string(return_value, SL("name"), &_10, PH_COPY | PH_SEPARATE); RETURN_MM(); } @@ -151631,7 +151757,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getGroupClause) if (zephir_array_isset_long(&group, 0)) { ZEPHIR_INIT_VAR(&groupParts); array_init(&groupParts); - zephir_is_iterable(&group, 0, "phalcon/Mvc/Model/Query.zep", 2230); + zephir_is_iterable(&group, 0, "phalcon/Mvc/Model/Query.zep", 2227); if (Z_TYPE_P(&group) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&group), _0$$3) { @@ -151639,7 +151765,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getGroupClause) ZVAL_COPY(&groupItem, _0$$3); ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "getexpression", &_3, 453, &groupItem); zephir_check_call_status(); - zephir_array_append(&groupParts, &_2$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2228); + zephir_array_append(&groupParts, &_2$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2225); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &group, "rewind", NULL, 0); @@ -151654,7 +151780,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getGroupClause) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_4$$5, this_ptr, "getexpression", &_3, 453, &groupItem); zephir_check_call_status(); - zephir_array_append(&groupParts, &_4$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2228); + zephir_array_append(&groupParts, &_4$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2225); ZEPHIR_CALL_METHOD(NULL, &group, "next", NULL, 0); zephir_check_call_status(); } @@ -151747,10 +151873,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoin) ZEPHIR_OBS_VAR(&qualified); if (zephir_array_isset_string_fetch(&qualified, &join, SL("qualified"), 0)) { - zephir_array_fetch_string(&_0$$3, &qualified, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2266); + zephir_array_fetch_string(&_0$$3, &qualified, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2263); if (ZEPHIR_IS_LONG(&_0$$3, 355)) { ZEPHIR_OBS_VAR(&modelName); - zephir_array_fetch_string(&modelName, &qualified, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2267); + zephir_array_fetch_string(&modelName, &qualified, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2264); ZEPHIR_CALL_METHOD(&model, manager, "load", NULL, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -151765,7 +151891,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoin) RETURN_MM(); } } - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2282); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2279); return; } @@ -151797,7 +151923,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoinType) ZEPHIR_OBS_VAR(&type); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&type, &join, SL("type"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2293); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2290); return; } do { @@ -151825,7 +151951,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoinType) ZEPHIR_CONCAT_SVSV(&_2, "Unknown join type ", &type, ", when preparing: ", &_1); ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 29, &_2); zephir_check_call_status(); - zephir_throw_exception_debug(&_0, "phalcon/Mvc/Model/Query.zep", 2315); + zephir_throw_exception_debug(&_0, "phalcon/Mvc/Model/Query.zep", 2312); ZEPHIR_MM_RESTORE(); return; } @@ -151995,7 +152121,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_0); ZEPHIR_OBS_VAR(&tables); - zephir_array_fetch_string(&tables, &select, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2351); + zephir_array_fetch_string(&tables, &select, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2348); if (!(zephir_array_isset_long(&tables, 0))) { ZEPHIR_INIT_VAR(&selectTables); zephir_create_array(&selectTables, 1, 0); @@ -152004,7 +152130,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CPY_WRT(&selectTables, &tables); } ZEPHIR_OBS_VAR(&joins); - zephir_array_fetch_string(&joins, &select, SL("joins"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2359); + zephir_array_fetch_string(&joins, &select, SL("joins"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2356); if (!(zephir_array_isset_long(&joins, 0))) { ZEPHIR_INIT_VAR(&selectJoins); zephir_create_array(&selectJoins, 1, 0); @@ -152012,7 +152138,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } else { ZEPHIR_CPY_WRT(&selectJoins, &joins); } - zephir_is_iterable(&selectJoins, 0, "phalcon/Mvc/Model/Query.zep", 2510); + zephir_is_iterable(&selectJoins, 0, "phalcon/Mvc/Model/Query.zep", 2507); if (Z_TYPE_P(&selectJoins) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectJoins), _1) { @@ -152021,13 +152147,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&joinData, this_ptr, "getjoin", &_3, 458, &manager, &joinItem); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&source); - zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2373); + zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2370); ZEPHIR_OBS_NVAR(&schema); - zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2374); + zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2371); ZEPHIR_OBS_NVAR(&model); - zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2375); + zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2372); ZEPHIR_OBS_NVAR(&realModelName); - zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2376); + zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2373); ZEPHIR_INIT_NVAR(&completeSource); zephir_create_array(&completeSource, 2, 0); zephir_array_fast_append(&completeSource, &source); @@ -152037,7 +152163,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_OBS_NVAR(&aliasExpr); if (zephir_array_isset_string_fetch(&aliasExpr, &joinItem, SL("alias"), 0)) { ZEPHIR_OBS_NVAR(&alias); - zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2388); + zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2385); if (UNEXPECTED(zephir_array_isset(&joinModels, &alias))) { ZEPHIR_INIT_NVAR(&_5$$9); object_init_ex(&_5$$9, phalcon_mvc_model_exception_ce); @@ -152046,11 +152172,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSV(&_7$$9, "Cannot use '", &alias, "' as join alias because it was already used, when preparing: ", &_6$$9); ZEPHIR_CALL_METHOD(NULL, &_5$$9, "__construct", &_8, 29, &_7$$9); zephir_check_call_status(); - zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model/Query.zep", 2396); + zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model/Query.zep", 2393); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2402); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2399); zephir_array_update_zval(&joinTypes, &alias, &joinType, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&joinModels, &alias, &realModelName, PH_COPY | PH_SEPARATE); @@ -152069,7 +152195,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSV(&_11$$11, "Cannot use '", &realModelName, "' as join alias because it was already used, when preparing: ", &_10$$11); ZEPHIR_CALL_METHOD(NULL, &_9$$11, "__construct", &_8, 29, &_11$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_9$$11, "phalcon/Mvc/Model/Query.zep", 2455); + zephir_throw_exception_debug(&_9$$11, "phalcon/Mvc/Model/Query.zep", 2452); ZEPHIR_MM_RESTORE(); return; } @@ -152099,13 +152225,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&joinData, this_ptr, "getjoin", &_3, 458, &manager, &joinItem); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&source); - zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2373); + zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2370); ZEPHIR_OBS_NVAR(&schema); - zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2374); + zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2371); ZEPHIR_OBS_NVAR(&model); - zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2375); + zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2372); ZEPHIR_OBS_NVAR(&realModelName); - zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2376); + zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2373); ZEPHIR_INIT_NVAR(&_12$$12); zephir_create_array(&_12$$12, 2, 0); zephir_array_fast_append(&_12$$12, &source); @@ -152116,7 +152242,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_OBS_NVAR(&aliasExpr); if (zephir_array_isset_string_fetch(&aliasExpr, &joinItem, SL("alias"), 0)) { ZEPHIR_OBS_NVAR(&alias); - zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2388); + zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2385); if (UNEXPECTED(zephir_array_isset(&joinModels, &alias))) { ZEPHIR_INIT_NVAR(&_13$$14); object_init_ex(&_13$$14, phalcon_mvc_model_exception_ce); @@ -152125,11 +152251,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSV(&_15$$14, "Cannot use '", &alias, "' as join alias because it was already used, when preparing: ", &_14$$14); ZEPHIR_CALL_METHOD(NULL, &_13$$14, "__construct", &_8, 29, &_15$$14); zephir_check_call_status(); - zephir_throw_exception_debug(&_13$$14, "phalcon/Mvc/Model/Query.zep", 2396); + zephir_throw_exception_debug(&_13$$14, "phalcon/Mvc/Model/Query.zep", 2393); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2402); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2399); zephir_array_update_zval(&joinTypes, &alias, &joinType, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&joinModels, &alias, &realModelName, PH_COPY | PH_SEPARATE); @@ -152148,7 +152274,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSV(&_18$$16, "Cannot use '", &realModelName, "' as join alias because it was already used, when preparing: ", &_17$$16); ZEPHIR_CALL_METHOD(NULL, &_16$$16, "__construct", &_8, 29, &_18$$16); zephir_check_call_status(); - zephir_throw_exception_debug(&_16$$16, "phalcon/Mvc/Model/Query.zep", 2455); + zephir_throw_exception_debug(&_16$$16, "phalcon/Mvc/Model/Query.zep", 2452); ZEPHIR_MM_RESTORE(); return; } @@ -152174,7 +152300,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_update_property_zval(this_ptr, ZEND_STRL("sqlModelsAliases"), &sqlModelsAliases); zephir_update_property_zval(this_ptr, ZEND_STRL("sqlAliasesModelsInstances"), &sqlAliasesModelsInstances); zephir_update_property_zval(this_ptr, ZEND_STRL("modelsInstances"), &modelsInstances); - zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2530); + zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2527); if (Z_TYPE_P(&joinPrepared) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinPrepared), _21, _22, _19) { @@ -152221,7 +152347,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_read_property(&_0, this_ptr, ZEND_STRL("enableImplicitJoins"), PH_NOISY_CC | PH_READONLY); if (!(zephir_is_true(&_0))) { ZEPHIR_INIT_VAR(&_26$$21); - zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2542); + zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2539); if (Z_TYPE_P(&joinPrepared) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinPrepared), _29$$21, _30$$21, _27$$21) { @@ -152234,11 +152360,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&_26$$21); ZVAL_COPY(&_26$$21, _27$$21); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2532); + zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2529); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2533); + zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2530); ZEPHIR_OBS_NVAR(&preCondition); - zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2534); + zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2531); ZEPHIR_INIT_NVAR(&_31$$22); zephir_create_array(&_31$$22, 3, 0); zephir_array_update_string(&_31$$22, SL("type"), &joinType, PH_COPY | PH_SEPARATE); @@ -152247,7 +152373,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_32$$22, 1, 0); zephir_array_fast_append(&_32$$22, &preCondition); zephir_array_update_string(&_31$$22, SL("conditions"), &_32$$22, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_31$$22, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2539); + zephir_array_append(&sqlJoins, &_31$$22, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2536); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &joinPrepared, "rewind", NULL, 0); @@ -152263,11 +152389,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&_26$$21, &joinPrepared, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2532); + zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2529); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2533); + zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2530); ZEPHIR_OBS_NVAR(&preCondition); - zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2534); + zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2531); ZEPHIR_INIT_NVAR(&_33$$23); zephir_create_array(&_33$$23, 3, 0); zephir_array_update_string(&_33$$23, SL("type"), &joinType, PH_COPY | PH_SEPARATE); @@ -152276,7 +152402,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_34$$23, 1, 0); zephir_array_fast_append(&_34$$23, &preCondition); zephir_array_update_string(&_33$$23, SL("conditions"), &_34$$23, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_33$$23, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2539); + zephir_array_append(&sqlJoins, &_33$$23, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2536); ZEPHIR_CALL_METHOD(NULL, &joinPrepared, "next", NULL, 0); zephir_check_call_status(); } @@ -152287,15 +152413,15 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_INIT_NVAR(&fromModels); array_init(&fromModels); - zephir_is_iterable(&selectTables, 0, "phalcon/Mvc/Model/Query.zep", 2557); + zephir_is_iterable(&selectTables, 0, "phalcon/Mvc/Model/Query.zep", 2554); if (Z_TYPE_P(&selectTables) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectTables), _35) { ZEPHIR_INIT_NVAR(&tableItem); ZVAL_COPY(&tableItem, _35); - zephir_array_fetch_string(&_37$$24, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2551); + zephir_array_fetch_string(&_37$$24, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2548); ZEPHIR_OBS_NVAR(&_38$$24); - zephir_array_fetch_string(&_38$$24, &_37$$24, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2551); + zephir_array_fetch_string(&_38$$24, &_37$$24, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2548); zephir_array_update_zval(&fromModels, &_38$$24, &__$true, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -152309,9 +152435,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_CALL_METHOD(&tableItem, &selectTables, "current", NULL, 0); zephir_check_call_status(); - zephir_array_fetch_string(&_39$$25, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2551); + zephir_array_fetch_string(&_39$$25, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2548); ZEPHIR_OBS_NVAR(&_40$$25); - zephir_array_fetch_string(&_40$$25, &_39$$25, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2551); + zephir_array_fetch_string(&_40$$25, &_39$$25, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2548); zephir_array_update_zval(&fromModels, &_40$$25, &__$true, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &selectTables, "next", NULL, 0); zephir_check_call_status(); @@ -152319,7 +152445,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_INIT_NVAR(&tableItem); ZEPHIR_INIT_VAR(&_41); - zephir_is_iterable(&fromModels, 0, "phalcon/Mvc/Model/Query.zep", 2677); + zephir_is_iterable(&fromModels, 0, "phalcon/Mvc/Model/Query.zep", 2674); if (Z_TYPE_P(&fromModels) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fromModels), _44, _45, _42) { @@ -152331,7 +152457,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_INIT_NVAR(&_41); ZVAL_COPY(&_41, _42); - zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2675); + zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2672); if (Z_TYPE_P(&joinModels) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinModels), _48$$26, _49$$26, _46$$26) { @@ -152344,13 +152470,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&joinModel); ZVAL_COPY(&joinModel, _46$$26); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2562); + zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2559); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2567); + zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2564); ZEPHIR_OBS_NVAR(&preCondition); if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) { ZEPHIR_OBS_NVAR(&modelNameAlias); - zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2576); + zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2573); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_50, 0, &fromModelName, &modelNameAlias); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) { @@ -152365,17 +152491,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSVSV(&_54$$31, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_53$$31); ZEPHIR_CALL_METHOD(NULL, &_52$$31, "__construct", &_8, 29, &_54$$31); zephir_check_call_status(); - zephir_throw_exception_debug(&_52$$31, "phalcon/Mvc/Model/Query.zep", 2602); + zephir_throw_exception_debug(&_52$$31, "phalcon/Mvc/Model/Query.zep", 2599); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&relation); - zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2608); + zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2605); } } if (Z_TYPE_P(&relation) == IS_OBJECT) { ZEPHIR_OBS_NVAR(&modelAlias); - zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2619); + zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2616); ZEPHIR_CALL_METHOD(&_55$$32, &relation, "isthrough", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(&_55$$32))) { @@ -152386,13 +152512,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { - zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2649); + zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2646); if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _58$$35) { ZEPHIR_INIT_NVAR(&sqlJoinItem); ZVAL_COPY(&sqlJoinItem, _58$$35); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0); @@ -152405,14 +152531,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0); zephir_check_call_status(); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644); ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0); zephir_check_call_status(); } } ZEPHIR_INIT_NVAR(&sqlJoinItem); } else { - zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2650); + zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); } } else { ZEPHIR_INIT_NVAR(&_60$$39); @@ -152422,7 +152548,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&_61$$39); array_init(&_61$$39); zephir_array_update_string(&_60$$39, SL("conditions"), &_61$$39, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_60$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2661); + zephir_array_append(&sqlJoins, &_60$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2658); } } else { ZEPHIR_INIT_NVAR(&_62$$40); @@ -152433,7 +152559,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_63$$40, 1, 0); zephir_array_fast_append(&_63$$40, &preCondition); zephir_array_update_string(&_62$$40, SL("conditions"), &_63$$40, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_62$$40, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2672); + zephir_array_append(&sqlJoins, &_62$$40, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2669); } } ZEND_HASH_FOREACH_END(); } else { @@ -152450,13 +152576,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&joinModel, &joinModels, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2562); + zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2559); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2567); + zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2564); ZEPHIR_OBS_NVAR(&preCondition); if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) { ZEPHIR_OBS_NVAR(&modelNameAlias); - zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2576); + zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2573); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_64, 0, &fromModelName, &modelNameAlias); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) { @@ -152471,17 +152597,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSVSV(&_68$$45, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_67$$45); ZEPHIR_CALL_METHOD(NULL, &_66$$45, "__construct", &_8, 29, &_68$$45); zephir_check_call_status(); - zephir_throw_exception_debug(&_66$$45, "phalcon/Mvc/Model/Query.zep", 2602); + zephir_throw_exception_debug(&_66$$45, "phalcon/Mvc/Model/Query.zep", 2599); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&relation); - zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2608); + zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2605); } } if (Z_TYPE_P(&relation) == IS_OBJECT) { ZEPHIR_OBS_NVAR(&modelAlias); - zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2619); + zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2616); ZEPHIR_CALL_METHOD(&_69$$46, &relation, "isthrough", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(&_69$$46))) { @@ -152492,13 +152618,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { - zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2649); + zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2646); if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _70$$49) { ZEPHIR_INIT_NVAR(&sqlJoinItem); ZVAL_COPY(&sqlJoinItem, _70$$49); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0); @@ -152511,14 +152637,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0); zephir_check_call_status(); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644); ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0); zephir_check_call_status(); } } ZEPHIR_INIT_NVAR(&sqlJoinItem); } else { - zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2650); + zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); } } else { ZEPHIR_INIT_NVAR(&_72$$53); @@ -152528,7 +152654,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&_73$$53); array_init(&_73$$53); zephir_array_update_string(&_72$$53, SL("conditions"), &_73$$53, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_72$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2661); + zephir_array_append(&sqlJoins, &_72$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2658); } } else { ZEPHIR_INIT_NVAR(&_74$$54); @@ -152539,7 +152665,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_75$$54, 1, 0); zephir_array_fast_append(&_75$$54, &preCondition); zephir_array_update_string(&_74$$54, SL("conditions"), &_75$$54, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_74$$54, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2672); + zephir_array_append(&sqlJoins, &_74$$54, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2669); } ZEPHIR_CALL_METHOD(NULL, &joinModels, "next", NULL, 0); zephir_check_call_status(); @@ -152561,7 +152687,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_41, &fromModels, "current", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2675); + zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2672); if (Z_TYPE_P(&joinModels) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinModels), _78$$55, _79$$55, _76$$55) { @@ -152574,13 +152700,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&joinModel); ZVAL_COPY(&joinModel, _76$$55); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2562); + zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2559); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2567); + zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2564); ZEPHIR_OBS_NVAR(&preCondition); if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) { ZEPHIR_OBS_NVAR(&modelNameAlias); - zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2576); + zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2573); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_80, 0, &fromModelName, &modelNameAlias); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) { @@ -152595,17 +152721,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSVSV(&_84$$60, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_83$$60); ZEPHIR_CALL_METHOD(NULL, &_82$$60, "__construct", &_8, 29, &_84$$60); zephir_check_call_status(); - zephir_throw_exception_debug(&_82$$60, "phalcon/Mvc/Model/Query.zep", 2602); + zephir_throw_exception_debug(&_82$$60, "phalcon/Mvc/Model/Query.zep", 2599); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&relation); - zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2608); + zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2605); } } if (Z_TYPE_P(&relation) == IS_OBJECT) { ZEPHIR_OBS_NVAR(&modelAlias); - zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2619); + zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2616); ZEPHIR_CALL_METHOD(&_85$$61, &relation, "isthrough", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(&_85$$61))) { @@ -152616,13 +152742,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { - zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2649); + zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2646); if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _86$$64) { ZEPHIR_INIT_NVAR(&sqlJoinItem); ZVAL_COPY(&sqlJoinItem, _86$$64); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0); @@ -152635,14 +152761,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0); zephir_check_call_status(); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644); ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0); zephir_check_call_status(); } } ZEPHIR_INIT_NVAR(&sqlJoinItem); } else { - zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2650); + zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); } } else { ZEPHIR_INIT_NVAR(&_88$$68); @@ -152652,7 +152778,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&_89$$68); array_init(&_89$$68); zephir_array_update_string(&_88$$68, SL("conditions"), &_89$$68, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_88$$68, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2661); + zephir_array_append(&sqlJoins, &_88$$68, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2658); } } else { ZEPHIR_INIT_NVAR(&_90$$69); @@ -152663,7 +152789,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_91$$69, 1, 0); zephir_array_fast_append(&_91$$69, &preCondition); zephir_array_update_string(&_90$$69, SL("conditions"), &_91$$69, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_90$$69, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2672); + zephir_array_append(&sqlJoins, &_90$$69, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2669); } } ZEND_HASH_FOREACH_END(); } else { @@ -152680,13 +152806,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&joinModel, &joinModels, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2562); + zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2559); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2567); + zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2564); ZEPHIR_OBS_NVAR(&preCondition); if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) { ZEPHIR_OBS_NVAR(&modelNameAlias); - zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2576); + zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2573); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_92, 0, &fromModelName, &modelNameAlias); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) { @@ -152701,17 +152827,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSVSV(&_96$$74, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_95$$74); ZEPHIR_CALL_METHOD(NULL, &_94$$74, "__construct", &_8, 29, &_96$$74); zephir_check_call_status(); - zephir_throw_exception_debug(&_94$$74, "phalcon/Mvc/Model/Query.zep", 2602); + zephir_throw_exception_debug(&_94$$74, "phalcon/Mvc/Model/Query.zep", 2599); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&relation); - zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2608); + zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2605); } } if (Z_TYPE_P(&relation) == IS_OBJECT) { ZEPHIR_OBS_NVAR(&modelAlias); - zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2619); + zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2616); ZEPHIR_CALL_METHOD(&_97$$75, &relation, "isthrough", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(&_97$$75))) { @@ -152722,13 +152848,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { - zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2649); + zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2646); if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _98$$78) { ZEPHIR_INIT_NVAR(&sqlJoinItem); ZVAL_COPY(&sqlJoinItem, _98$$78); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0); @@ -152741,14 +152867,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0); zephir_check_call_status(); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644); ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0); zephir_check_call_status(); } } ZEPHIR_INIT_NVAR(&sqlJoinItem); } else { - zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2650); + zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); } } else { ZEPHIR_INIT_NVAR(&_100$$82); @@ -152758,7 +152884,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&_101$$82); array_init(&_101$$82); zephir_array_update_string(&_100$$82, SL("conditions"), &_101$$82, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_100$$82, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2661); + zephir_array_append(&sqlJoins, &_100$$82, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2658); } } else { ZEPHIR_INIT_NVAR(&_102$$83); @@ -152769,7 +152895,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_103$$83, 1, 0); zephir_array_fast_append(&_103$$83, &preCondition); zephir_array_update_string(&_102$$83, SL("conditions"), &_103$$83, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_102$$83, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2672); + zephir_array_append(&sqlJoins, &_102$$83, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2669); } ZEPHIR_CALL_METHOD(NULL, &joinModels, "next", NULL, 0); zephir_check_call_status(); @@ -152894,7 +153020,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin) ZEPHIR_CALL_METHOD(&referencedModelName, relation, "getreferencedmodel", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&fields) == IS_ARRAY) { - zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 2794); + zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 2791); if (Z_TYPE_P(&fields) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _3$$3, _4$$3, _1$$3) { @@ -152914,12 +153040,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin) ZEPHIR_CONCAT_SVSVSV(&_7$$5, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_6$$5); ZEPHIR_CALL_METHOD(NULL, &_5$$5, "__construct", &_8, 29, &_7$$5); zephir_check_call_status(); - zephir_throw_exception_debug(&_5$$5, "phalcon/Mvc/Model/Query.zep", 2761); + zephir_throw_exception_debug(&_5$$5, "phalcon/Mvc/Model/Query.zep", 2758); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&intermediateField); - zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2767); + zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2764); ZEPHIR_INIT_NVAR(&sqlEqualsJoinCondition); zephir_create_array(&sqlEqualsJoinCondition, 4, 0); add_assoc_stringl_ex(&sqlEqualsJoinCondition, SL("type"), SL("binary-op")); @@ -152962,12 +153088,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin) ZEPHIR_CONCAT_SVSVSV(&_15$$7, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_14$$7); ZEPHIR_CALL_METHOD(NULL, &_13$$7, "__construct", &_8, 29, &_15$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_13$$7, "phalcon/Mvc/Model/Query.zep", 2761); + zephir_throw_exception_debug(&_13$$7, "phalcon/Mvc/Model/Query.zep", 2758); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&intermediateField); - zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2767); + zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2764); ZEPHIR_INIT_NVAR(&_16$$6); zephir_create_array(&_16$$6, 4, 0); add_assoc_stringl_ex(&_16$$6, SL("type"), SL("binary-op")); @@ -153114,13 +153240,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause) } ZEPHIR_INIT_VAR(&orderParts); array_init(&orderParts); - zephir_is_iterable(&orderColumns, 0, "phalcon/Mvc/Model/Query.zep", 2903); + zephir_is_iterable(&orderColumns, 0, "phalcon/Mvc/Model/Query.zep", 2900); if (Z_TYPE_P(&orderColumns) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&orderColumns), _0) { ZEPHIR_INIT_NVAR(&orderItem); ZVAL_COPY(&orderItem, _0); - zephir_array_fetch_string(&_2$$5, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2885); + zephir_array_fetch_string(&_2$$5, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2882); ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 453, &_2$$5); zephir_check_call_status(); if (zephir_array_isset_string_fetch(&orderSort, &orderItem, SL("sort"), 1)) { @@ -153146,7 +153272,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause) zephir_array_fast_append(&_7$$9, &orderPartExpr); ZEPHIR_CPY_WRT(&orderPartSort, &_7$$9); } - zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2900); + zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2897); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &orderColumns, "rewind", NULL, 0); @@ -153159,7 +153285,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause) } ZEPHIR_CALL_METHOD(&orderItem, &orderColumns, "current", NULL, 0); zephir_check_call_status(); - zephir_array_fetch_string(&_8$$10, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2885); + zephir_array_fetch_string(&_8$$10, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2882); ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 453, &_8$$10); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&orderSort); @@ -153187,7 +153313,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause) zephir_array_fast_append(&_13$$14, &orderPartExpr); ZEPHIR_CPY_WRT(&orderPartSort, &_13$$14); } - zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2900); + zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2897); ZEPHIR_CALL_METHOD(NULL, &orderColumns, "next", NULL, 0); zephir_check_call_status(); } @@ -153271,13 +153397,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_OBS_VAR(&columnName); - zephir_array_fetch_string(&columnName, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2917); + zephir_array_fetch_string(&columnName, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2914); zephir_read_property(&_0, this_ptr, ZEND_STRL("nestingLevel"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&nestingLevel, &_0); zephir_read_property(&_0, this_ptr, ZEND_STRL("sqlColumnAliases"), PH_NOISY_CC | PH_READONLY); if (zephir_array_isset(&_0, &nestingLevel)) { zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("sqlColumnAliases"), PH_NOISY_CC | PH_READONLY); - zephir_array_fetch(&_2$$3, &_1$$3, &nestingLevel, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2925); + zephir_array_fetch(&_2$$3, &_1$$3, &nestingLevel, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2922); ZEPHIR_CPY_WRT(&sqlColumnAliases, &_2$$3); } else { ZEPHIR_INIT_NVAR(&sqlColumnAliases); @@ -153287,7 +153413,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) if (_3) { _4 = !(zephir_array_isset_string(&expr, SL("domain"))); if (!(_4)) { - zephir_array_fetch_string(&_5, &expr, SL("domain"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2930); + zephir_array_fetch_string(&_5, &expr, SL("domain"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2927); _4 = ZEPHIR_IS_EMPTY(&_5); } _3 = _4; @@ -153313,7 +153439,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_10$$7, "Unknown model or alias '", &columnDomain, "' (11), when preparing: ", &_9$$7); ZEPHIR_CALL_METHOD(NULL, &_8$$7, "__construct", NULL, 29, &_10$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_8$$7, "phalcon/Mvc/Model/Query.zep", 2951); + zephir_throw_exception_debug(&_8$$7, "phalcon/Mvc/Model/Query.zep", 2948); ZEPHIR_MM_RESTORE(); return; } @@ -153329,7 +153455,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_14$$9, "There is no model related to model or alias '", &columnDomain, "', when executing: ", &_13$$9); ZEPHIR_CALL_METHOD(NULL, &_12$$9, "__construct", NULL, 29, &_14$$9); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$9, "phalcon/Mvc/Model/Query.zep", 2970); + zephir_throw_exception_debug(&_12$$9, "phalcon/Mvc/Model/Query.zep", 2967); ZEPHIR_MM_RESTORE(); return; } @@ -153349,7 +153475,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSVSV(&_17$$12, "Column '", &columnName, "' doesn't belong to the model or alias '", &columnDomain, "', when executing: ", &_16$$12); ZEPHIR_CALL_METHOD(NULL, &_15$$12, "__construct", NULL, 29, &_17$$12); zephir_check_call_status(); - zephir_throw_exception_debug(&_15$$12, "phalcon/Mvc/Model/Query.zep", 2982); + zephir_throw_exception_debug(&_15$$12, "phalcon/Mvc/Model/Query.zep", 2979); ZEPHIR_MM_RESTORE(); return; } @@ -153361,7 +153487,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_INIT_VAR(&hasModel); ZVAL_BOOL(&hasModel, 0); zephir_read_property(&_18$$14, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY); - zephir_is_iterable(&_18$$14, 0, "phalcon/Mvc/Model/Query.zep", 3016); + zephir_is_iterable(&_18$$14, 0, "phalcon/Mvc/Model/Query.zep", 3013); if (Z_TYPE_P(&_18$$14) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_18$$14), _19$$14) { @@ -153379,7 +153505,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_25$$17, "The column '", &columnName, "' is ambiguous, when preparing: ", &_24$$17); ZEPHIR_CALL_METHOD(NULL, &_23$$17, "__construct", NULL, 29, &_25$$17); zephir_check_call_status(); - zephir_throw_exception_debug(&_23$$17, "phalcon/Mvc/Model/Query.zep", 3005); + zephir_throw_exception_debug(&_23$$17, "phalcon/Mvc/Model/Query.zep", 3002); ZEPHIR_MM_RESTORE(); return; } @@ -153409,7 +153535,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_30$$20, "The column '", &columnName, "' is ambiguous, when preparing: ", &_29$$20); ZEPHIR_CALL_METHOD(NULL, &_28$$20, "__construct", NULL, 29, &_30$$20); zephir_check_call_status(); - zephir_throw_exception_debug(&_28$$20, "phalcon/Mvc/Model/Query.zep", 3005); + zephir_throw_exception_debug(&_28$$20, "phalcon/Mvc/Model/Query.zep", 3002); ZEPHIR_MM_RESTORE(); return; } @@ -153428,14 +153554,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_33$$21, "Column '", &columnName, "' doesn't belong to any of the selected models (1), when preparing: ", &_32$$21); ZEPHIR_CALL_METHOD(NULL, &_31$$21, "__construct", NULL, 29, &_33$$21); zephir_check_call_status(); - zephir_throw_exception_debug(&_31$$21, "phalcon/Mvc/Model/Query.zep", 3019); + zephir_throw_exception_debug(&_31$$21, "phalcon/Mvc/Model/Query.zep", 3016); ZEPHIR_MM_RESTORE(); return; } zephir_read_property(&_34$$14, this_ptr, ZEND_STRL("models"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&models, &_34$$14); if (UNEXPECTED(Z_TYPE_P(&models) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The models list was not loaded correctly", "phalcon/Mvc/Model/Query.zep", 3030); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The models list was not loaded correctly", "phalcon/Mvc/Model/Query.zep", 3027); return; } ZEPHIR_INIT_VAR(&className); @@ -153449,7 +153575,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_37$$23, "Can't obtain model's source from models list: '", &className, "', when preparing: ", &_36$$23); ZEPHIR_CALL_METHOD(NULL, &_35$$23, "__construct", NULL, 29, &_37$$23); zephir_check_call_status(); - zephir_throw_exception_debug(&_35$$23, "phalcon/Mvc/Model/Query.zep", 3041); + zephir_throw_exception_debug(&_35$$23, "phalcon/Mvc/Model/Query.zep", 3038); ZEPHIR_MM_RESTORE(); return; } @@ -153470,7 +153596,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_40$$27, "Column '", &columnName, "' doesn't belong to any of the selected models (3), when preparing: ", &_39$$27); ZEPHIR_CALL_METHOD(NULL, &_38$$27, "__construct", NULL, 29, &_40$$27); zephir_check_call_status(); - zephir_throw_exception_debug(&_38$$27, "phalcon/Mvc/Model/Query.zep", 3060); + zephir_throw_exception_debug(&_38$$27, "phalcon/Mvc/Model/Query.zep", 3057); ZEPHIR_MM_RESTORE(); return; } @@ -153552,7 +153678,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getReadConnection) ZEPHIR_CALL_METHOD(&connection, model, "selectreadconnection", NULL, 0, &intermediate, &bindParams, &bindTypes); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&connection) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectReadConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3104); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectReadConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3101); return; } RETURN_CCTOR(&connection); @@ -153619,10 +153745,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getRelatedRecords) zephir_array_fast_append(&_0, &_1); zephir_array_update_string(&selectIr, SL("columns"), &_0, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_VAR(&_4); - zephir_array_fetch_string(&_4, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3134); + zephir_array_fetch_string(&_4, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3131); zephir_array_update_string(&selectIr, SL("models"), &_4, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_4); - zephir_array_fetch_string(&_4, &intermediate, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3136); + zephir_array_fetch_string(&_4, &intermediate, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3133); zephir_array_update_string(&selectIr, SL("tables"), &_4, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_VAR(&whereConditions); if (zephir_array_isset_string_fetch(&whereConditions, &intermediate, SL("where"), 0)) { @@ -153707,7 +153833,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) ZEPHIR_OBS_VAR(&columnType); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&columnType, &column, SL("type"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3176); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3173); return; } ZEPHIR_INIT_VAR(&sqlColumns); @@ -153716,7 +153842,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) zephir_array_isset_string_fetch(&eager, &column, SL("eager"), 0); if (ZEPHIR_IS_LONG(&columnType, 352)) { zephir_read_property(&_0$$4, this_ptr, ZEND_STRL("models"), PH_NOISY_CC | PH_READONLY); - zephir_is_iterable(&_0$$4, 0, "phalcon/Mvc/Model/Query.zep", 3206); + zephir_is_iterable(&_0$$4, 0, "phalcon/Mvc/Model/Query.zep", 3203); if (Z_TYPE_P(&_0$$4) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_0$$4), _3$$4, _4$$4, _1$$4) { @@ -153738,10 +153864,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) zephir_array_update_string(&sqlColumn, SL("balias"), &_5$$5, PH_COPY | PH_SEPARATE); if (Z_TYPE_P(&eager) != IS_NULL) { zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_7$$6, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3200); + zephir_array_fetch_string(&_7$$6, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3197); zephir_array_update_string(&sqlColumn, SL("eagerType"), &_7$$6, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3203); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3200); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &_0$$4, "rewind", NULL, 0); @@ -153767,10 +153893,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) ZEPHIR_CPY_WRT(&sqlColumn, &_8$$7); if (Z_TYPE_P(&eager) != IS_NULL) { zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_10$$8, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3200); + zephir_array_fetch_string(&_10$$8, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3197); zephir_array_update_string(&sqlColumn, SL("eagerType"), &_10$$8, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3203); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3200); ZEPHIR_CALL_METHOD(NULL, &_0$$4, "next", NULL, 0); zephir_check_call_status(); } @@ -153780,14 +153906,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) RETURN_CTOR(&sqlColumns); } if (UNEXPECTED(!(zephir_array_isset_string(&column, SL("column"))))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3210); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3207); return; } if (ZEPHIR_IS_LONG(&columnType, 353)) { zephir_read_property(&_11$$10, this_ptr, ZEND_STRL("sqlAliases"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&sqlAliases, &_11$$10); ZEPHIR_OBS_VAR(&columnDomain); - zephir_array_fetch_string(&columnDomain, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3222); + zephir_array_fetch_string(&columnDomain, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3219); ZEPHIR_OBS_NVAR(&source); if (UNEXPECTED(!(zephir_array_isset_fetch(&source, &sqlAliases, &columnDomain, 0)))) { ZEPHIR_INIT_VAR(&_12$$11); @@ -153797,7 +153923,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) ZEPHIR_CONCAT_SVSV(&_14$$11, "Unknown model or alias '", &columnDomain, "' (2), when preparing: ", &_13$$11); ZEPHIR_CALL_METHOD(NULL, &_12$$11, "__construct", NULL, 29, &_14$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 3227); + zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 3224); ZEPHIR_MM_RESTORE(); return; } @@ -153807,7 +153933,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) zephir_read_property(&_11$$10, this_ptr, ZEND_STRL("sqlAliasesModels"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&sqlAliasesModels, &_11$$10); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch(&modelName, &sqlAliasesModels, &columnDomain, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3241); + zephir_array_fetch(&modelName, &sqlAliasesModels, &columnDomain, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3238); if (Z_TYPE_P(&preparedAlias) != IS_STRING) { if (ZEPHIR_IS_EQUAL(&columnDomain, &modelName)) { ZEPHIR_CALL_FUNCTION(&preparedAlias, "lcfirst", &_6, 73, &modelName); @@ -153825,10 +153951,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) ZEPHIR_CPY_WRT(&sqlColumn, &_15$$10); if (Z_TYPE_P(&eager) != IS_NULL) { zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_16$$15, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3268); + zephir_array_fetch_string(&_16$$15, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3265); zephir_array_update_string(&sqlColumn, SL("eagerType"), &_16$$15, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3271); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3268); RETURN_CTOR(&sqlColumns); } if (ZEPHIR_IS_LONG(&columnType, 354)) { @@ -153837,7 +153963,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) add_assoc_stringl_ex(&_17$$16, SL("type"), SL("scalar")); ZEPHIR_CPY_WRT(&sqlColumn, &_17$$16); ZEPHIR_OBS_VAR(&columnData); - zephir_array_fetch_string(&columnData, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3285); + zephir_array_fetch_string(&columnData, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3282); ZEPHIR_CALL_METHOD(&sqlExprColumn, this_ptr, "getexpression", NULL, 453, &columnData); zephir_check_call_status(); ZEPHIR_OBS_VAR(&balias); @@ -153847,11 +153973,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) } if (Z_TYPE_P(&eager) != IS_NULL) { zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_18$$18, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3298); + zephir_array_fetch_string(&_18$$18, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3295); zephir_array_update_string(&sqlColumn, SL("eagerType"), &_18$$18, PH_COPY | PH_SEPARATE); } zephir_array_update_string(&sqlColumn, SL("column"), &sqlExprColumn, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3302); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3299); RETURN_CTOR(&sqlColumns); } ZEPHIR_INIT_VAR(&_19); @@ -153860,7 +153986,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) ZEPHIR_CONCAT_SV(&_20, "Unknown type of column ", &columnType); ZEPHIR_CALL_METHOD(NULL, &_19, "__construct", NULL, 29, &_20); zephir_check_call_status(); - zephir_throw_exception_debug(&_19, "phalcon/Mvc/Model/Query.zep", 3307); + zephir_throw_exception_debug(&_19, "phalcon/Mvc/Model/Query.zep", 3304); ZEPHIR_MM_RESTORE(); return; } @@ -153970,7 +154096,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) } else { ZEPHIR_INIT_VAR(&sqlJoinPartialConditions); array_init(&sqlJoinPartialConditions); - zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3397); + zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3394); if (Z_TYPE_P(&fields) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _7$$4, _8$$4, _5$$4) { @@ -153991,7 +154117,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) ZEPHIR_CONCAT_SVSVSV(&_11$$6, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_10$$6); ZEPHIR_CALL_METHOD(NULL, &_9$$6, "__construct", &_12, 29, &_11$$6); zephir_check_call_status(); - zephir_throw_exception_debug(&_9$$6, "phalcon/Mvc/Model/Query.zep", 3369); + zephir_throw_exception_debug(&_9$$6, "phalcon/Mvc/Model/Query.zep", 3366); ZEPHIR_MM_RESTORE(); return; } @@ -154015,7 +154141,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) ZEPHIR_CALL_METHOD(&_14$$5, this_ptr, "getqualified", NULL, 454, &_16$$5); zephir_check_call_status(); zephir_array_update_string(&_13$$5, SL("right"), &_14$$5, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoinPartialConditions, &_13$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3394); + zephir_array_append(&sqlJoinPartialConditions, &_13$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3391); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &fields, "rewind", NULL, 0); @@ -154039,7 +154165,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) ZEPHIR_CONCAT_SVSVSV(&_19$$8, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_18$$8); ZEPHIR_CALL_METHOD(NULL, &_17$$8, "__construct", &_12, 29, &_19$$8); zephir_check_call_status(); - zephir_throw_exception_debug(&_17$$8, "phalcon/Mvc/Model/Query.zep", 3369); + zephir_throw_exception_debug(&_17$$8, "phalcon/Mvc/Model/Query.zep", 3366); ZEPHIR_MM_RESTORE(); return; } @@ -154063,7 +154189,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) ZEPHIR_CALL_METHOD(&_21$$7, this_ptr, "getqualified", NULL, 454, &_23$$7); zephir_check_call_status(); zephir_array_update_string(&_20$$7, SL("right"), &_21$$7, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoinPartialConditions, &_20$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3394); + zephir_array_append(&sqlJoinPartialConditions, &_20$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3391); ZEPHIR_CALL_METHOD(NULL, &fields, "next", NULL, 0); zephir_check_call_status(); } @@ -154108,7 +154234,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getTable) ZEPHIR_OBS_VAR(&modelName); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&modelName, &qualifiedName, SL("name"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3419); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3416); return; } ZEPHIR_CALL_METHOD(&model, manager, "load", NULL, 0, &modelName); @@ -154192,7 +154318,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getWriteConnection) ZEPHIR_CALL_METHOD(&connection, model, "selectwriteconnection", NULL, 0, &intermediate, &bindParams, &bindTypes); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&connection) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectWriteConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3457); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectWriteConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3454); return; } RETURN_CCTOR(&connection); @@ -154250,12 +154376,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) ZEPHIR_CPY_WRT(&ast, &_0); ZEPHIR_OBS_VAR(&delete); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&delete, &ast, SL("delete"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3479); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3476); return; } ZEPHIR_OBS_VAR(&tables); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&tables, &delete, SL("tables"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3483); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3480); return; } ZEPHIR_INIT_VAR(&models); @@ -154279,16 +154405,16 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) } zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_0); - zephir_is_iterable(&deleteTables, 0, "phalcon/Mvc/Model/Query.zep", 3543); + zephir_is_iterable(&deleteTables, 0, "phalcon/Mvc/Model/Query.zep", 3540); if (Z_TYPE_P(&deleteTables) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&deleteTables), _1) { ZEPHIR_INIT_NVAR(&table); ZVAL_COPY(&table, _1); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3507); + zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3504); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3508); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3505); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_3, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -154312,17 +154438,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) ZEPHIR_OBS_NVAR(&alias); if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) { zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3525); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3526); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3522); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3523); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE); } else { zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3532); + zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3529); zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3536); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3533); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -154337,9 +154463,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) ZEPHIR_CALL_METHOD(&table, &deleteTables, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3507); + zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3504); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3508); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3505); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_6, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -154362,17 +154488,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) ZEPHIR_OBS_NVAR(&alias); if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) { zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3525); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3526); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3522); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3523); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE); } else { zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3532); + zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3529); zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3536); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3533); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &deleteTables, "next", NULL, 0); zephir_check_call_status(); @@ -154456,23 +154582,23 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) zephir_read_property(&_0, this_ptr, ZEND_STRL("ast"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&ast, &_0); if (UNEXPECTED(!(zephir_array_isset_string(&ast, SL("qualifiedName"))))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3577); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3574); return; } if (UNEXPECTED(!(zephir_array_isset_string(&ast, SL("values"))))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3581); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3578); return; } ZEPHIR_OBS_VAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &ast, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3584); + zephir_array_fetch_string(&qualifiedName, &ast, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3581); if (UNEXPECTED(!(zephir_array_isset_string(&qualifiedName, SL("name"))))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3588); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3585); return; } zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_0); ZEPHIR_OBS_VAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3592); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3589); ZEPHIR_CALL_METHOD(&model, &manager, "load", NULL, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -154489,8 +154615,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) notQuoting = 0; ZEPHIR_INIT_VAR(&exprValues); array_init(&exprValues); - zephir_array_fetch_string(&_2, &ast, SL("values"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3605); - zephir_is_iterable(&_2, 0, "phalcon/Mvc/Model/Query.zep", 3613); + zephir_array_fetch_string(&_2, &ast, SL("values"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3602); + zephir_is_iterable(&_2, 0, "phalcon/Mvc/Model/Query.zep", 3610); if (Z_TYPE_P(&_2) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_2), _3) { @@ -154499,7 +154625,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_INIT_NVAR(&_5$$7); zephir_create_array(&_5$$7, 2, 0); ZEPHIR_OBS_NVAR(&_6$$7); - zephir_array_fetch_string(&_6$$7, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3608); + zephir_array_fetch_string(&_6$$7, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3605); zephir_array_update_string(&_5$$7, SL("type"), &_6$$7, PH_COPY | PH_SEPARATE); if (notQuoting) { ZVAL_BOOL(&_8$$7, 1); @@ -154509,7 +154635,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_CALL_METHOD(&_7$$7, this_ptr, "getexpression", &_9, 453, &exprValue, &_8$$7); zephir_check_call_status(); zephir_array_update_string(&_5$$7, SL("value"), &_7$$7, PH_COPY | PH_SEPARATE); - zephir_array_append(&exprValues, &_5$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3610); + zephir_array_append(&exprValues, &_5$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3607); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &_2, "rewind", NULL, 0); @@ -154525,7 +154651,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_INIT_NVAR(&_10$$8); zephir_create_array(&_10$$8, 2, 0); ZEPHIR_OBS_NVAR(&_11$$8); - zephir_array_fetch_string(&_11$$8, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3608); + zephir_array_fetch_string(&_11$$8, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3605); zephir_array_update_string(&_10$$8, SL("type"), &_11$$8, PH_COPY | PH_SEPARATE); if (notQuoting) { ZVAL_BOOL(&_13$$8, 1); @@ -154535,7 +154661,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_CALL_METHOD(&_12$$8, this_ptr, "getexpression", &_9, 453, &exprValue, &_13$$8); zephir_check_call_status(); zephir_array_update_string(&_10$$8, SL("value"), &_12$$8, PH_COPY | PH_SEPARATE); - zephir_array_append(&exprValues, &_10$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3610); + zephir_array_append(&exprValues, &_10$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3607); ZEPHIR_CALL_METHOD(NULL, &_2, "next", NULL, 0); zephir_check_call_status(); } @@ -154551,14 +154677,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) if (zephir_array_isset_string_fetch(&fields, &ast, SL("fields"), 0)) { ZEPHIR_INIT_VAR(&sqlFields); array_init(&sqlFields); - zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3637); + zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3634); if (Z_TYPE_P(&fields) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&fields), _14$$9) { ZEPHIR_INIT_NVAR(&field); ZVAL_COPY(&field, _14$$9); ZEPHIR_OBS_NVAR(&name); - zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3624); + zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3621); ZEPHIR_CALL_METHOD(&_16$$10, &metaData, "hasattribute", &_17, 0, &model, &name); zephir_check_call_status(); if (UNEXPECTED(!zephir_is_true(&_16$$10))) { @@ -154569,11 +154695,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_CONCAT_SVSVSV(&_20$$11, "The model '", &modelName, "' doesn't have the attribute '", &name, "', when preparing: ", &_19$$11); ZEPHIR_CALL_METHOD(NULL, &_18$$11, "__construct", &_21, 29, &_20$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_18$$11, "phalcon/Mvc/Model/Query.zep", 3630); + zephir_throw_exception_debug(&_18$$11, "phalcon/Mvc/Model/Query.zep", 3627); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3634); + zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3631); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &fields, "rewind", NULL, 0); @@ -154587,7 +154713,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_CALL_METHOD(&field, &fields, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); - zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3624); + zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3621); ZEPHIR_CALL_METHOD(&_22$$12, &metaData, "hasattribute", &_23, 0, &model, &name); zephir_check_call_status(); if (UNEXPECTED(!zephir_is_true(&_22$$12))) { @@ -154598,11 +154724,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_CONCAT_SVSVSV(&_26$$13, "The model '", &modelName, "' doesn't have the attribute '", &name, "', when preparing: ", &_25$$13); ZEPHIR_CALL_METHOD(NULL, &_24$$13, "__construct", &_21, 29, &_26$$13); zephir_check_call_status(); - zephir_throw_exception_debug(&_24$$13, "phalcon/Mvc/Model/Query.zep", 3630); + zephir_throw_exception_debug(&_24$$13, "phalcon/Mvc/Model/Query.zep", 3627); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3634); + zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3631); ZEPHIR_CALL_METHOD(NULL, &fields, "next", NULL, 0); zephir_check_call_status(); } @@ -154805,12 +154931,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) } ZEPHIR_OBS_VAR(&tables); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&tables, &select, SL("tables"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3673); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3670); return; } ZEPHIR_OBS_VAR(&columns); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&columns, &select, SL("columns"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3677); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3674); return; } RETURN_ON_FAILURE(zephir_property_incr(this_ptr, SL("nestingLevel"))); @@ -154851,26 +154977,26 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_read_property(&_1, this_ptr, ZEND_STRL("metaData"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&metaData, &_1); if (UNEXPECTED(Z_TYPE_P(&manager) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A models-manager is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3744); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A models-manager is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3741); return; } if (UNEXPECTED(Z_TYPE_P(&metaData) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A meta-data is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3750); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A meta-data is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3747); return; } number = 0; ZEPHIR_INIT_VAR(&automaticJoins); array_init(&automaticJoins); - zephir_is_iterable(&selectedModels, 0, "phalcon/Mvc/Model/Query.zep", 3880); + zephir_is_iterable(&selectedModels, 0, "phalcon/Mvc/Model/Query.zep", 3877); if (Z_TYPE_P(&selectedModels) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectedModels), _2) { ZEPHIR_INIT_NVAR(&selectedModel); ZVAL_COPY(&selectedModel, _2); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3758); + zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3755); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3759); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3756); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_4, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&schema, &model, "getschema", NULL, 0); @@ -154895,7 +155021,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSV(&_7$$17, "Alias '", &alias, "' is used more than once, when preparing: ", &_6$$17); ZEPHIR_CALL_METHOD(NULL, &_5$$17, "__construct", &_8, 29, &_7$$17); zephir_check_call_status(); - zephir_throw_exception_debug(&_5$$17, "phalcon/Mvc/Model/Query.zep", 3784); + zephir_throw_exception_debug(&_5$$17, "phalcon/Mvc/Model/Query.zep", 3781); ZEPHIR_MM_RESTORE(); return; } @@ -154904,7 +155030,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_zval(&sqlModelsAliases, &modelName, &alias, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); if (Z_TYPE_P(&completeSource) == IS_ARRAY) { - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3796); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3793); } else { ZEPHIR_INIT_NVAR(&_9$$19); zephir_create_array(&_9$$19, 3, 0); @@ -154931,7 +155057,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) } else { ZEPHIR_CPY_WRT(&withs, &with); } - zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3872); + zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3869); if (Z_TYPE_P(&withs) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&withs), _10$$21) { @@ -154943,7 +155069,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_13$$24, "AA", &_12$$24); ZEPHIR_CPY_WRT(&joinAlias, &_13$$24); ZEPHIR_OBS_NVAR(&relationModel); - zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3822); + zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3819); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_14, 0, &modelName, &relationModel); zephir_check_call_status(); if (Z_TYPE_P(&relation) == IS_OBJECT) { @@ -154966,7 +155092,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSVSV(&_19$$27, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_18$$27); ZEPHIR_CALL_METHOD(NULL, &_17$$27, "__construct", &_8, 29, &_19$$27); zephir_check_call_status(); - zephir_throw_exception_debug(&_17$$27, "phalcon/Mvc/Model/Query.zep", 3842); + zephir_throw_exception_debug(&_17$$27, "phalcon/Mvc/Model/Query.zep", 3839); ZEPHIR_MM_RESTORE(); return; } @@ -154986,7 +155112,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_string(&_21$$24, SL("eager"), &alias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_21$$24, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_21$$24, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE); - zephir_array_append(&selectColumns, &_21$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3856); + zephir_array_append(&selectColumns, &_21$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3853); ZEPHIR_INIT_NVAR(&_22$$24); zephir_create_array(&_22$$24, 3, 0); add_assoc_long_ex(&_22$$24, SL("type"), 360); @@ -155000,7 +155126,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) add_assoc_long_ex(&_23$$24, SL("type"), 355); zephir_array_update_string(&_23$$24, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_22$$24, SL("alias"), &_23$$24, PH_COPY | PH_SEPARATE); - zephir_array_append(&automaticJoins, &_22$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3868); + zephir_array_append(&automaticJoins, &_22$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3865); number++; } ZEND_HASH_FOREACH_END(); } else { @@ -155020,7 +155146,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_25$$28, "AA", &_24$$28); ZEPHIR_CPY_WRT(&joinAlias, &_25$$28); ZEPHIR_OBS_NVAR(&relationModel); - zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3822); + zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3819); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_26, 0, &modelName, &relationModel); zephir_check_call_status(); if (Z_TYPE_P(&relation) == IS_OBJECT) { @@ -155043,7 +155169,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSVSV(&_31$$31, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_30$$31); ZEPHIR_CALL_METHOD(NULL, &_29$$31, "__construct", &_8, 29, &_31$$31); zephir_check_call_status(); - zephir_throw_exception_debug(&_29$$31, "phalcon/Mvc/Model/Query.zep", 3842); + zephir_throw_exception_debug(&_29$$31, "phalcon/Mvc/Model/Query.zep", 3839); ZEPHIR_MM_RESTORE(); return; } @@ -155063,7 +155189,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_string(&_33$$28, SL("eager"), &alias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_33$$28, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_33$$28, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE); - zephir_array_append(&selectColumns, &_33$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3856); + zephir_array_append(&selectColumns, &_33$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3853); ZEPHIR_INIT_NVAR(&_34$$28); zephir_create_array(&_34$$28, 3, 0); add_assoc_long_ex(&_34$$28, SL("type"), 360); @@ -155077,7 +155203,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) add_assoc_long_ex(&_35$$28, SL("type"), 355); zephir_array_update_string(&_35$$28, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_34$$28, SL("alias"), &_35$$28, PH_COPY | PH_SEPARATE); - zephir_array_append(&automaticJoins, &_34$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3868); + zephir_array_append(&automaticJoins, &_34$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3865); number++; ZEPHIR_CALL_METHOD(NULL, &withs, "next", NULL, 0); zephir_check_call_status(); @@ -155085,8 +155211,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) } ZEPHIR_INIT_NVAR(&withItem); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3874); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3875); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3871); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3872); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -155101,9 +155227,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CALL_METHOD(&selectedModel, &selectedModels, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3758); + zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3755); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3759); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3756); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_36, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&schema, &model, "getschema", NULL, 0); @@ -155129,7 +155255,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSV(&_40$$36, "Alias '", &alias, "' is used more than once, when preparing: ", &_39$$36); ZEPHIR_CALL_METHOD(NULL, &_38$$36, "__construct", &_8, 29, &_40$$36); zephir_check_call_status(); - zephir_throw_exception_debug(&_38$$36, "phalcon/Mvc/Model/Query.zep", 3784); + zephir_throw_exception_debug(&_38$$36, "phalcon/Mvc/Model/Query.zep", 3781); ZEPHIR_MM_RESTORE(); return; } @@ -155138,7 +155264,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_zval(&sqlModelsAliases, &modelName, &alias, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); if (Z_TYPE_P(&completeSource) == IS_ARRAY) { - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3796); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3793); } else { ZEPHIR_INIT_NVAR(&_41$$38); zephir_create_array(&_41$$38, 3, 0); @@ -155166,7 +155292,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) } else { ZEPHIR_CPY_WRT(&withs, &with); } - zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3872); + zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3869); if (Z_TYPE_P(&withs) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&withs), _43$$40) { @@ -155178,7 +155304,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_46$$43, "AA", &_45$$43); ZEPHIR_CPY_WRT(&joinAlias, &_46$$43); ZEPHIR_OBS_NVAR(&relationModel); - zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3822); + zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3819); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_47, 0, &modelName, &relationModel); zephir_check_call_status(); if (Z_TYPE_P(&relation) == IS_OBJECT) { @@ -155201,7 +155327,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSVSV(&_52$$46, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_51$$46); ZEPHIR_CALL_METHOD(NULL, &_50$$46, "__construct", &_8, 29, &_52$$46); zephir_check_call_status(); - zephir_throw_exception_debug(&_50$$46, "phalcon/Mvc/Model/Query.zep", 3842); + zephir_throw_exception_debug(&_50$$46, "phalcon/Mvc/Model/Query.zep", 3839); ZEPHIR_MM_RESTORE(); return; } @@ -155221,7 +155347,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_string(&_54$$43, SL("eager"), &alias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_54$$43, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_54$$43, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE); - zephir_array_append(&selectColumns, &_54$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3856); + zephir_array_append(&selectColumns, &_54$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3853); ZEPHIR_INIT_NVAR(&_55$$43); zephir_create_array(&_55$$43, 3, 0); add_assoc_long_ex(&_55$$43, SL("type"), 360); @@ -155235,7 +155361,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) add_assoc_long_ex(&_56$$43, SL("type"), 355); zephir_array_update_string(&_56$$43, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_55$$43, SL("alias"), &_56$$43, PH_COPY | PH_SEPARATE); - zephir_array_append(&automaticJoins, &_55$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3868); + zephir_array_append(&automaticJoins, &_55$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3865); number++; } ZEND_HASH_FOREACH_END(); } else { @@ -155255,7 +155381,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_58$$47, "AA", &_57$$47); ZEPHIR_CPY_WRT(&joinAlias, &_58$$47); ZEPHIR_OBS_NVAR(&relationModel); - zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3822); + zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3819); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_59, 0, &modelName, &relationModel); zephir_check_call_status(); if (Z_TYPE_P(&relation) == IS_OBJECT) { @@ -155278,7 +155404,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSVSV(&_64$$50, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_63$$50); ZEPHIR_CALL_METHOD(NULL, &_62$$50, "__construct", &_8, 29, &_64$$50); zephir_check_call_status(); - zephir_throw_exception_debug(&_62$$50, "phalcon/Mvc/Model/Query.zep", 3842); + zephir_throw_exception_debug(&_62$$50, "phalcon/Mvc/Model/Query.zep", 3839); ZEPHIR_MM_RESTORE(); return; } @@ -155298,7 +155424,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_string(&_66$$47, SL("eager"), &alias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_66$$47, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_66$$47, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE); - zephir_array_append(&selectColumns, &_66$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3856); + zephir_array_append(&selectColumns, &_66$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3853); ZEPHIR_INIT_NVAR(&_67$$47); zephir_create_array(&_67$$47, 3, 0); add_assoc_long_ex(&_67$$47, SL("type"), 360); @@ -155312,7 +155438,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) add_assoc_long_ex(&_68$$47, SL("type"), 355); zephir_array_update_string(&_68$$47, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_67$$47, SL("alias"), &_68$$47, PH_COPY | PH_SEPARATE); - zephir_array_append(&automaticJoins, &_67$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3868); + zephir_array_append(&automaticJoins, &_67$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3865); number++; ZEPHIR_CALL_METHOD(NULL, &withs, "next", NULL, 0); zephir_check_call_status(); @@ -155320,8 +155446,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) } ZEPHIR_INIT_NVAR(&withItem); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3874); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3875); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3871); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3872); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &selectedModels, "next", NULL, 0); zephir_check_call_status(); @@ -155382,7 +155508,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_fast_array_merge(&_81$$55, &joins, &automaticJoins); zephir_array_update_string(&select, SL("joins"), &_81$$55, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&automaticJoins, &joins, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3911); + zephir_array_append(&automaticJoins, &joins, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3908); zephir_array_update_string(&select, SL("joins"), &automaticJoins, PH_COPY | PH_SEPARATE); } } @@ -155401,7 +155527,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) position = 0; ZEPHIR_INIT_VAR(&sqlColumnAliases); array_init(&sqlColumnAliases); - zephir_is_iterable(&selectColumns, 0, "phalcon/Mvc/Model/Query.zep", 3962); + zephir_is_iterable(&selectColumns, 0, "phalcon/Mvc/Model/Query.zep", 3959); if (Z_TYPE_P(&selectColumns) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectColumns), _82) { @@ -155409,7 +155535,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZVAL_COPY(&column, _82); ZEPHIR_CALL_METHOD(&_84$$60, this_ptr, "getselectcolumn", &_85, 469, &column); zephir_check_call_status(); - zephir_is_iterable(&_84$$60, 0, "phalcon/Mvc/Model/Query.zep", 3960); + zephir_is_iterable(&_84$$60, 0, "phalcon/Mvc/Model/Query.zep", 3957); if (Z_TYPE_P(&_84$$60) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_84$$60), _86$$60) { @@ -155426,7 +155552,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) { zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_string(&_88$$65, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3950); + zephir_array_fetch_string(&_88$$65, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3947); if (ZEPHIR_IS_STRING(&_88$$65, "scalar")) { ZEPHIR_INIT_NVAR(&_89$$66); ZVAL_LONG(&_89$$66, position); @@ -155434,7 +155560,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_90$$66, "_", &_89$$66); zephir_array_update_zval(&sqlColumns, &_90$$66, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3953); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3950); } } } @@ -155462,7 +155588,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) { zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_string(&_91$$72, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3950); + zephir_array_fetch_string(&_91$$72, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3947); if (ZEPHIR_IS_STRING(&_91$$72, "scalar")) { ZEPHIR_INIT_NVAR(&_92$$73); ZVAL_LONG(&_92$$73, position); @@ -155470,7 +155596,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_93$$73, "_", &_92$$73); zephir_array_update_zval(&sqlColumns, &_93$$73, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3953); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3950); } } } @@ -155494,7 +155620,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_94$$75, this_ptr, "getselectcolumn", &_85, 469, &column); zephir_check_call_status(); - zephir_is_iterable(&_94$$75, 0, "phalcon/Mvc/Model/Query.zep", 3960); + zephir_is_iterable(&_94$$75, 0, "phalcon/Mvc/Model/Query.zep", 3957); if (Z_TYPE_P(&_94$$75) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_94$$75), _95$$75) { @@ -155511,7 +155637,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) { zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_string(&_97$$80, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3950); + zephir_array_fetch_string(&_97$$80, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3947); if (ZEPHIR_IS_STRING(&_97$$80, "scalar")) { ZEPHIR_INIT_NVAR(&_98$$81); ZVAL_LONG(&_98$$81, position); @@ -155519,7 +155645,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_99$$81, "_", &_98$$81); zephir_array_update_zval(&sqlColumns, &_99$$81, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3953); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3950); } } } @@ -155547,7 +155673,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) { zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_string(&_100$$87, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3950); + zephir_array_fetch_string(&_100$$87, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3947); if (ZEPHIR_IS_STRING(&_100$$87, "scalar")) { ZEPHIR_INIT_NVAR(&_101$$88); ZVAL_LONG(&_101$$88, position); @@ -155555,7 +155681,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_102$$88, "_", &_101$$88); zephir_array_update_zval(&sqlColumns, &_102$$88, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3953); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3950); } } } @@ -155701,17 +155827,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_CPY_WRT(&ast, &_0); ZEPHIR_OBS_VAR(&update); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&update, &ast, SL("update"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4039); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4036); return; } ZEPHIR_OBS_VAR(&tables); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&tables, &update, SL("tables"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4043); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4040); return; } ZEPHIR_OBS_VAR(&values); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&values, &update, SL("values"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4047); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4044); return; } ZEPHIR_INIT_VAR(&models); @@ -155735,16 +155861,16 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_0); - zephir_is_iterable(&updateTables, 0, "phalcon/Mvc/Model/Query.zep", 4113); + zephir_is_iterable(&updateTables, 0, "phalcon/Mvc/Model/Query.zep", 4110); if (Z_TYPE_P(&updateTables) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&updateTables), _1) { ZEPHIR_INIT_NVAR(&table); ZVAL_COPY(&table, _1); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4071); + zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4068); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4072); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4069); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_3, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -155768,17 +155894,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_OBS_NVAR(&alias); if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) { zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4095); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4096); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4092); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4093); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE); } else { zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4102); + zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4099); zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4106); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4103); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -155793,9 +155919,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_CALL_METHOD(&table, &updateTables, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4071); + zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4068); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4072); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4069); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_6, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -155818,17 +155944,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_OBS_NVAR(&alias); if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) { zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4095); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4096); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4092); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4093); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE); } else { zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4102); + zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4099); zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4106); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4103); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &updateTables, "next", NULL, 0); zephir_check_call_status(); @@ -155851,13 +155977,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_CPY_WRT(&updateValues, &values); } notQuoting = 0; - zephir_is_iterable(&updateValues, 0, "phalcon/Mvc/Model/Query.zep", 4137); + zephir_is_iterable(&updateValues, 0, "phalcon/Mvc/Model/Query.zep", 4134); if (Z_TYPE_P(&updateValues) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&updateValues), _9) { ZEPHIR_INIT_NVAR(&updateValue); ZVAL_COPY(&updateValue, _9); - zephir_array_fetch_string(&_12$$20, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4129); + zephir_array_fetch_string(&_12$$20, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4126); if (notQuoting) { ZVAL_BOOL(&_13$$20, 1); } else { @@ -155865,13 +155991,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } ZEPHIR_CALL_METHOD(&_11$$20, this_ptr, "getexpression", &_14, 453, &_12$$20, &_13$$20); zephir_check_call_status(); - zephir_array_append(&sqlFields, &_11$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4129); + zephir_array_append(&sqlFields, &_11$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4126); ZEPHIR_OBS_NVAR(&exprColumn); - zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4130); + zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4127); ZEPHIR_INIT_NVAR(&_15$$20); zephir_create_array(&_15$$20, 2, 0); ZEPHIR_OBS_NVAR(&_16$$20); - zephir_array_fetch_string(&_16$$20, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4132); + zephir_array_fetch_string(&_16$$20, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4129); zephir_array_update_string(&_15$$20, SL("type"), &_16$$20, PH_COPY | PH_SEPARATE); if (notQuoting) { ZVAL_BOOL(&_18$$20, 1); @@ -155881,7 +156007,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_CALL_METHOD(&_17$$20, this_ptr, "getexpression", &_14, 453, &exprColumn, &_18$$20); zephir_check_call_status(); zephir_array_update_string(&_15$$20, SL("value"), &_17$$20, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlValues, &_15$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4134); + zephir_array_append(&sqlValues, &_15$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4131); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &updateValues, "rewind", NULL, 0); @@ -155894,7 +156020,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } ZEPHIR_CALL_METHOD(&updateValue, &updateValues, "current", NULL, 0); zephir_check_call_status(); - zephir_array_fetch_string(&_20$$21, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4129); + zephir_array_fetch_string(&_20$$21, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4126); if (notQuoting) { ZVAL_BOOL(&_21$$21, 1); } else { @@ -155902,13 +156028,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } ZEPHIR_CALL_METHOD(&_19$$21, this_ptr, "getexpression", &_14, 453, &_20$$21, &_21$$21); zephir_check_call_status(); - zephir_array_append(&sqlFields, &_19$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4129); + zephir_array_append(&sqlFields, &_19$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4126); ZEPHIR_OBS_NVAR(&exprColumn); - zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4130); + zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4127); ZEPHIR_INIT_NVAR(&_22$$21); zephir_create_array(&_22$$21, 2, 0); ZEPHIR_OBS_NVAR(&_23$$21); - zephir_array_fetch_string(&_23$$21, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4132); + zephir_array_fetch_string(&_23$$21, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4129); zephir_array_update_string(&_22$$21, SL("type"), &_23$$21, PH_COPY | PH_SEPARATE); if (notQuoting) { ZVAL_BOOL(&_25$$21, 1); @@ -155918,7 +156044,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_CALL_METHOD(&_24$$21, this_ptr, "getexpression", &_14, 453, &exprColumn, &_25$$21); zephir_check_call_status(); zephir_array_update_string(&_22$$21, SL("value"), &_24$$21, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlValues, &_22$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4134); + zephir_array_append(&sqlValues, &_22$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4131); ZEPHIR_CALL_METHOD(NULL, &updateValues, "next", NULL, 0); zephir_check_call_status(); } @@ -173583,7 +173709,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) dirtyState = 0; zephir_read_property(&_1, this_ptr, ZEND_STRL("columnTypes"), PH_NOISY_CC | PH_READONLY); - zephir_is_iterable(&_1, 0, "phalcon/Mvc/Model/Resultset/Complex.zep", 266); + zephir_is_iterable(&_1, 0, "phalcon/Mvc/Model/Resultset/Complex.zep", 259); if (Z_TYPE_P(&_1) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_1), _4, _5, _2) { @@ -173652,22 +173778,22 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) } if (ZEPHIR_GLOBAL(orm).late_state_binding) { ZEPHIR_OBS_NVAR(&_10$$16); - zephir_array_fetch_string(&_10$$16, &column, SL("instance"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 177); + zephir_array_fetch_string(&_10$$16, &column, SL("instance"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 175); if (zephir_instance_of_ev(&_10$$16, phalcon_mvc_model_ce)) { - zephir_array_fetch_string(&_11$$17, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 178); + zephir_array_fetch_string(&_11$$17, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 176); ZEPHIR_INIT_NVAR(&modelName); zephir_get_class(&modelName, &_11$$17, 0); } else { ZEPHIR_INIT_NVAR(&modelName); ZVAL_STRING(&modelName, "Phalcon\\Mvc\\Model"); } - zephir_array_fetch_string(&_12$$16, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 184); + zephir_array_fetch_string(&_12$$16, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 182); ZVAL_LONG(&_13$$16, dirtyState); _14$$16 = zephir_fetch_class(&modelName); ZEPHIR_CALL_CE_STATIC(&value, _14$$16, "cloneresultmap", NULL, 0, &_12$$16, &rowModel, &columnMap, &_13$$16, &keepSnapshots); zephir_check_call_status(); } else { - zephir_array_fetch_string(&_16$$19, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 198); + zephir_array_fetch_string(&_16$$19, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 194); ZVAL_LONG(&_17$$19, dirtyState); ZEPHIR_CALL_CE_STATIC(&value, phalcon_mvc_model_ce, "cloneresultmap", &_15, 0, &_16$$19, &rowModel, &columnMap, &_17$$19, &keepSnapshots); zephir_check_call_status(); @@ -173680,12 +173806,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) } while(0); ZEPHIR_OBS_NVAR(&attribute); - zephir_array_fetch_string(&attribute, &column, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 222); + zephir_array_fetch_string(&attribute, &column, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 218); } else { ZEPHIR_OBS_NVAR(&sqlAlias); if (zephir_array_isset_string_fetch(&sqlAlias, &column, SL("sqlAlias"), 0)) { ZEPHIR_OBS_NVAR(&value); - zephir_array_fetch(&value, &row, &sqlAlias, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 230); + zephir_array_fetch(&value, &row, &sqlAlias, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 224); } else { ZEPHIR_OBS_NVAR(&value); zephir_array_isset_fetch(&value, &row, &alias, 0); @@ -173783,22 +173909,22 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) } if (ZEPHIR_GLOBAL(orm).late_state_binding) { ZEPHIR_OBS_NVAR(&_25$$36); - zephir_array_fetch_string(&_25$$36, &column, SL("instance"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 177); + zephir_array_fetch_string(&_25$$36, &column, SL("instance"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 175); if (zephir_instance_of_ev(&_25$$36, phalcon_mvc_model_ce)) { - zephir_array_fetch_string(&_26$$37, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 178); + zephir_array_fetch_string(&_26$$37, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 176); ZEPHIR_INIT_NVAR(&modelName); zephir_get_class(&modelName, &_26$$37, 0); } else { ZEPHIR_INIT_NVAR(&modelName); ZVAL_STRING(&modelName, "Phalcon\\Mvc\\Model"); } - zephir_array_fetch_string(&_27$$36, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 184); + zephir_array_fetch_string(&_27$$36, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 182); ZVAL_LONG(&_28$$36, dirtyState); _29$$36 = zephir_fetch_class(&modelName); ZEPHIR_CALL_CE_STATIC(&value, _29$$36, "cloneresultmap", NULL, 0, &_27$$36, &rowModel, &columnMap, &_28$$36, &keepSnapshots); zephir_check_call_status(); } else { - zephir_array_fetch_string(&_30$$39, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 198); + zephir_array_fetch_string(&_30$$39, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 194); ZVAL_LONG(&_31$$39, dirtyState); ZEPHIR_CALL_CE_STATIC(&value, phalcon_mvc_model_ce, "cloneresultmap", &_15, 0, &_30$$39, &rowModel, &columnMap, &_31$$39, &keepSnapshots); zephir_check_call_status(); @@ -173811,12 +173937,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) } while(0); ZEPHIR_OBS_NVAR(&attribute); - zephir_array_fetch_string(&attribute, &column, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 222); + zephir_array_fetch_string(&attribute, &column, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 218); } else { ZEPHIR_OBS_NVAR(&sqlAlias); if (zephir_array_isset_string_fetch(&sqlAlias, &column, SL("sqlAlias"), 0)) { ZEPHIR_OBS_NVAR(&value); - zephir_array_fetch(&value, &row, &sqlAlias, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 230); + zephir_array_fetch(&value, &row, &sqlAlias, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 224); } else { ZEPHIR_OBS_NVAR(&value); zephir_array_isset_fetch(&value, &row, &alias, 0); @@ -173882,7 +174008,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, toArray) } ZEPHIR_CALL_METHOD(¤t, this_ptr, "current", &_2, 475); zephir_check_call_status(); - zephir_array_append(&records, ¤t, PH_SEPARATE, "phalcon/Mvc/Model/Resultset/Complex.zep", 286); + zephir_array_append(&records, ¤t, PH_SEPARATE, "phalcon/Mvc/Model/Resultset/Complex.zep", 279); ZEPHIR_CALL_METHOD(NULL, this_ptr, "next", &_3, 0); zephir_check_call_status(); } @@ -173925,8 +174051,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, serialize) ZEPHIR_CPY_WRT(&hydrateMode, &_0); ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_1, 0); zephir_check_call_status(); - if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Complex.zep", 315); + if (Z_TYPE_P(&container) == IS_NULL) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Complex.zep", 307); return; } ZEPHIR_INIT_VAR(&_3); @@ -174006,7 +174132,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, unserialize) ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_0, 0); zephir_check_call_status(); if (Z_TYPE_P(&container) == IS_NULL) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Complex.zep", 359); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Complex.zep", 351); return; } ZEPHIR_INIT_VAR(&_2); @@ -174028,42 +174154,81 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, unserialize) zephir_check_call_status(); } if (UNEXPECTED(Z_TYPE_P(&resultset) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid serialization data", "phalcon/Mvc/Model/Resultset/Complex.zep", 372); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid serialization data", "phalcon/Mvc/Model/Resultset/Complex.zep", 364); return; } - zephir_array_fetch_string(&_5, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 375); + zephir_array_fetch_string(&_5, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 367); zephir_update_property_zval(this_ptr, ZEND_STRL("rows"), &_5); - zephir_array_fetch_string(&_6, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 376); + zephir_array_fetch_string(&_6, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 368); ZEPHIR_INIT_ZVAL_NREF(_7); ZVAL_LONG(&_7, zephir_fast_count_int(&_6)); zephir_update_property_zval(this_ptr, ZEND_STRL("count"), &_7); - zephir_array_fetch_string(&_8, &resultset, SL("cache"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 377); + zephir_array_fetch_string(&_8, &resultset, SL("cache"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 369); zephir_update_property_zval(this_ptr, ZEND_STRL("cache"), &_8); - zephir_array_fetch_string(&_9, &resultset, SL("columnTypes"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 378); + zephir_array_fetch_string(&_9, &resultset, SL("columnTypes"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 370); zephir_update_property_zval(this_ptr, ZEND_STRL("columnTypes"), &_9); - zephir_array_fetch_string(&_10, &resultset, SL("hydrateMode"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 379); + zephir_array_fetch_string(&_10, &resultset, SL("hydrateMode"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 371); zephir_update_property_zval(this_ptr, ZEND_STRL("hydrateMode"), &_10); ZEPHIR_MM_RESTORE(); } static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, __serialize) { + zval records, cache, columnTypes, hydrateMode, _0; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); + ZVAL_UNDEF(&records); + ZVAL_UNDEF(&cache); + ZVAL_UNDEF(&columnTypes); + ZVAL_UNDEF(&hydrateMode); + ZVAL_UNDEF(&_0); - array_init(return_value); - return; + ZEPHIR_MM_GROW(); + + ZEPHIR_CALL_METHOD(&records, this_ptr, "toarray", NULL, 0); + zephir_check_call_status(); + zephir_read_property(&_0, this_ptr, ZEND_STRL("cache"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CPY_WRT(&cache, &_0); + zephir_read_property(&_0, this_ptr, ZEND_STRL("columnTypes"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CPY_WRT(&columnTypes, &_0); + zephir_read_property(&_0, this_ptr, ZEND_STRL("hydrateMode"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CPY_WRT(&hydrateMode, &_0); + zephir_create_array(return_value, 4, 0); + zephir_array_update_string(return_value, SL("cache"), &cache, PH_COPY | PH_SEPARATE); + zephir_array_update_string(return_value, SL("rows"), &records, PH_COPY | PH_SEPARATE); + zephir_array_update_string(return_value, SL("columnTypes"), &columnTypes, PH_COPY | PH_SEPARATE); + zephir_array_update_string(return_value, SL("hydrateMode"), &hydrateMode, PH_COPY | PH_SEPARATE); + RETURN_MM(); } static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, __unserialize) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *data_param = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zephir_fcall_cache_entry *_0 = NULL; + zval *data_param = NULL, __$true, __$false, resultset, container, serializer, _1, _2, _5, _6, _7, _8, _9, _10, _3$$4, _4$$4; zval data; zval *this_ptr = getThis(); ZVAL_UNDEF(&data); + ZVAL_BOOL(&__$true, 1); + ZVAL_BOOL(&__$false, 0); + ZVAL_UNDEF(&resultset); + ZVAL_UNDEF(&container); + ZVAL_UNDEF(&serializer); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_5); + ZVAL_UNDEF(&_6); + ZVAL_UNDEF(&_7); + ZVAL_UNDEF(&_8); + ZVAL_UNDEF(&_9); + ZVAL_UNDEF(&_10); + ZVAL_UNDEF(&_3$$4); + ZVAL_UNDEF(&_4$$4); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -174077,6 +174242,52 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, __unserialize) zephir_get_arrval(&data, data_param); + if (1) { + zephir_update_property_zval(this_ptr, ZEND_STRL("disableHydration"), &__$true); + } else { + zephir_update_property_zval(this_ptr, ZEND_STRL("disableHydration"), &__$false); + } + ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_0, 0); + zephir_check_call_status(); + if (Z_TYPE_P(&container) == IS_NULL) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Complex.zep", 408); + return; + } + ZEPHIR_INIT_VAR(&_2); + ZVAL_STRING(&_2, "serializer"); + ZEPHIR_CALL_METHOD(&_1, &container, "has", NULL, 0, &_2); + zephir_check_call_status(); + if (zephir_is_true(&_1)) { + ZEPHIR_INIT_VAR(&_4$$4); + ZVAL_STRING(&_4$$4, "serializer"); + ZEPHIR_CALL_METHOD(&_3$$4, &container, "getshared", NULL, 0, &_4$$4); + zephir_check_call_status(); + ZEPHIR_CPY_WRT(&serializer, &_3$$4); + ZEPHIR_CALL_METHOD(NULL, &serializer, "unserialize", NULL, 0, &data); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&resultset, &serializer, "getdata", NULL, 0); + zephir_check_call_status(); + } else { + ZEPHIR_CALL_FUNCTION(&resultset, "unserialize", NULL, 16, &data); + zephir_check_call_status(); + } + if (UNEXPECTED(Z_TYPE_P(&resultset) != IS_ARRAY)) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid serialization data", "phalcon/Mvc/Model/Resultset/Complex.zep", 421); + return; + } + zephir_array_fetch_string(&_5, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 424); + zephir_update_property_zval(this_ptr, ZEND_STRL("rows"), &_5); + zephir_array_fetch_string(&_6, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 425); + ZEPHIR_INIT_ZVAL_NREF(_7); + ZVAL_LONG(&_7, zephir_fast_count_int(&_6)); + zephir_update_property_zval(this_ptr, ZEND_STRL("count"), &_7); + zephir_array_fetch_string(&_8, &resultset, SL("cache"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 426); + zephir_update_property_zval(this_ptr, ZEND_STRL("cache"), &_8); + zephir_array_fetch_string(&_9, &resultset, SL("columnTypes"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 427); + zephir_update_property_zval(this_ptr, ZEND_STRL("columnTypes"), &_9); + zephir_array_fetch_string(&_10, &resultset, SL("hydrateMode"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 428); + zephir_update_property_zval(this_ptr, ZEND_STRL("hydrateMode"), &_10); + ZEPHIR_MM_RESTORE(); } @@ -174561,8 +174772,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, serialize) ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_0, 0); zephir_check_call_status(); - if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Simple.zep", 261); + if (Z_TYPE_P(&container) == IS_NULL) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Simple.zep", 260); return; } ZEPHIR_INIT_VAR(&data); @@ -174645,8 +174856,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, unserialize) ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_0, 0); zephir_check_call_status(); - if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Simple.zep", 299); + if (Z_TYPE_P(&container) == IS_NULL) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Simple.zep", 297); return; } ZEPHIR_INIT_VAR(&_2); @@ -174668,22 +174879,22 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, unserialize) zephir_check_call_status(); } if (UNEXPECTED(Z_TYPE_P(&resultset) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid serialization data", "phalcon/Mvc/Model/Resultset/Simple.zep", 312); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid serialization data", "phalcon/Mvc/Model/Resultset/Simple.zep", 310); return; } - zephir_array_fetch_string(&_5, &resultset, SL("model"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 315); + zephir_array_fetch_string(&_5, &resultset, SL("model"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 313); zephir_update_property_zval(this_ptr, ZEND_STRL("model"), &_5); - zephir_array_fetch_string(&_6, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 316); + zephir_array_fetch_string(&_6, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 314); zephir_update_property_zval(this_ptr, ZEND_STRL("rows"), &_6); - zephir_array_fetch_string(&_7, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 317); + zephir_array_fetch_string(&_7, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 315); ZEPHIR_INIT_ZVAL_NREF(_8); ZVAL_LONG(&_8, zephir_fast_count_int(&_7)); zephir_update_property_zval(this_ptr, ZEND_STRL("count"), &_8); - zephir_array_fetch_string(&_9, &resultset, SL("cache"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 318); + zephir_array_fetch_string(&_9, &resultset, SL("cache"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 316); zephir_update_property_zval(this_ptr, ZEND_STRL("cache"), &_9); - zephir_array_fetch_string(&_10, &resultset, SL("columnMap"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 319); + zephir_array_fetch_string(&_10, &resultset, SL("columnMap"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 317); zephir_update_property_zval(this_ptr, ZEND_STRL("columnMap"), &_10); - zephir_array_fetch_string(&_11, &resultset, SL("hydrateMode"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 320); + zephir_array_fetch_string(&_11, &resultset, SL("hydrateMode"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 318); zephir_update_property_zval(this_ptr, ZEND_STRL("hydrateMode"), &_11); if (zephir_array_isset_string_fetch(&keepSnapshots, &resultset, SL("keepSnapshots"), 1)) { zephir_update_property_zval(this_ptr, ZEND_STRL("keepSnapshots"), &keepSnapshots); @@ -174693,22 +174904,57 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, unserialize) static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, __serialize) { + zval _0, _1, _2; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2); - array_init(return_value); - return; + ZEPHIR_MM_GROW(); + + zephir_create_array(return_value, 6, 0); + ZEPHIR_OBS_VAR(&_0); + zephir_read_property(&_0, this_ptr, ZEND_STRL("model"), PH_NOISY_CC); + zephir_array_update_string(return_value, SL("model"), &_0, PH_COPY | PH_SEPARATE); + ZEPHIR_OBS_NVAR(&_0); + zephir_read_property(&_0, this_ptr, ZEND_STRL("cache"), PH_NOISY_CC); + zephir_array_update_string(return_value, SL("cache"), &_0, PH_COPY | PH_SEPARATE); + ZVAL_BOOL(&_2, 0); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "toarray", NULL, 0, &_2); + zephir_check_call_status(); + zephir_array_update_string(return_value, SL("rows"), &_1, PH_COPY | PH_SEPARATE); + ZEPHIR_OBS_NVAR(&_0); + zephir_read_property(&_0, this_ptr, ZEND_STRL("columnMap"), PH_NOISY_CC); + zephir_array_update_string(return_value, SL("columnMap"), &_0, PH_COPY | PH_SEPARATE); + ZEPHIR_OBS_NVAR(&_0); + zephir_read_property(&_0, this_ptr, ZEND_STRL("hydrateMode"), PH_NOISY_CC); + zephir_array_update_string(return_value, SL("hydrateMode"), &_0, PH_COPY | PH_SEPARATE); + ZEPHIR_OBS_NVAR(&_0); + zephir_read_property(&_0, this_ptr, ZEND_STRL("keepSnapshots"), PH_NOISY_CC); + zephir_array_update_string(return_value, SL("keepSnapshots"), &_0, PH_COPY | PH_SEPARATE); + RETURN_MM(); } static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, __unserialize) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *data_param = NULL; + zval *data_param = NULL, keepSnapshots, _0, _1, _2, _3, _4, _5, _6; zval data; zval *this_ptr = getThis(); ZVAL_UNDEF(&data); + ZVAL_UNDEF(&keepSnapshots); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_4); + ZVAL_UNDEF(&_5); + ZVAL_UNDEF(&_6); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -174722,6 +174968,24 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, __unserialize) zephir_get_arrval(&data, data_param); + zephir_array_fetch_string(&_0, &data, SL("model"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 341); + zephir_update_property_zval(this_ptr, ZEND_STRL("model"), &_0); + zephir_array_fetch_string(&_1, &data, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 342); + zephir_update_property_zval(this_ptr, ZEND_STRL("rows"), &_1); + zephir_array_fetch_string(&_2, &data, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 343); + ZEPHIR_INIT_ZVAL_NREF(_3); + ZVAL_LONG(&_3, zephir_fast_count_int(&_2)); + zephir_update_property_zval(this_ptr, ZEND_STRL("count"), &_3); + zephir_array_fetch_string(&_4, &data, SL("cache"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 344); + zephir_update_property_zval(this_ptr, ZEND_STRL("cache"), &_4); + zephir_array_fetch_string(&_5, &data, SL("columnMap"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 345); + zephir_update_property_zval(this_ptr, ZEND_STRL("columnMap"), &_5); + zephir_array_fetch_string(&_6, &data, SL("hydrateMode"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 346); + zephir_update_property_zval(this_ptr, ZEND_STRL("hydrateMode"), &_6); + if (zephir_array_isset_string_fetch(&keepSnapshots, &data, SL("keepSnapshots"), 1)) { + zephir_update_property_zval(this_ptr, ZEND_STRL("keepSnapshots"), &keepSnapshots); + } + ZEPHIR_MM_RESTORE(); } @@ -204091,12 +204355,22 @@ static PHP_METHOD(Phalcon_Storage_Serializer_AbstractSerializer, isSerializable) static PHP_METHOD(Phalcon_Storage_Serializer_AbstractSerializer, __serialize) { + zval _0; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zval *this_ptr = getThis(); + ZVAL_UNDEF(&_0); + + ZEPHIR_MM_GROW(); + ZEPHIR_OBS_VAR(&_0); + zephir_read_property(&_0, this_ptr, ZEND_STRL("data"), PH_NOISY_CC); + if (Z_TYPE_P(&_0) == IS_ARRAY) { + RETURN_MM_MEMBER(getThis(), "data"); + } array_init(return_value); - return; + RETURN_MM(); } static PHP_METHOD(Phalcon_Storage_Serializer_AbstractSerializer, __unserialize) @@ -204120,6 +204394,8 @@ static PHP_METHOD(Phalcon_Storage_Serializer_AbstractSerializer, __unserialize) zephir_get_arrval(&data, data_param); + zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &data); + ZEPHIR_MM_RESTORE(); }