From f05d5844295eb8d8b19c358d513d7e72df428337 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev <1695147@gmail.com> Date: Fri, 30 Jun 2023 23:13:51 +0100 Subject: [PATCH 01/35] #16307 - Update composer.lock --- composer.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/composer.lock b/composer.lock index 4e90bbaf44..4f61810196 100644 --- a/composer.lock +++ b/composer.lock @@ -1719,16 +1719,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.17.0", + "version": "v3.20.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "3f0ed862f22386c55a767461ef5083bddceeed79" + "reference": "0e8249e0b15e2bc022fbbd1090ce29d071481e69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/3f0ed862f22386c55a767461ef5083bddceeed79", - "reference": "3f0ed862f22386c55a767461ef5083bddceeed79", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/0e8249e0b15e2bc022fbbd1090ce29d071481e69", + "reference": "0e8249e0b15e2bc022fbbd1090ce29d071481e69", "shasum": "" }, "require": { @@ -1803,7 +1803,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.17.0" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.20.0" }, "funding": [ { @@ -1811,7 +1811,7 @@ "type": "github" } ], - "time": "2023-05-22T19:59:32+00:00" + "time": "2023-06-27T20:22:39+00:00" }, { "name": "graham-campbell/result-type", @@ -2464,16 +2464,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.15.5", + "version": "v4.16.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e" + "reference": "19526a33fb561ef417e822e85f08a00db4059c17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/11e2663a5bc9db5d714eedb4277ee300403b4a9e", - "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17", + "reference": "19526a33fb561ef417e822e85f08a00db4059c17", "shasum": "" }, "require": { @@ -2514,9 +2514,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.5" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.16.0" }, - "time": "2023-05-19T20:20:00+00:00" + "time": "2023-06-25T14:52:30+00:00" }, { "name": "openlss/lib-array2xml", @@ -5342,16 +5342,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v5.4.23", + "version": "v5.4.25", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "4a286c916b74ecfb6e2caf1aa31d3fe2a34b7e08" + "reference": "d2aefa5a7acc5511422792931d14d1be96fe9fea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/4a286c916b74ecfb6e2caf1aa31d3fe2a34b7e08", - "reference": "4a286c916b74ecfb6e2caf1aa31d3fe2a34b7e08", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/d2aefa5a7acc5511422792931d14d1be96fe9fea", + "reference": "d2aefa5a7acc5511422792931d14d1be96fe9fea", "shasum": "" }, "require": { @@ -5397,7 +5397,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v5.4.23" + "source": "https://github.com/symfony/dom-crawler/tree/v5.4.25" }, "funding": [ { @@ -5413,7 +5413,7 @@ "type": "tidelift" } ], - "time": "2023-04-08T21:20:19+00:00" + "time": "2023-06-05T08:05:41+00:00" }, { "name": "symfony/event-dispatcher", @@ -5581,16 +5581,16 @@ }, { "name": "symfony/filesystem", - "version": "v5.4.23", + "version": "v5.4.25", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "b2f79d86cd9e7de0fff6d03baa80eaed7a5f38b5" + "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/b2f79d86cd9e7de0fff6d03baa80eaed7a5f38b5", - "reference": "b2f79d86cd9e7de0fff6d03baa80eaed7a5f38b5", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/0ce3a62c9579a53358d3a7eb6b3dfb79789a6364", + "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364", "shasum": "" }, "require": { @@ -5625,7 +5625,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.23" + "source": "https://github.com/symfony/filesystem/tree/v5.4.25" }, "funding": [ { @@ -5641,7 +5641,7 @@ "type": "tidelift" } ], - "time": "2023-03-02T11:38:35+00:00" + "time": "2023-05-31T13:04:02+00:00" }, { "name": "symfony/finder", From 8506bbcb868a08c5d08a83187662e0c04fa79a47 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev <1695147@gmail.com> Date: Fri, 30 Jun 2023 23:24:39 +0100 Subject: [PATCH 02/35] #16307 - Add test case --- tests/database/Mvc/Model/FindCest.php | 37 +++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/tests/database/Mvc/Model/FindCest.php b/tests/database/Mvc/Model/FindCest.php index 5ca5fd3736..f7361c91dc 100644 --- a/tests/database/Mvc/Model/FindCest.php +++ b/tests/database/Mvc/Model/FindCest.php @@ -376,4 +376,41 @@ public function mvcModelFindPrivatePropertyWithRedisCache(DatabaseTester $I) $result = $cache->delete($cacheKey); $I->assertTrue($result); } + + /** + * Tests Phalcon\Mvc\Model :: find() - specific column + * + * @author Phalcon Team + * @since 2023-06-30 + * + * @group mysql + * @group pgsql + * @group sqlite + */ + public function mvcModelFindWithSpecificColumn(DatabaseTester $I) + { + $I->wantToTest('Mvc\Model - find() - with specific column'); + + /** @var PDO $connection */ + $connection = $I->getConnection(); + $migration = new ObjectsMigration($connection); + $migration->insert(1, 'random data', 1); + $migration->insert(2, 'random data 2', 1); + $migration->insert(4, 'random data 4', 1); + + /** + * Get the records (should cache the resultset) + */ + $data = Objects::find( + [ + 'columns' => 'obj_id', + 'conditions' => 'obj_id IN ({ids:array})', + 'bind' => ['ids' => [1, 2, 3]], + ] + ); + + $I->assertEquals(2, count($data)); + $I->assertEquals(1, $data[0]->obj_id); + $I->assertEquals(2, $data[1]->obj_id); + } } From ddb9b908919daeba35bc77c75f91726f5db28949 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev <1695147@gmail.com> Date: Fri, 30 Jun 2023 23:28:33 +0100 Subject: [PATCH 03/35] #16307 - Regenerate ext/ directory --- ext/phalcon/di/injectable.zep.c | 2 +- ext/phalcon/encryption/crypt.zep.c | 2 +- ext/phalcon/storage/adapter/stream.zep.c | 8 ++++---- ext/phalcon/storage/serializer/json.zep.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ext/phalcon/di/injectable.zep.c b/ext/phalcon/di/injectable.zep.c index 697006929c..8b64c9a842 100644 --- a/ext/phalcon/di/injectable.zep.c +++ b/ext/phalcon/di/injectable.zep.c @@ -55,7 +55,7 @@ * @property \Phalcon\Mvc\Model\MetaData\Memory|\Phalcon\Mvc\Model\MetadataInterface $modelsMetadata * @property \Phalcon\Mvc\Model\Transaction\Manager|\Phalcon\Mvc\Model\Transaction\ManagerInterface $transactionManager * @property \Phalcon\Assets\Manager $assets - * @property \Phalcon\Di\Di|\Phalcon\Di\DiInterface $di + * @property \Phalcon\Di\Di|\Phalcon\Di\Di\DiInterface $di * @property \Phalcon\Session\Bag|\Phalcon\Session\BagInterface $persistent * @property \Phalcon\Mvc\View|\Phalcon\Mvc\ViewInterface $view */ diff --git a/ext/phalcon/encryption/crypt.zep.c b/ext/phalcon/encryption/crypt.zep.c index fb441a1de1..e7060428b4 100644 --- a/ext/phalcon/encryption/crypt.zep.c +++ b/ext/phalcon/encryption/crypt.zep.c @@ -1114,7 +1114,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, checkCipherHashIsAvailable) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "hash"); ZEPHIR_INIT_VAR(&method); - if (ZEPHIR_IS_IDENTICAL(&_0, &type)) { + if (ZEPHIR_IS_IDENTICAL(&_0, &cipher)) { ZVAL_STRING(&method, "getAvailableHashAlgorithms"); } else { ZVAL_STRING(&method, "getAvailableCiphers"); diff --git a/ext/phalcon/storage/adapter/stream.zep.c b/ext/phalcon/storage/adapter/stream.zep.c index a363dc9013..d18a9ce061 100644 --- a/ext/phalcon/storage/adapter/stream.zep.c +++ b/ext/phalcon/storage/adapter/stream.zep.c @@ -173,7 +173,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, clear) zephir_check_call_status(); _4$$3 = !ZEPHIR_IS_TRUE_IDENTICAL(&_5$$3); } - if (_4$$3) { + if (UNEXPECTED(_4$$3)) { result = 0; } } ZEND_HASH_FOREACH_END(); @@ -198,7 +198,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, clear) zephir_check_call_status(); _9$$5 = !ZEPHIR_IS_TRUE_IDENTICAL(&_10$$5); } - if (_9$$5) { + if (UNEXPECTED(_9$$5)) { result = 0; } ZEPHIR_CALL_METHOD(NULL, &iterator, "next", NULL, 0); @@ -259,7 +259,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, decrement) ZEPHIR_CALL_METHOD(&_0, this_ptr, "has", NULL, 0, &key); zephir_check_call_status(); - if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { + if (UNEXPECTED(!ZEPHIR_IS_TRUE_IDENTICAL(&_0))) { RETURN_MM_BOOL(0); } ZEPHIR_CALL_METHOD(&data, this_ptr, "get", NULL, 0, &key); @@ -631,7 +631,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, increment) ZEPHIR_CALL_METHOD(&_0, this_ptr, "has", NULL, 0, &key); zephir_check_call_status(); - if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { + if (UNEXPECTED(!ZEPHIR_IS_TRUE_IDENTICAL(&_0))) { RETURN_MM_BOOL(0); } ZEPHIR_CALL_METHOD(&data, this_ptr, "get", NULL, 0, &key); diff --git a/ext/phalcon/storage/serializer/json.zep.c b/ext/phalcon/storage/serializer/json.zep.c index 2eb329af50..5de1f0412a 100644 --- a/ext/phalcon/storage/serializer/json.zep.c +++ b/ext/phalcon/storage/serializer/json.zep.c @@ -203,7 +203,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Json, getDecode) zephir_json_decode(&decoded, &data, zephir_get_intval(&_0) ); ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 193); zephir_check_call_status(); - if (!ZEPHIR_IS_LONG_IDENTICAL(&_3, 0)) { + 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, 194); @@ -268,7 +268,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Json, getEncode) zephir_json_encode(&encoded, data, zephir_get_intval(&_0) ); ZEPHIR_CALL_FUNCTION(&_2, "json_last_error", NULL, 193); zephir_check_call_status(); - if (!ZEPHIR_IS_LONG_IDENTICAL(&_2, 0)) { + 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, 194); From d68a2b2df15a860d472751fde93f70f0e4469525 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Sat, 1 Jul 2023 13:03:52 -0400 Subject: [PATCH 04/35] minor change to trigger build --- tests/database/Mvc/Model/UnderscoreSetCest.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/database/Mvc/Model/UnderscoreSetCest.php b/tests/database/Mvc/Model/UnderscoreSetCest.php index b94b87c0c3..f5083b4f09 100644 --- a/tests/database/Mvc/Model/UnderscoreSetCest.php +++ b/tests/database/Mvc/Model/UnderscoreSetCest.php @@ -401,9 +401,7 @@ public function mvcModelUnderscoreSetWithHasManyRelatedRecords(DatabaseTester $I new Models\Invoices() ]; - $I->assertTrue( - $customer->save() - ); + $I->assertTrue($customer->save()); $I->assertCount( 2, From 8df55b642a1cce60ddbb590c688dfa56df0060e6 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Sun, 2 Jul 2023 13:53:59 -0400 Subject: [PATCH 05/35] added tests to check medatada storage in redis and memcached --- tests/_data/assets/schemas/mysql.sql | 58 ++ tests/_data/assets/schemas/pgsql.sql | 6 + tests/_data/assets/schemas/sqlite.sql | 6 + .../fixtures/Migrations/AbstractMigration.php | 2 +- .../fixtures/Migrations/AlbumMigration.php | 93 +++ .../Migrations/AlbumPhotoMigration.php | 65 ++ .../fixtures/Migrations/PhotoMigration.php | 75 +++ tests/_data/fixtures/Traits/DiTrait.php | 13 + tests/_data/fixtures/models/Album.php | 24 + tests/_data/fixtures/models/AlbumPhoto.php | 24 + tests/_data/fixtures/models/Photo.php | 24 + .../MetaData/Adapter/ReadMetadataCest.php | 616 ++++++++++++++++++ 12 files changed, 1005 insertions(+), 1 deletion(-) create mode 100644 tests/_data/fixtures/Migrations/AlbumMigration.php create mode 100644 tests/_data/fixtures/Migrations/AlbumPhotoMigration.php create mode 100644 tests/_data/fixtures/Migrations/PhotoMigration.php create mode 100644 tests/_data/fixtures/models/Album.php create mode 100644 tests/_data/fixtures/models/AlbumPhoto.php create mode 100644 tests/_data/fixtures/models/Photo.php create mode 100644 tests/database/Mvc/Model/MetaData/Adapter/ReadMetadataCest.php diff --git a/tests/_data/assets/schemas/mysql.sql b/tests/_data/assets/schemas/mysql.sql index ff6a8116d5..dbd9f6dbf3 100644 --- a/tests/_data/assets/schemas/mysql.sql +++ b/tests/_data/assets/schemas/mysql.sql @@ -1,5 +1,38 @@ +drop table if exists `album`; + +CREATE TABLE `album` ( + `id` int(11) UNSIGNED not null AUTO_INCREMENT, + `name` varchar(100) not null collate 'utf8mb4_unicode_520_ci', + `album_id` int(11) unsigned null default null, + `photo_id` int(11) unsigned null default null COMMENT 'The ID of the featured photo', + primary key (`id`) using BTREE, + index `index_foreignkey_album_album` (`album_id`) using BTREE, + index `album_ibfk_2` (`photo_id`) using BTREE, + constraint `album_ibfk_1` foreign key (`album_id`) references `album` (`id`) on update cascade on delete cascade, + constraint `album_ibfk_2` foreign key (`photo_id`) references `photo` (`id`) on update cascade on delete set null +) collate='utf8mb4_unicode_520_ci'; + + + +drop table if exists `album_photo`; + +CREATE TABLE `album_photo` ( + `id` int(11) unsigned not null AUTO_INCREMENT, + `photo_id` int(11) unsigned null default null, + `album_id` int(11) unsigned null default null, + `position` int(10) unsigned not null default '999999999', + primary key (`id`) using BTREE, + unique index `UQ_cadf1c545153612614511f15197cae7b6dacac97` (`album_id`, `photo_id`) using BTREE, + index `index_foreignkey_album_photo_photo` (`photo_id`) using BTREE, + index `index_foreignkey_album_photo_album` (`album_id`) using BTREE, + constraint `c_fk_album_photo_album_id` foreign key (`album_id`) references `album` (`id`) on update cascade on delete cascade, + constraint `c_fk_album_photo_photo_id` foreign key (`photo_id`) references `photo` (`id`) on update cascade on delete cascade +) collate='utf8mb4_unicode_520_ci'; + + + drop table if exists `complex_default`; create table complex_default @@ -172,6 +205,31 @@ CREATE TABLE private.`co_orders_x_products` ( +drop table if exists `photo`; + +CREATE TABLE `photo` ( + `id` int(10) unsigned not null auto_increment, + `date_uploaded` datetime not null default current_timestamp(), + `original_filename` text not null collate 'utf8mb4_unicode_520_ci', + `path` text not null collate 'utf8mb4_unicode_520_ci', + `width` smallint(11) unsigned not null, + `height` smallint(11) unsigned not null, + `thumb_path` text not null collate 'utf8mb4_unicode_520_ci', + `thumb_width` smallint(5) unsigned not null, + `thumb_height` smallint(5) unsigned not null, + `display_path` text not null collate 'utf8mb4_unicode_520_ci', + `display_width` smallint(5) unsigned not null, + `display_height` smallint(5) unsigned not null, + `mime_type` VARCHAR(255) not null collate 'utf8mb4_unicode_520_ci', + `filesize` int(11) unsigned NULL DEFAULT NULL comment 'In bytes', + `phash` bigint(255) unsigned not null, + `battles` int(10) unsigned not null DEFAULT '0', + `wins` int(10) unsigned not null DEFAULT '0', + primary key (`id`) using BTREE +) collate='utf8mb4_unicode_520_ci'; + + + drop table if exists `co_products`; CREATE TABLE `co_products` ( diff --git a/tests/_data/assets/schemas/pgsql.sql b/tests/_data/assets/schemas/pgsql.sql index f90a0911fd..8f7afc2489 100644 --- a/tests/_data/assets/schemas/pgsql.sql +++ b/tests/_data/assets/schemas/pgsql.sql @@ -1,5 +1,9 @@ + + + + drop table if exists complex_default; create table complex_default @@ -128,6 +132,8 @@ create table private.co_orders_x_products + + drop table if exists co_products; create table co_products diff --git a/tests/_data/assets/schemas/sqlite.sql b/tests/_data/assets/schemas/sqlite.sql index 74bdccc4f5..d7a8198922 100644 --- a/tests/_data/assets/schemas/sqlite.sql +++ b/tests/_data/assets/schemas/sqlite.sql @@ -2,6 +2,10 @@ + + + + drop table if exists co_customers_defaults; create table co_customers_defaults @@ -88,6 +92,8 @@ create table objects + + drop table if exists co_setters; create table co_setters diff --git a/tests/_data/fixtures/Migrations/AbstractMigration.php b/tests/_data/fixtures/Migrations/AbstractMigration.php index f9e7dda791..9c6e46f4e2 100644 --- a/tests/_data/fixtures/Migrations/AbstractMigration.php +++ b/tests/_data/fixtures/Migrations/AbstractMigration.php @@ -42,7 +42,7 @@ final public function __construct(PDO $connection = null) { $this->connection = $connection; - $this->clear(); + //$this->clear(); } /** diff --git a/tests/_data/fixtures/Migrations/AlbumMigration.php b/tests/_data/fixtures/Migrations/AlbumMigration.php new file mode 100644 index 0000000000..7cb20f4923 --- /dev/null +++ b/tests/_data/fixtures/Migrations/AlbumMigration.php @@ -0,0 +1,93 @@ + + * + * For the full copyright and license information, please view the + * LICENSE.txt file that was distributed with this source code. + */ + +declare(strict_types=1); + +namespace Phalcon\Tests\Fixtures\Migrations; + +use PHPUnit\Framework\Assert; + +class AlbumMigration extends AbstractMigration +{ + protected $table = 'album'; + + /** + * @param int $id + * @param string $title + * @param int|null $albumId + * @param int|null $photoId + * + * @return int + */ + public function insert( + $id, + string $name, + int $albumId = null, + int $photoId = null + ): int { + + $id = $id ?: 'null'; + $sql = <<connection->exec($sql)) { + $table = $this->getTable(); + $driver = $this->getDriverName(); + Assert::fail( + sprintf("Failed to insert row #%d into table '%s' using '%s' driver", $id, $table, $driver) + ); + } + + return $result; + } + + protected function getSqlMysql(): array + { + return [ + " +drop table if exists `album`; + ", + " +CREATE TABLE `album` ( + `id` int(11) UNSIGNED not null AUTO_INCREMENT, + `name` varchar(100) not null collate 'utf8mb4_unicode_520_ci', + `album_id` int(11) unsigned null default null, + `photo_id` int(11) unsigned null default null COMMENT 'The ID of the featured photo', + primary key (`id`) using BTREE, + index `index_foreignkey_album_album` (`album_id`) using BTREE, + index `album_ibfk_2` (`photo_id`) using BTREE, + constraint `album_ibfk_1` foreign key (`album_id`) references `album` (`id`) on update cascade on delete cascade, + constraint `album_ibfk_2` foreign key (`photo_id`) references `photo` (`id`) on update cascade on delete set null +) collate='utf8mb4_unicode_520_ci'; + ", + ]; + } + + protected function getSqlSqlite(): array + { + return []; + } + + protected function getSqlSqlsrv(): array + { + return []; + } + + protected function getSqlPgsql(): array + { + return []; + } +} diff --git a/tests/_data/fixtures/Migrations/AlbumPhotoMigration.php b/tests/_data/fixtures/Migrations/AlbumPhotoMigration.php new file mode 100644 index 0000000000..8abe2034dc --- /dev/null +++ b/tests/_data/fixtures/Migrations/AlbumPhotoMigration.php @@ -0,0 +1,65 @@ + + * + * For the full copyright and license information, please view the + * LICENSE.txt file that was distributed with this source code. + */ + +declare(strict_types=1); + +namespace Phalcon\Tests\Fixtures\Migrations; + +class AlbumPhotoMigration extends AbstractMigration +{ + protected $table = 'album_photo'; + + /** + * @return int + */ + public function insert(): int + { + return 0; + } + + protected function getSqlMysql(): array + { + return [ + " +drop table if exists `album_photo`; + ", + " +CREATE TABLE `album_photo` ( + `id` int(11) unsigned not null AUTO_INCREMENT, + `photo_id` int(11) unsigned null default null, + `album_id` int(11) unsigned null default null, + `position` int(10) unsigned not null default '999999999', + primary key (`id`) using BTREE, + unique index `UQ_cadf1c545153612614511f15197cae7b6dacac97` (`album_id`, `photo_id`) using BTREE, + index `index_foreignkey_album_photo_photo` (`photo_id`) using BTREE, + index `index_foreignkey_album_photo_album` (`album_id`) using BTREE, + constraint `c_fk_album_photo_album_id` foreign key (`album_id`) references `album` (`id`) on update cascade on delete cascade, + constraint `c_fk_album_photo_photo_id` foreign key (`photo_id`) references `photo` (`id`) on update cascade on delete cascade +) collate='utf8mb4_unicode_520_ci'; + ", + ]; + } + + protected function getSqlSqlite(): array + { + return []; + } + + protected function getSqlSqlsrv(): array + { + return []; + } + + protected function getSqlPgsql(): array + { + return []; + } +} diff --git a/tests/_data/fixtures/Migrations/PhotoMigration.php b/tests/_data/fixtures/Migrations/PhotoMigration.php new file mode 100644 index 0000000000..3aa98a4141 --- /dev/null +++ b/tests/_data/fixtures/Migrations/PhotoMigration.php @@ -0,0 +1,75 @@ + + * + * For the full copyright and license information, please view the + * LICENSE.txt file that was distributed with this source code. + */ + +declare(strict_types=1); + +namespace Phalcon\Tests\Fixtures\Migrations; + +use PHPUnit\Framework\Assert; + +class PhotoMigration extends AbstractMigration +{ + protected $table = 'photo'; + + /** + * @return int + */ + public function insert(): int + { + return 0; + } + + protected function getSqlMysql(): array + { + return [ + " +drop table if exists `photo`; + ", + " +CREATE TABLE `photo` ( + `id` int(10) unsigned not null auto_increment, + `date_uploaded` datetime not null default current_timestamp(), + `original_filename` text not null collate 'utf8mb4_unicode_520_ci', + `path` text not null collate 'utf8mb4_unicode_520_ci', + `width` smallint(11) unsigned not null, + `height` smallint(11) unsigned not null, + `thumb_path` text not null collate 'utf8mb4_unicode_520_ci', + `thumb_width` smallint(5) unsigned not null, + `thumb_height` smallint(5) unsigned not null, + `display_path` text not null collate 'utf8mb4_unicode_520_ci', + `display_width` smallint(5) unsigned not null, + `display_height` smallint(5) unsigned not null, + `mime_type` VARCHAR(255) not null collate 'utf8mb4_unicode_520_ci', + `filesize` int(11) unsigned NULL DEFAULT NULL comment 'In bytes', + `phash` bigint(255) unsigned not null, + `battles` int(10) unsigned not null DEFAULT '0', + `wins` int(10) unsigned not null DEFAULT '0', + primary key (`id`) using BTREE +) collate='utf8mb4_unicode_520_ci'; + ", + ]; + } + + protected function getSqlSqlite(): array + { + return []; + } + + protected function getSqlSqlsrv(): array + { + return []; + } + + protected function getSqlPgsql(): array + { + return []; + } +} diff --git a/tests/_data/fixtures/Traits/DiTrait.php b/tests/_data/fixtures/Traits/DiTrait.php index 5bd6f6c29b..6d4aa2c8f9 100644 --- a/tests/_data/fixtures/Traits/DiTrait.php +++ b/tests/_data/fixtures/Traits/DiTrait.php @@ -18,6 +18,7 @@ use Phalcon\Annotations\Adapter\Memory as AnnotationsMemory; use Phalcon\Cache\Adapter\Libmemcached as StorageLibmemcached; use Phalcon\Cache\Adapter\Stream as StorageStream; +use Phalcon\Cache\AdapterFactory; use Phalcon\Cli\Console; use Phalcon\Db\Profiler; use Phalcon\Encryption\Crypt; @@ -35,6 +36,8 @@ use Phalcon\Http\Response; use Phalcon\Mvc\Model\Manager as ModelsManager; use Phalcon\Mvc\Model\Metadata\Memory as MetadataMemory; +use Phalcon\Mvc\Model\Metadata\Libmemcached as MetadataMemcached; +use Phalcon\Mvc\Model\Metadata\Redis as MetadataRedis; use Phalcon\Mvc\View; use Phalcon\Mvc\View\Simple; use Phalcon\Session\Adapter\Libmemcached as SessionLibmemcached; @@ -171,6 +174,16 @@ protected function newService(string $service, $options = null) return (new Filter\FilterFactory())->newInstance(); case 'metadataMemory': return new MetadataMemory(); + case 'metadataLibmemcached': + return new MetadataMemcached( + new AdapterFactory(new SerializerFactory()), + getOptionsLibmemcached() + ); + case 'metadataRedis': + return new MetadataRedis( + new AdapterFactory(new SerializerFactory()), + getOptionsRedis() + ); case 'modelsCacheLibmemcached': return new StorageLibmemcached( new SerializerFactory(), diff --git a/tests/_data/fixtures/models/Album.php b/tests/_data/fixtures/models/Album.php new file mode 100644 index 0000000000..b0c105f93b --- /dev/null +++ b/tests/_data/fixtures/models/Album.php @@ -0,0 +1,24 @@ + + * + * For the full copyright and license information, please view the LICENSE.txt + * file that was distributed with this source code. + */ + +declare(strict_types=1); + +namespace Phalcon\Tests\Fixtures\models; + +use Phalcon\Mvc\Model; + +class Album extends Model +{ + public function initialize() + { + $this->setSource('album'); + } +} diff --git a/tests/_data/fixtures/models/AlbumPhoto.php b/tests/_data/fixtures/models/AlbumPhoto.php new file mode 100644 index 0000000000..e113a11799 --- /dev/null +++ b/tests/_data/fixtures/models/AlbumPhoto.php @@ -0,0 +1,24 @@ + + * + * For the full copyright and license information, please view the LICENSE.txt + * file that was distributed with this source code. + */ + +declare(strict_types=1); + +namespace Phalcon\Tests\Fixtures\models; + +use Phalcon\Mvc\Model; + +class AlbumPhoto extends Model +{ + public function initialize() + { + $this->setSource('album_photo'); + } +} diff --git a/tests/_data/fixtures/models/Photo.php b/tests/_data/fixtures/models/Photo.php new file mode 100644 index 0000000000..ca8448a602 --- /dev/null +++ b/tests/_data/fixtures/models/Photo.php @@ -0,0 +1,24 @@ + + * + * For the full copyright and license information, please view the LICENSE.txt + * file that was distributed with this source code. + */ + +declare(strict_types=1); + +namespace Phalcon\Tests\Fixtures\models; + +use Phalcon\Mvc\Model; + +class Photo extends Model +{ + public function initialize() + { + $this->setSource('photo'); + } +} diff --git a/tests/database/Mvc/Model/MetaData/Adapter/ReadMetadataCest.php b/tests/database/Mvc/Model/MetaData/Adapter/ReadMetadataCest.php new file mode 100644 index 0000000000..5c754df488 --- /dev/null +++ b/tests/database/Mvc/Model/MetaData/Adapter/ReadMetadataCest.php @@ -0,0 +1,616 @@ + + * + * For the full copyright and license information, please view the LICENSE.txt + * file that was distributed with this source code. + */ + +declare(strict_types=1); + +namespace Phalcon\Tests\Database\Mvc\Model\MetaData\Adapter; + +use Codeception\Example; +use DatabaseTester; +use Phalcon\Mvc\Model\MetaData; +use Phalcon\Storage\Exception; +use Phalcon\Tests\Fixtures\Migrations\AlbumMigration; +use Phalcon\Tests\Fixtures\Migrations\AlbumPhotoMigration; +use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration; +use Phalcon\Tests\Fixtures\Migrations\PhotoMigration; +use Phalcon\Tests\Fixtures\models\Album; +use Phalcon\Tests\Fixtures\models\AlbumPhoto; +use Phalcon\Tests\Fixtures\models\Photo; +use Phalcon\Tests\Fixtures\Traits\DiTrait; +use Phalcon\Tests\Models\Invoices; +use function array_keys; +use function uniqid; +use function unserialize; + +class ReadMetadataCest +{ + use DiTrait; + + public function _before(DatabaseTester $I) + { + $this->setNewFactoryDefault(); + $this->setDatabase($I); + } + + /** + * Tests Phalcon\Mvc\Model\MetaData :: getAttributes() - Redis + * + * @dataProvider getExamples + * + * @param DatabaseTester $I + * @param Example $example + * + * @author Phalcon Team + * @since 2023-07-01 + * + * @group mysql + * + * @return void + * @throws Exception + */ + public function mvcModelMetadataGetAttributesRedis( + DatabaseTester $I, + Example $example + ) { + $keys = $example['keys']; + $service = $example['service']; + + $I->wantToTest('Mvc\Model\MetaData - readMetadata() - ' . $service); + + $connection = $I->getConnection(); + $adapter = $this->newService($service); + + /** + * Cleanup Redis + */ + $adapter->reset(); + + $this->container->setShared('modelsMetadata', $adapter); + + (new PhotoMigration($connection)); + (new AlbumMigration($connection)); + (new AlbumPhotoMigration($connection)); + + /** @var MetaData $metadata */ + $metadata = $this->container->get('modelsMetadata'); + + $model = new Album(); + $expected = [ + 'id', + 'name', + 'album_id', + 'photo_id', + ]; + $actual = $metadata->getAttributes($model); + $I->assertEquals($expected, $actual); + + $model = new AlbumPhoto(); + $expected = [ + 'id', + 'photo_id', + 'album_id', + 'position', + ]; + $actual = $metadata->getAttributes($model); + $I->assertEquals($expected, $actual); + + $model = new Photo(); + $expected = [ + 'id', + 'date_uploaded', + 'original_filename', + 'path', + 'width', + 'height', + 'thumb_path', + 'thumb_width', + 'thumb_height', + 'display_path', + 'display_width', + 'display_height', + 'mime_type', + 'filesize', + 'phash', + 'battles', + 'wins', + ]; + $actual = $metadata->getAttributes($model); + $I->assertEquals($expected, $actual); + + $service = $adapter->getAdapter(); + + /** + * Check if keys exist + */ + $keyKeys = array_keys($keys); + foreach ($keyKeys as $key) { + $actual = $service->has($key); + $I->assertTrue($actual); + } + + /** + * Check contents of the keys + */ + foreach ($keys as $key => $expected) { + $actual = $service->get($key); + $I->assertSame($expected, $actual); + } + } + + /** + * @return array[] + */ + private function getExamples(): array + { + return [ + [ + 'service' => 'metadataRedis', + 'keys' => [ + 'meta-phalcon\tests\fixtures\models\albumphoto-album_photo' => [ + 0 => [ + 'id', + 'photo_id', + 'album_id', + 'position', + ], + 1 => [ + 'id' + ], + 2 => [ + 'photo_id', + 'album_id', + 'position', + ], + 3 => [ + 'id', + 'position', + ], + 4 => [ + 'id' => 0, + 'photo_id' => 0, + 'album_id' => 0, + 'position' => 0, + ], + 5 => [ + 'id' => true, + 'photo_id' => true, + 'album_id' => true, + 'position' => true, + ], + 8 => 'id', + 9 => [ + 'id' => 1, + 'photo_id' => 1, + 'album_id' => 1, + 'position' => 1, + ], + 10 => [], + 11 => [], + 12 => [ + 'photo_id' => null, + 'album_id' => null, + 'position' => '999999999', + ], + 13 => [], + ], + 'map-phalcon\tests\fixtures\models\album' => [ + 0 => null, + 1 => null, + ], + 'map-phalcon\tests\fixtures\models\albumphoto' => [ + 0 => null, + 1 => null, + ], + 'meta-phalcon\tests\fixtures\models\photo-photo' => [ + 0 => [ + 'id', + 'date_uploaded', + 'original_filename', + 'path', + 'width', + 'height', + 'thumb_path', + 'thumb_width', + 'thumb_height', + 'display_path', + 'display_width', + 'display_height', + 'mime_type', + 'filesize', + 'phash', + 'battles', + 'wins', + ], + 1 => [ + 'id' + ], + 2 => [ + 'date_uploaded', + 'original_filename', + 'path', + 'width', + 'height', + 'thumb_path', + 'thumb_width', + 'thumb_height', + 'display_path', + 'display_width', + 'display_height', + 'mime_type', + 'filesize', + 'phash', + 'battles', + 'wins', + ], + 3 => [ + 'id', + 'date_uploaded', + 'original_filename', + 'path', + 'width', + 'height', + 'thumb_path', + 'thumb_width', + 'thumb_height', + 'display_path', + 'display_width', + 'display_height', + 'mime_type', + 'phash', + 'battles', + 'wins', + ], + 4 => [ + 'id' => 0, + 'date_uploaded' => 4, + 'original_filename' => 6, + 'path' => 6, + 'width' => 22, + 'height' => 22, + 'thumb_path' => 6, + 'thumb_width' => 22, + 'thumb_height' => 22, + 'display_path' => 6, + 'display_width' => 22, + 'display_height' => 22, + 'mime_type' => 2, + 'filesize' => 0, + 'phash' => 14, + 'battles' => 0, + 'wins' => 0, + ], + 5 => [ + 'id' => true, + 'width' => true, + 'height' => true, + 'thumb_width' => true, + 'thumb_height' => true, + 'display_width' => true, + 'display_height' => true, + 'filesize' => true, + 'phash' => true, + 'battles' => true, + 'wins' => true, + ], + 8 => 'id', + 9 => [ + 'id' => 1, + 'date_uploaded' => 2, + 'original_filename' => 2, + 'path' => 2, + 'width' => 1, + 'height' => 1, + 'thumb_path' => 2, + 'thumb_width' => 1, + 'thumb_height' => 1, + 'display_path' => 2, + 'display_width' => 1, + 'display_height' => 1, + 'mime_type' => 2, + 'filesize' => 1, + 'phash' => 2, + 'battles' => 1, + 'wins' => 1, + ], + 10 => [], + 11 => [], + 12 => [ + 'date_uploaded' => 'CURRENT_TIMESTAMP', + 'filesize' => null, + 'battles' => '0', + 'wins' => '0', + ], + 13 => [], + ], + 'map-phalcon\tests\fixtures\models\photo' => [ + 0 => null, + 1 => null, + ], + 'meta-phalcon\tests\fixtures\models\album-album' => [ + 0 => [ + 'id', + 'name', + 'album_id', + 'photo_id', + ], + 1 => [ + 'id', + ], + 2 => [ + 'name', + 'album_id', + 'photo_id', + ], + 3 => [ + 'id', + 'name', + ], + 4 => [ + 'id' => 0, + 'name' => 2, + 'album_id' => 0, + 'photo_id' => 0, + ], + 5 => [ + 'id' => true, + 'album_id' => true, + 'photo_id' => true, + ], + 8 => 'id', + 9 => [ + 'id' => 1, + 'name' => 2, + 'album_id' => 1, + 'photo_id' => 1, + ], + 10 => [], + 11 => [], + 12 => [ + 'album_id' => null, + 'photo_id' => null, + ], + 13 => [], + ], + ], + ], + [ + 'service' => 'metadataLibmemcached', + 'keys' => [ + 'meta-phalcon\tests\fixtures\models\albumphoto-album_photo' => [ + 0 => [ + 'id', + 'photo_id', + 'album_id', + 'position', + ], + 1 => [ + 'id' + ], + 2 => [ + 'photo_id', + 'album_id', + 'position', + ], + 3 => [ + 'id', + 'position', + ], + 4 => [ + 'id' => 0, + 'photo_id' => 0, + 'album_id' => 0, + 'position' => 0, + ], + 5 => [ + 'id' => true, + 'photo_id' => true, + 'album_id' => true, + 'position' => true, + ], + 8 => 'id', + 9 => [ + 'id' => 1, + 'photo_id' => 1, + 'album_id' => 1, + 'position' => 1, + ], + 10 => [], + 11 => [], + 12 => [ + 'photo_id' => null, + 'album_id' => null, + 'position' => '999999999', + ], + 13 => [], + ], + 'map-phalcon\tests\fixtures\models\album' => [ + 0 => null, + 1 => null, + ], + 'map-phalcon\tests\fixtures\models\albumphoto' => [ + 0 => null, + 1 => null, + ], + 'meta-phalcon\tests\fixtures\models\photo-photo' => [ + 0 => [ + 'id', + 'date_uploaded', + 'original_filename', + 'path', + 'width', + 'height', + 'thumb_path', + 'thumb_width', + 'thumb_height', + 'display_path', + 'display_width', + 'display_height', + 'mime_type', + 'filesize', + 'phash', + 'battles', + 'wins', + ], + 1 => [ + 'id' + ], + 2 => [ + 'date_uploaded', + 'original_filename', + 'path', + 'width', + 'height', + 'thumb_path', + 'thumb_width', + 'thumb_height', + 'display_path', + 'display_width', + 'display_height', + 'mime_type', + 'filesize', + 'phash', + 'battles', + 'wins', + ], + 3 => [ + 'id', + 'date_uploaded', + 'original_filename', + 'path', + 'width', + 'height', + 'thumb_path', + 'thumb_width', + 'thumb_height', + 'display_path', + 'display_width', + 'display_height', + 'mime_type', + 'phash', + 'battles', + 'wins', + ], + 4 => [ + 'id' => 0, + 'date_uploaded' => 4, + 'original_filename' => 6, + 'path' => 6, + 'width' => 22, + 'height' => 22, + 'thumb_path' => 6, + 'thumb_width' => 22, + 'thumb_height' => 22, + 'display_path' => 6, + 'display_width' => 22, + 'display_height' => 22, + 'mime_type' => 2, + 'filesize' => 0, + 'phash' => 14, + 'battles' => 0, + 'wins' => 0, + ], + 5 => [ + 'id' => true, + 'width' => true, + 'height' => true, + 'thumb_width' => true, + 'thumb_height' => true, + 'display_width' => true, + 'display_height' => true, + 'filesize' => true, + 'phash' => true, + 'battles' => true, + 'wins' => true, + ], + 8 => 'id', + 9 => [ + 'id' => 1, + 'date_uploaded' => 2, + 'original_filename' => 2, + 'path' => 2, + 'width' => 1, + 'height' => 1, + 'thumb_path' => 2, + 'thumb_width' => 1, + 'thumb_height' => 1, + 'display_path' => 2, + 'display_width' => 1, + 'display_height' => 1, + 'mime_type' => 2, + 'filesize' => 1, + 'phash' => 2, + 'battles' => 1, + 'wins' => 1, + ], + 10 => [], + 11 => [], + 12 => [ + 'date_uploaded' => 'CURRENT_TIMESTAMP', + 'filesize' => null, + 'battles' => '0', + 'wins' => '0', + ], + 13 => [], + ], + 'map-phalcon\tests\fixtures\models\photo' => [ + 0 => null, + 1 => null, + ], + 'meta-phalcon\tests\fixtures\models\album-album' => [ + 0 => [ + 'id', + 'name', + 'album_id', + 'photo_id', + ], + 1 => [ + 'id', + ], + 2 => [ + 'name', + 'album_id', + 'photo_id', + ], + 3 => [ + 'id', + 'name', + ], + 4 => [ + 'id' => 0, + 'name' => 2, + 'album_id' => 0, + 'photo_id' => 0, + ], + 5 => [ + 'id' => true, + 'album_id' => true, + 'photo_id' => true, + ], + 8 => 'id', + 9 => [ + 'id' => 1, + 'name' => 2, + 'album_id' => 1, + 'photo_id' => 1, + ], + 10 => [], + 11 => [], + 12 => [ + 'album_id' => null, + 'photo_id' => null, + ], + 13 => [], + ], + ], + ], + ]; + } +} From 5067a02dc0bf361a26b5364e199864346f50224b Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Sun, 2 Jul 2023 13:55:26 -0400 Subject: [PATCH 06/35] adjusted migration clear --- .../fixtures/Migrations/AbstractMigration.php | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/tests/_data/fixtures/Migrations/AbstractMigration.php b/tests/_data/fixtures/Migrations/AbstractMigration.php index 9c6e46f4e2..943e9bfbea 100644 --- a/tests/_data/fixtures/Migrations/AbstractMigration.php +++ b/tests/_data/fixtures/Migrations/AbstractMigration.php @@ -42,7 +42,7 @@ final public function __construct(PDO $connection = null) { $this->connection = $connection; - //$this->clear(); + $this->clear(); } /** @@ -89,22 +89,8 @@ public function clear(): int return 0; } - $driver = $this->getDriverName(); - - if ($driver === 'mysql') { - return $this->connection->exec( - 'truncate table ' . $this->table . ';' - ); - } - - if ($driver === 'sqlite') { - return $this->connection->exec( - 'delete from ' . $this->table . ';' - ); - } - return $this->connection->exec( - 'truncate table ' . $this->table . ' cascade;' + 'delete from ' . $this->table . ';' ); } From 6c1cb859307e13bb1091e50c683faa89f503c5e1 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Sun, 2 Jul 2023 13:55:39 -0400 Subject: [PATCH 07/35] added getAdapter() for Metadata --- phalcon/Mvc/Model/MetaData.zep | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/phalcon/Mvc/Model/MetaData.zep b/phalcon/Mvc/Model/MetaData.zep index c3380ee3c3..f8c6bd86a6 100644 --- a/phalcon/Mvc/Model/MetaData.zep +++ b/phalcon/Mvc/Model/MetaData.zep @@ -81,6 +81,11 @@ abstract class MetaData implements InjectionAwareInterface, MetaDataInterface */ protected strategy = null; + public function getAdapter() -> var + { + return this->adapter; + } + /** * Returns table attributes names (fields) * From 1d2ae1dc55c168907678a4d75cb6814f87d74c9d Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Sun, 2 Jul 2023 20:11:55 -0400 Subject: [PATCH 08/35] phpcs --- .../MetaData/Adapter/ReadMetadataCest.php | 227 +++++++++--------- 1 file changed, 112 insertions(+), 115 deletions(-) diff --git a/tests/database/Mvc/Model/MetaData/Adapter/ReadMetadataCest.php b/tests/database/Mvc/Model/MetaData/Adapter/ReadMetadataCest.php index 5c754df488..daecae1d0a 100644 --- a/tests/database/Mvc/Model/MetaData/Adapter/ReadMetadataCest.php +++ b/tests/database/Mvc/Model/MetaData/Adapter/ReadMetadataCest.php @@ -19,16 +19,13 @@ use Phalcon\Storage\Exception; use Phalcon\Tests\Fixtures\Migrations\AlbumMigration; use Phalcon\Tests\Fixtures\Migrations\AlbumPhotoMigration; -use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration; use Phalcon\Tests\Fixtures\Migrations\PhotoMigration; use Phalcon\Tests\Fixtures\models\Album; use Phalcon\Tests\Fixtures\models\AlbumPhoto; use Phalcon\Tests\Fixtures\models\Photo; use Phalcon\Tests\Fixtures\Traits\DiTrait; -use Phalcon\Tests\Models\Invoices; + use function array_keys; -use function uniqid; -use function unserialize; class ReadMetadataCest { @@ -48,19 +45,19 @@ public function _before(DatabaseTester $I) * @param DatabaseTester $I * @param Example $example * + * @return void + * @throws Exception * @author Phalcon Team * @since 2023-07-01 * * @group mysql * - * @return void - * @throws Exception */ public function mvcModelMetadataGetAttributesRedis( DatabaseTester $I, Example $example ) { - $keys = $example['keys']; + $keys = $example['keys']; $service = $example['service']; $I->wantToTest('Mvc\Model\MetaData - readMetadata() - ' . $service); @@ -153,7 +150,7 @@ private function getExamples(): array return [ [ 'service' => 'metadataRedis', - 'keys' => [ + 'keys' => [ 'meta-phalcon\tests\fixtures\models\albumphoto-album_photo' => [ 0 => [ 'id', @@ -201,11 +198,11 @@ private function getExamples(): array ], 13 => [], ], - 'map-phalcon\tests\fixtures\models\album' => [ + 'map-phalcon\tests\fixtures\models\album' => [ 0 => null, 1 => null, ], - 'map-phalcon\tests\fixtures\models\albumphoto' => [ + 'map-phalcon\tests\fixtures\models\albumphoto' => [ 0 => null, 1 => null, ], @@ -269,68 +266,68 @@ private function getExamples(): array 'wins', ], 4 => [ - 'id' => 0, - 'date_uploaded' => 4, + 'id' => 0, + 'date_uploaded' => 4, 'original_filename' => 6, - 'path' => 6, - 'width' => 22, - 'height' => 22, - 'thumb_path' => 6, - 'thumb_width' => 22, - 'thumb_height' => 22, - 'display_path' => 6, - 'display_width' => 22, - 'display_height' => 22, - 'mime_type' => 2, - 'filesize' => 0, - 'phash' => 14, - 'battles' => 0, - 'wins' => 0, + 'path' => 6, + 'width' => 22, + 'height' => 22, + 'thumb_path' => 6, + 'thumb_width' => 22, + 'thumb_height' => 22, + 'display_path' => 6, + 'display_width' => 22, + 'display_height' => 22, + 'mime_type' => 2, + 'filesize' => 0, + 'phash' => 14, + 'battles' => 0, + 'wins' => 0, ], 5 => [ - 'id' => true, - 'width' => true, - 'height' => true, - 'thumb_width' => true, - 'thumb_height' => true, - 'display_width' => true, + 'id' => true, + 'width' => true, + 'height' => true, + 'thumb_width' => true, + 'thumb_height' => true, + 'display_width' => true, 'display_height' => true, - 'filesize' => true, - 'phash' => true, - 'battles' => true, - 'wins' => true, + 'filesize' => true, + 'phash' => true, + 'battles' => true, + 'wins' => true, ], 8 => 'id', 9 => [ - 'id' => 1, - 'date_uploaded' => 2, + 'id' => 1, + 'date_uploaded' => 2, 'original_filename' => 2, - 'path' => 2, - 'width' => 1, - 'height' => 1, - 'thumb_path' => 2, - 'thumb_width' => 1, - 'thumb_height' => 1, - 'display_path' => 2, - 'display_width' => 1, - 'display_height' => 1, - 'mime_type' => 2, - 'filesize' => 1, - 'phash' => 2, - 'battles' => 1, - 'wins' => 1, + 'path' => 2, + 'width' => 1, + 'height' => 1, + 'thumb_path' => 2, + 'thumb_width' => 1, + 'thumb_height' => 1, + 'display_path' => 2, + 'display_width' => 1, + 'display_height' => 1, + 'mime_type' => 2, + 'filesize' => 1, + 'phash' => 2, + 'battles' => 1, + 'wins' => 1, ], 10 => [], 11 => [], 12 => [ 'date_uploaded' => 'CURRENT_TIMESTAMP', - 'filesize' => null, - 'battles' => '0', - 'wins' => '0', + 'filesize' => null, + 'battles' => '0', + 'wins' => '0', ], 13 => [], ], - 'map-phalcon\tests\fixtures\models\photo' => [ + 'map-phalcon\tests\fixtures\models\photo' => [ 0 => null, 1 => null, ], @@ -354,20 +351,20 @@ private function getExamples(): array 'name', ], 4 => [ - 'id' => 0, - 'name' => 2, + 'id' => 0, + 'name' => 2, 'album_id' => 0, 'photo_id' => 0, ], 5 => [ - 'id' => true, + 'id' => true, 'album_id' => true, 'photo_id' => true, ], 8 => 'id', 9 => [ - 'id' => 1, - 'name' => 2, + 'id' => 1, + 'name' => 2, 'album_id' => 1, 'photo_id' => 1, ], @@ -383,7 +380,7 @@ private function getExamples(): array ], [ 'service' => 'metadataLibmemcached', - 'keys' => [ + 'keys' => [ 'meta-phalcon\tests\fixtures\models\albumphoto-album_photo' => [ 0 => [ 'id', @@ -431,11 +428,11 @@ private function getExamples(): array ], 13 => [], ], - 'map-phalcon\tests\fixtures\models\album' => [ + 'map-phalcon\tests\fixtures\models\album' => [ 0 => null, 1 => null, ], - 'map-phalcon\tests\fixtures\models\albumphoto' => [ + 'map-phalcon\tests\fixtures\models\albumphoto' => [ 0 => null, 1 => null, ], @@ -499,68 +496,68 @@ private function getExamples(): array 'wins', ], 4 => [ - 'id' => 0, - 'date_uploaded' => 4, + 'id' => 0, + 'date_uploaded' => 4, 'original_filename' => 6, - 'path' => 6, - 'width' => 22, - 'height' => 22, - 'thumb_path' => 6, - 'thumb_width' => 22, - 'thumb_height' => 22, - 'display_path' => 6, - 'display_width' => 22, - 'display_height' => 22, - 'mime_type' => 2, - 'filesize' => 0, - 'phash' => 14, - 'battles' => 0, - 'wins' => 0, + 'path' => 6, + 'width' => 22, + 'height' => 22, + 'thumb_path' => 6, + 'thumb_width' => 22, + 'thumb_height' => 22, + 'display_path' => 6, + 'display_width' => 22, + 'display_height' => 22, + 'mime_type' => 2, + 'filesize' => 0, + 'phash' => 14, + 'battles' => 0, + 'wins' => 0, ], 5 => [ - 'id' => true, - 'width' => true, - 'height' => true, - 'thumb_width' => true, - 'thumb_height' => true, - 'display_width' => true, + 'id' => true, + 'width' => true, + 'height' => true, + 'thumb_width' => true, + 'thumb_height' => true, + 'display_width' => true, 'display_height' => true, - 'filesize' => true, - 'phash' => true, - 'battles' => true, - 'wins' => true, + 'filesize' => true, + 'phash' => true, + 'battles' => true, + 'wins' => true, ], 8 => 'id', 9 => [ - 'id' => 1, - 'date_uploaded' => 2, + 'id' => 1, + 'date_uploaded' => 2, 'original_filename' => 2, - 'path' => 2, - 'width' => 1, - 'height' => 1, - 'thumb_path' => 2, - 'thumb_width' => 1, - 'thumb_height' => 1, - 'display_path' => 2, - 'display_width' => 1, - 'display_height' => 1, - 'mime_type' => 2, - 'filesize' => 1, - 'phash' => 2, - 'battles' => 1, - 'wins' => 1, + 'path' => 2, + 'width' => 1, + 'height' => 1, + 'thumb_path' => 2, + 'thumb_width' => 1, + 'thumb_height' => 1, + 'display_path' => 2, + 'display_width' => 1, + 'display_height' => 1, + 'mime_type' => 2, + 'filesize' => 1, + 'phash' => 2, + 'battles' => 1, + 'wins' => 1, ], 10 => [], 11 => [], 12 => [ 'date_uploaded' => 'CURRENT_TIMESTAMP', - 'filesize' => null, - 'battles' => '0', - 'wins' => '0', + 'filesize' => null, + 'battles' => '0', + 'wins' => '0', ], 13 => [], ], - 'map-phalcon\tests\fixtures\models\photo' => [ + 'map-phalcon\tests\fixtures\models\photo' => [ 0 => null, 1 => null, ], @@ -584,20 +581,20 @@ private function getExamples(): array 'name', ], 4 => [ - 'id' => 0, - 'name' => 2, + 'id' => 0, + 'name' => 2, 'album_id' => 0, 'photo_id' => 0, ], 5 => [ - 'id' => true, + 'id' => true, 'album_id' => true, 'photo_id' => true, ], 8 => 'id', 9 => [ - 'id' => 1, - 'name' => 2, + 'id' => 1, + 'name' => 2, 'album_id' => 1, 'photo_id' => 1, ], From fdd69dd5d5a0e0fdcbfb2a1a310b35b194725240 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Sun, 2 Jul 2023 20:52:10 -0400 Subject: [PATCH 09/35] reformatting the tests --- .../MetaData/Adapter/ReadMetadataCest.php | 690 ++++++------------ 1 file changed, 236 insertions(+), 454 deletions(-) diff --git a/tests/database/Mvc/Model/MetaData/Adapter/ReadMetadataCest.php b/tests/database/Mvc/Model/MetaData/Adapter/ReadMetadataCest.php index daecae1d0a..eb5de03e35 100644 --- a/tests/database/Mvc/Model/MetaData/Adapter/ReadMetadataCest.php +++ b/tests/database/Mvc/Model/MetaData/Adapter/ReadMetadataCest.php @@ -150,464 +150,246 @@ private function getExamples(): array return [ [ 'service' => 'metadataRedis', - 'keys' => [ - 'meta-phalcon\tests\fixtures\models\albumphoto-album_photo' => [ - 0 => [ - 'id', - 'photo_id', - 'album_id', - 'position', - ], - 1 => [ - 'id' - ], - 2 => [ - 'photo_id', - 'album_id', - 'position', - ], - 3 => [ - 'id', - 'position', - ], - 4 => [ - 'id' => 0, - 'photo_id' => 0, - 'album_id' => 0, - 'position' => 0, - ], - 5 => [ - 'id' => true, - 'photo_id' => true, - 'album_id' => true, - 'position' => true, - ], - 8 => 'id', - 9 => [ - 'id' => 1, - 'photo_id' => 1, - 'album_id' => 1, - 'position' => 1, - ], - 10 => [], - 11 => [], - 12 => [ - 'photo_id' => null, - 'album_id' => null, - 'position' => '999999999', - ], - 13 => [], - ], - 'map-phalcon\tests\fixtures\models\album' => [ - 0 => null, - 1 => null, - ], - 'map-phalcon\tests\fixtures\models\albumphoto' => [ - 0 => null, - 1 => null, - ], - 'meta-phalcon\tests\fixtures\models\photo-photo' => [ - 0 => [ - 'id', - 'date_uploaded', - 'original_filename', - 'path', - 'width', - 'height', - 'thumb_path', - 'thumb_width', - 'thumb_height', - 'display_path', - 'display_width', - 'display_height', - 'mime_type', - 'filesize', - 'phash', - 'battles', - 'wins', - ], - 1 => [ - 'id' - ], - 2 => [ - 'date_uploaded', - 'original_filename', - 'path', - 'width', - 'height', - 'thumb_path', - 'thumb_width', - 'thumb_height', - 'display_path', - 'display_width', - 'display_height', - 'mime_type', - 'filesize', - 'phash', - 'battles', - 'wins', - ], - 3 => [ - 'id', - 'date_uploaded', - 'original_filename', - 'path', - 'width', - 'height', - 'thumb_path', - 'thumb_width', - 'thumb_height', - 'display_path', - 'display_width', - 'display_height', - 'mime_type', - 'phash', - 'battles', - 'wins', - ], - 4 => [ - 'id' => 0, - 'date_uploaded' => 4, - 'original_filename' => 6, - 'path' => 6, - 'width' => 22, - 'height' => 22, - 'thumb_path' => 6, - 'thumb_width' => 22, - 'thumb_height' => 22, - 'display_path' => 6, - 'display_width' => 22, - 'display_height' => 22, - 'mime_type' => 2, - 'filesize' => 0, - 'phash' => 14, - 'battles' => 0, - 'wins' => 0, - ], - 5 => [ - 'id' => true, - 'width' => true, - 'height' => true, - 'thumb_width' => true, - 'thumb_height' => true, - 'display_width' => true, - 'display_height' => true, - 'filesize' => true, - 'phash' => true, - 'battles' => true, - 'wins' => true, - ], - 8 => 'id', - 9 => [ - 'id' => 1, - 'date_uploaded' => 2, - 'original_filename' => 2, - 'path' => 2, - 'width' => 1, - 'height' => 1, - 'thumb_path' => 2, - 'thumb_width' => 1, - 'thumb_height' => 1, - 'display_path' => 2, - 'display_width' => 1, - 'display_height' => 1, - 'mime_type' => 2, - 'filesize' => 1, - 'phash' => 2, - 'battles' => 1, - 'wins' => 1, - ], - 10 => [], - 11 => [], - 12 => [ - 'date_uploaded' => 'CURRENT_TIMESTAMP', - 'filesize' => null, - 'battles' => '0', - 'wins' => '0', - ], - 13 => [], - ], - 'map-phalcon\tests\fixtures\models\photo' => [ - 0 => null, - 1 => null, - ], - 'meta-phalcon\tests\fixtures\models\album-album' => [ - 0 => [ - 'id', - 'name', - 'album_id', - 'photo_id', - ], - 1 => [ - 'id', - ], - 2 => [ - 'name', - 'album_id', - 'photo_id', - ], - 3 => [ - 'id', - 'name', - ], - 4 => [ - 'id' => 0, - 'name' => 2, - 'album_id' => 0, - 'photo_id' => 0, - ], - 5 => [ - 'id' => true, - 'album_id' => true, - 'photo_id' => true, - ], - 8 => 'id', - 9 => [ - 'id' => 1, - 'name' => 2, - 'album_id' => 1, - 'photo_id' => 1, - ], - 10 => [], - 11 => [], - 12 => [ - 'album_id' => null, - 'photo_id' => null, - ], - 13 => [], - ], - ], + 'keys' => $this->getKeyData(), ], [ 'service' => 'metadataLibmemcached', - 'keys' => [ - 'meta-phalcon\tests\fixtures\models\albumphoto-album_photo' => [ - 0 => [ - 'id', - 'photo_id', - 'album_id', - 'position', - ], - 1 => [ - 'id' - ], - 2 => [ - 'photo_id', - 'album_id', - 'position', - ], - 3 => [ - 'id', - 'position', - ], - 4 => [ - 'id' => 0, - 'photo_id' => 0, - 'album_id' => 0, - 'position' => 0, - ], - 5 => [ - 'id' => true, - 'photo_id' => true, - 'album_id' => true, - 'position' => true, - ], - 8 => 'id', - 9 => [ - 'id' => 1, - 'photo_id' => 1, - 'album_id' => 1, - 'position' => 1, - ], - 10 => [], - 11 => [], - 12 => [ - 'photo_id' => null, - 'album_id' => null, - 'position' => '999999999', - ], - 13 => [], - ], - 'map-phalcon\tests\fixtures\models\album' => [ - 0 => null, - 1 => null, - ], - 'map-phalcon\tests\fixtures\models\albumphoto' => [ - 0 => null, - 1 => null, - ], - 'meta-phalcon\tests\fixtures\models\photo-photo' => [ - 0 => [ - 'id', - 'date_uploaded', - 'original_filename', - 'path', - 'width', - 'height', - 'thumb_path', - 'thumb_width', - 'thumb_height', - 'display_path', - 'display_width', - 'display_height', - 'mime_type', - 'filesize', - 'phash', - 'battles', - 'wins', - ], - 1 => [ - 'id' - ], - 2 => [ - 'date_uploaded', - 'original_filename', - 'path', - 'width', - 'height', - 'thumb_path', - 'thumb_width', - 'thumb_height', - 'display_path', - 'display_width', - 'display_height', - 'mime_type', - 'filesize', - 'phash', - 'battles', - 'wins', - ], - 3 => [ - 'id', - 'date_uploaded', - 'original_filename', - 'path', - 'width', - 'height', - 'thumb_path', - 'thumb_width', - 'thumb_height', - 'display_path', - 'display_width', - 'display_height', - 'mime_type', - 'phash', - 'battles', - 'wins', - ], - 4 => [ - 'id' => 0, - 'date_uploaded' => 4, - 'original_filename' => 6, - 'path' => 6, - 'width' => 22, - 'height' => 22, - 'thumb_path' => 6, - 'thumb_width' => 22, - 'thumb_height' => 22, - 'display_path' => 6, - 'display_width' => 22, - 'display_height' => 22, - 'mime_type' => 2, - 'filesize' => 0, - 'phash' => 14, - 'battles' => 0, - 'wins' => 0, - ], - 5 => [ - 'id' => true, - 'width' => true, - 'height' => true, - 'thumb_width' => true, - 'thumb_height' => true, - 'display_width' => true, - 'display_height' => true, - 'filesize' => true, - 'phash' => true, - 'battles' => true, - 'wins' => true, - ], - 8 => 'id', - 9 => [ - 'id' => 1, - 'date_uploaded' => 2, - 'original_filename' => 2, - 'path' => 2, - 'width' => 1, - 'height' => 1, - 'thumb_path' => 2, - 'thumb_width' => 1, - 'thumb_height' => 1, - 'display_path' => 2, - 'display_width' => 1, - 'display_height' => 1, - 'mime_type' => 2, - 'filesize' => 1, - 'phash' => 2, - 'battles' => 1, - 'wins' => 1, - ], - 10 => [], - 11 => [], - 12 => [ - 'date_uploaded' => 'CURRENT_TIMESTAMP', - 'filesize' => null, - 'battles' => '0', - 'wins' => '0', - ], - 13 => [], - ], - 'map-phalcon\tests\fixtures\models\photo' => [ - 0 => null, - 1 => null, - ], - 'meta-phalcon\tests\fixtures\models\album-album' => [ - 0 => [ - 'id', - 'name', - 'album_id', - 'photo_id', - ], - 1 => [ - 'id', - ], - 2 => [ - 'name', - 'album_id', - 'photo_id', - ], - 3 => [ - 'id', - 'name', - ], - 4 => [ - 'id' => 0, - 'name' => 2, - 'album_id' => 0, - 'photo_id' => 0, - ], - 5 => [ - 'id' => true, - 'album_id' => true, - 'photo_id' => true, - ], - 8 => 'id', - 9 => [ - 'id' => 1, - 'name' => 2, - 'album_id' => 1, - 'photo_id' => 1, - ], - 10 => [], - 11 => [], - 12 => [ - 'album_id' => null, - 'photo_id' => null, - ], - 13 => [], - ], - ], + 'keys' => $this->getKeyData(), ], ]; } + + /** + * @return array + */ + private function getKeyData(): array + { + return [ + 'meta-phalcon\tests\fixtures\models\albumphoto-album_photo' => [ + 0 => [ + 'id', + 'photo_id', + 'album_id', + 'position', + ], + 1 => [ + 'id' + ], + 2 => [ + 'photo_id', + 'album_id', + 'position', + ], + 3 => [ + 'id', + 'position', + ], + 4 => [ + 'id' => 0, + 'photo_id' => 0, + 'album_id' => 0, + 'position' => 0, + ], + 5 => [ + 'id' => true, + 'photo_id' => true, + 'album_id' => true, + 'position' => true, + ], + 8 => 'id', + 9 => [ + 'id' => 1, + 'photo_id' => 1, + 'album_id' => 1, + 'position' => 1, + ], + 10 => [], + 11 => [], + 12 => [ + 'photo_id' => null, + 'album_id' => null, + 'position' => '999999999', + ], + 13 => [], + ], + 'map-phalcon\tests\fixtures\models\album' => [ + 0 => null, + 1 => null, + ], + 'map-phalcon\tests\fixtures\models\albumphoto' => [ + 0 => null, + 1 => null, + ], + 'meta-phalcon\tests\fixtures\models\photo-photo' => [ + 0 => [ + 'id', + 'date_uploaded', + 'original_filename', + 'path', + 'width', + 'height', + 'thumb_path', + 'thumb_width', + 'thumb_height', + 'display_path', + 'display_width', + 'display_height', + 'mime_type', + 'filesize', + 'phash', + 'battles', + 'wins', + ], + 1 => [ + 'id' + ], + 2 => [ + 'date_uploaded', + 'original_filename', + 'path', + 'width', + 'height', + 'thumb_path', + 'thumb_width', + 'thumb_height', + 'display_path', + 'display_width', + 'display_height', + 'mime_type', + 'filesize', + 'phash', + 'battles', + 'wins', + ], + 3 => [ + 'id', + 'date_uploaded', + 'original_filename', + 'path', + 'width', + 'height', + 'thumb_path', + 'thumb_width', + 'thumb_height', + 'display_path', + 'display_width', + 'display_height', + 'mime_type', + 'phash', + 'battles', + 'wins', + ], + 4 => [ + 'id' => 0, + 'date_uploaded' => 4, + 'original_filename' => 6, + 'path' => 6, + 'width' => 22, + 'height' => 22, + 'thumb_path' => 6, + 'thumb_width' => 22, + 'thumb_height' => 22, + 'display_path' => 6, + 'display_width' => 22, + 'display_height' => 22, + 'mime_type' => 2, + 'filesize' => 0, + 'phash' => 14, + 'battles' => 0, + 'wins' => 0, + ], + 5 => [ + 'id' => true, + 'width' => true, + 'height' => true, + 'thumb_width' => true, + 'thumb_height' => true, + 'display_width' => true, + 'display_height' => true, + 'filesize' => true, + 'phash' => true, + 'battles' => true, + 'wins' => true, + ], + 8 => 'id', + 9 => [ + 'id' => 1, + 'date_uploaded' => 2, + 'original_filename' => 2, + 'path' => 2, + 'width' => 1, + 'height' => 1, + 'thumb_path' => 2, + 'thumb_width' => 1, + 'thumb_height' => 1, + 'display_path' => 2, + 'display_width' => 1, + 'display_height' => 1, + 'mime_type' => 2, + 'filesize' => 1, + 'phash' => 2, + 'battles' => 1, + 'wins' => 1, + ], + 10 => [], + 11 => [], + 12 => [ + 'date_uploaded' => 'CURRENT_TIMESTAMP', + 'filesize' => null, + 'battles' => '0', + 'wins' => '0', + ], + 13 => [], + ], + 'map-phalcon\tests\fixtures\models\photo' => [ + 0 => null, + 1 => null, + ], + 'meta-phalcon\tests\fixtures\models\album-album' => [ + 0 => [ + 'id', + 'name', + 'album_id', + 'photo_id', + ], + 1 => [ + 'id', + ], + 2 => [ + 'name', + 'album_id', + 'photo_id', + ], + 3 => [ + 'id', + 'name', + ], + 4 => [ + 'id' => 0, + 'name' => 2, + 'album_id' => 0, + 'photo_id' => 0, + ], + 5 => [ + 'id' => true, + 'album_id' => true, + 'photo_id' => true, + ], + 8 => 'id', + 9 => [ + 'id' => 1, + 'name' => 2, + 'album_id' => 1, + 'photo_id' => 1, + ], + 10 => [], + 11 => [], + 12 => [ + 'album_id' => null, + 'photo_id' => null, + ], + 13 => [], + ], + ]; + } } From 3c5b9668262763df9c04851022b926c33c42f9e8 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Sun, 2 Jul 2023 20:55:01 -0400 Subject: [PATCH 10/35] tighten the type of the getAdapter() --- phalcon/Mvc/Model/MetaData.zep | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phalcon/Mvc/Model/MetaData.zep b/phalcon/Mvc/Model/MetaData.zep index f8c6bd86a6..42c7fc55dd 100644 --- a/phalcon/Mvc/Model/MetaData.zep +++ b/phalcon/Mvc/Model/MetaData.zep @@ -81,7 +81,10 @@ abstract class MetaData implements InjectionAwareInterface, MetaDataInterface */ protected strategy = null; - public function getAdapter() -> var + /** + * Return the internal cache adapter + */ + public function getAdapter() -> | null { return this->adapter; } From a539fc6ca81fe83f9e695d317bbab8b81d22217b Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Sun, 2 Jul 2023 20:58:23 -0400 Subject: [PATCH 11/35] updating changelog --- CHANGELOG-5.0.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md index 2629c1faf1..ca9af17a6f 100644 --- a/CHANGELOG-5.0.md +++ b/CHANGELOG-5.0.md @@ -1,5 +1,11 @@ # Changelog +## [5.2.3](https://github.com/phalcon/cphalcon/releases/tag/v5.2.2) (xxxx-xx-xx) + +### Fixed +- Tried to reproduce the behavior described in #16244 but had no success. [#16244](https://github.com/phalcon/cphalcon/issues/16244) +- Added `getAdapter()` in `Phalcon\Mvc\Model\Metadata` to retrieve the internal cache adapter if necessary. [#16244](https://github.com/phalcon/cphalcon/issues/16244) + ## [5.2.2](https://github.com/phalcon/cphalcon/releases/tag/v5.2.2) (2023-06-18) ### Fixed From 1d8254ae9366a7799af5d35606d876a578963005 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Sun, 2 Jul 2023 21:18:48 -0400 Subject: [PATCH 12/35] phpcs --- tests/database/Mvc/Model/MetaData/Adapter/ReadMetadataCest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/database/Mvc/Model/MetaData/Adapter/ReadMetadataCest.php b/tests/database/Mvc/Model/MetaData/Adapter/ReadMetadataCest.php index eb5de03e35..11d446c877 100644 --- a/tests/database/Mvc/Model/MetaData/Adapter/ReadMetadataCest.php +++ b/tests/database/Mvc/Model/MetaData/Adapter/ReadMetadataCest.php @@ -390,6 +390,6 @@ private function getKeyData(): array ], 13 => [], ], - ]; + ]; } } From ec72a71a616efe1dd994633d471bd640d8daa43a Mon Sep 17 00:00:00 2001 From: M4nu Date: Mon, 17 Jul 2023 01:08:00 -0500 Subject: [PATCH 13/35] Phalcon\Mvc\Model\Row class that extends from stdClass --- ext/phalcon/acl/adapter/memory.zep.c | 76 +++--- .../annotations/adapter/abstractadapter.zep.c | 2 +- ext/phalcon/annotations/adapter/apcu.zep.c | 6 +- ext/phalcon/annotations/adapter/memory.zep.c | 2 +- ext/phalcon/annotations/adapter/stream.zep.c | 12 +- ext/phalcon/annotations/annotation.zep.c | 6 +- .../annotations/annotationsfactory.zep.c | 2 +- ext/phalcon/annotations/collection.zep.c | 4 +- ext/phalcon/annotations/reader.zep.c | 26 +- .../application/abstractapplication.zep.c | 4 +- ext/phalcon/assets/collection.zep.c | 26 +- ext/phalcon/assets/manager.zep.c | 62 ++--- ext/phalcon/autoload/loader.zep.c | 54 ++--- ext/phalcon/cache/abstractcache.zep.c | 2 +- ext/phalcon/cache/adapterfactory.zep.c | 2 +- ext/phalcon/cache/cachefactory.zep.c | 4 +- ext/phalcon/cli/console.zep.c | 8 +- ext/phalcon/cli/router.zep.c | 6 +- ext/phalcon/cli/task.zep.c | 2 +- ext/phalcon/config/adapter/grouped.zep.c | 16 +- ext/phalcon/config/adapter/ini.zep.c | 4 +- ext/phalcon/config/adapter/json.zep.c | 8 +- ext/phalcon/config/adapter/yaml.zep.c | 4 +- ext/phalcon/config/configfactory.zep.c | 2 +- ext/phalcon/datamapper/pdo/connection.zep.c | 6 +- .../pdo/connection/abstractconnection.zep.c | 2 +- .../datamapper/pdo/connection/decorated.zep.c | 4 +- .../datamapper/pdo/connectionlocator.zep.c | 6 +- .../datamapper/pdo/profiler/profiler.zep.c | 16 +- .../datamapper/query/abstractquery.zep.c | 4 +- ext/phalcon/datamapper/query/delete.zep.c | 4 +- ext/phalcon/datamapper/query/insert.zep.c | 6 +- .../datamapper/query/queryfactory.zep.c | 14 +- ext/phalcon/datamapper/query/select.zep.c | 6 +- ext/phalcon/datamapper/query/update.zep.c | 6 +- ext/phalcon/db/adapter/abstractadapter.zep.c | 18 +- ext/phalcon/db/adapter/pdo/mysql.zep.c | 6 +- ext/phalcon/db/adapter/pdo/postgresql.zep.c | 8 +- ext/phalcon/db/adapter/pdo/sqlite.zep.c | 4 +- ext/phalcon/db/adapter/pdofactory.zep.c | 2 +- ext/phalcon/db/dialect.zep.c | 8 +- ext/phalcon/db/dialect/mysql.zep.c | 60 ++--- ext/phalcon/db/dialect/postgresql.zep.c | 24 +- ext/phalcon/db/dialect/sqlite.zep.c | 26 +- ext/phalcon/db/profiler.zep.c | 12 +- ext/phalcon/db/result/pdoresult.zep.c | 2 +- ext/phalcon/di/abstractinjectionaware.zep.c | 2 +- ext/phalcon/di/di.zep.c | 10 +- ext/phalcon/di/injectable.zep.c | 2 +- ext/phalcon/di/service.zep.c | 4 +- ext/phalcon/di/service/builder.zep.c | 20 +- .../dispatcher/abstractdispatcher.zep.c | 4 +- ext/phalcon/encryption/crypt.zep.c | 76 +++--- .../encryption/crypt/padding/ansi.zep.c | 8 +- .../encryption/crypt/padding/iso10126.zep.c | 8 +- .../encryption/crypt/padding/isoiek.zep.c | 10 +- .../encryption/crypt/padding/pkcs7.zep.c | 8 +- .../encryption/crypt/padding/space.zep.c | 4 +- .../encryption/crypt/padding/zero.zep.c | 6 +- ext/phalcon/encryption/crypt/padfactory.zep.c | 2 +- ext/phalcon/encryption/security.zep.c | 32 +-- .../encryption/security/jwt/builder.zep.c | 28 +-- .../encryption/security/jwt/signer/hmac.zep.c | 6 +- .../security/jwt/token/parser.zep.c | 36 +-- .../encryption/security/jwt/token/token.zep.c | 10 +- .../encryption/security/jwt/validator.zep.c | 12 +- ext/phalcon/encryption/security/random.zep.c | 16 +- ext/phalcon/events/abstracteventsaware.zep.c | 2 +- ext/phalcon/events/manager.zep.c | 16 +- ext/phalcon/filter/filter.zep.c | 30 +-- ext/phalcon/filter/filterfactory.zep.c | 2 +- ext/phalcon/filter/sanitize/absint.zep.c | 4 +- ext/phalcon/filter/sanitize/email.zep.c | 2 +- ext/phalcon/filter/sanitize/floatval.zep.c | 2 +- ext/phalcon/filter/sanitize/intval.zep.c | 2 +- ext/phalcon/filter/sanitize/lower.zep.c | 2 +- ext/phalcon/filter/sanitize/special.zep.c | 2 +- ext/phalcon/filter/sanitize/specialfull.zep.c | 2 +- ext/phalcon/filter/sanitize/stringval.zep.c | 2 +- .../filter/sanitize/stringvallegacy.zep.c | 2 +- ext/phalcon/filter/sanitize/striptags.zep.c | 2 +- ext/phalcon/filter/sanitize/upper.zep.c | 2 +- ext/phalcon/filter/sanitize/upperwords.zep.c | 4 +- ext/phalcon/filter/sanitize/url.zep.c | 2 +- ext/phalcon/filter/validation.zep.c | 16 +- .../filter/validation/abstractvalidator.zep.c | 4 +- .../abstractvalidatorcomposite.zep.c | 2 +- .../filter/validation/validator/alnum.zep.c | 4 +- .../filter/validation/validator/alpha.zep.c | 2 +- .../filter/validation/validator/between.zep.c | 2 +- .../validation/validator/callback.zep.c | 4 +- .../validation/validator/confirmation.zep.c | 6 +- .../validation/validator/creditcard.zep.c | 8 +- .../filter/validation/validator/date.zep.c | 4 +- .../filter/validation/validator/digit.zep.c | 4 +- .../filter/validation/validator/email.zep.c | 4 +- .../validation/validator/exclusionin.zep.c | 4 +- .../filter/validation/validator/file.zep.c | 90 +++---- .../validator/file/abstractfile.zep.c | 10 +- .../validation/validator/file/mimetype.zep.c | 8 +- .../validator/file/resolution/equal.zep.c | 4 +- .../validator/file/resolution/max.zep.c | 4 +- .../validator/file/resolution/min.zep.c | 4 +- .../validator/file/size/equal.zep.c | 2 +- .../validation/validator/file/size/max.zep.c | 2 +- .../validation/validator/file/size/min.zep.c | 2 +- .../validation/validator/identical.zep.c | 2 +- .../validation/validator/inclusionin.zep.c | 4 +- .../filter/validation/validator/ip.zep.c | 4 +- .../validation/validator/numericality.zep.c | 2 +- .../validation/validator/presenceof.zep.c | 2 +- .../filter/validation/validator/regex.zep.c | 2 +- .../validation/validator/stringlength.zep.c | 8 +- .../validator/stringlength/max.zep.c | 4 +- .../validator/stringlength/min.zep.c | 4 +- .../validation/validator/uniqueness.zep.c | 8 +- .../filter/validation/validator/url.zep.c | 6 +- ext/phalcon/flash/abstractflash.zep.c | 6 +- .../forms/element/abstractelement.zep.c | 10 +- ext/phalcon/forms/form.zep.c | 24 +- ext/phalcon/forms/manager.zep.c | 4 +- ext/phalcon/html/attributes.zep.c | 4 +- ext/phalcon/html/breadcrumbs.zep.c | 2 +- ext/phalcon/html/escaper.zep.c | 24 +- ext/phalcon/html/helper/abstracthelper.zep.c | 2 +- ext/phalcon/html/helper/input/checkbox.zep.c | 2 +- ext/phalcon/html/helper/input/select.zep.c | 2 +- ext/phalcon/html/helper/meta.zep.c | 6 +- ext/phalcon/html/helper/title.zep.c | 4 +- .../html/link/evolvablelinkprovider.zep.c | 4 +- ext/phalcon/html/tagfactory.zep.c | 2 +- ext/phalcon/http/cookie.zep.c | 28 +-- ext/phalcon/http/request.zep.c | 166 ++++++------- ext/phalcon/http/request/file.zep.c | 18 +- ext/phalcon/http/response.zep.c | 40 +-- ext/phalcon/http/response/cookies.zep.c | 2 +- ext/phalcon/http/response/headers.zep.c | 14 +- .../image/adapter/abstractadapter.zep.c | 4 +- ext/phalcon/image/adapter/gd.zep.c | 228 +++++++++--------- ext/phalcon/image/adapter/imagick.zep.c | 171 ++++++++----- ext/phalcon/image/imagefactory.zep.c | 6 +- ext/phalcon/logger/abstractlogger.zep.c | 2 +- .../logger/adapter/abstractadapter.zep.c | 6 +- ext/phalcon/logger/adapter/noop.zep.c | 2 +- ext/phalcon/logger/adapter/stream.zep.c | 8 +- ext/phalcon/logger/adapter/syslog.zep.c | 14 +- .../logger/formatter/abstractformatter.zep.c | 2 +- ext/phalcon/logger/formatter/json.zep.c | 2 +- ext/phalcon/logger/formatter/line.zep.c | 2 +- ext/phalcon/logger/loggerfactory.zep.c | 4 +- ext/phalcon/messages/messages.zep.c | 4 +- ext/phalcon/mvc/micro.zep.c | 22 +- ext/phalcon/mvc/micro/lazyloader.zep.c | 2 +- ext/phalcon/mvc/model.zep.c | 118 ++++----- ext/phalcon/mvc/model/behavior.zep.c | 4 +- .../mvc/model/behavior/softdelete.zep.c | 2 +- .../mvc/model/behavior/timestampable.zep.c | 6 +- ext/phalcon/mvc/model/binder.zep.c | 14 +- ext/phalcon/mvc/model/criteria.zep.c | 16 +- ext/phalcon/mvc/model/manager.zep.c | 122 +++++----- ext/phalcon/mvc/model/metadata.zep.c | 114 +++++---- ext/phalcon/mvc/model/metadata.zep.h | 5 + ext/phalcon/mvc/model/metadata/apcu.zep.c | 2 +- .../mvc/model/metadata/libmemcached.zep.c | 2 +- ext/phalcon/mvc/model/metadata/redis.zep.c | 2 +- .../model/metadata/strategy/annotations.zep.c | 8 +- .../metadata/strategy/introspection.zep.c | 8 +- ext/phalcon/mvc/model/metadata/stream.zep.c | 4 +- ext/phalcon/mvc/model/query.zep.c | 222 ++++++++--------- ext/phalcon/mvc/model/query/builder.zep.c | 76 +++--- ext/phalcon/mvc/model/query/status.zep.c | 2 +- ext/phalcon/mvc/model/resultset/complex.zep.c | 4 +- ext/phalcon/mvc/model/row.zep.c | 4 +- ext/phalcon/mvc/model/transaction.zep.c | 12 +- .../mvc/model/transaction/failed.zep.c | 2 +- .../mvc/model/transaction/manager.zep.c | 16 +- ext/phalcon/mvc/model/validationfailed.zep.c | 2 +- ext/phalcon/mvc/router.zep.c | 6 +- ext/phalcon/mvc/router/annotations.zep.c | 10 +- ext/phalcon/mvc/router/group.zep.c | 2 +- ext/phalcon/mvc/router/route.zep.c | 2 +- ext/phalcon/mvc/url.zep.c | 4 +- ext/phalcon/mvc/view.zep.c | 30 +-- .../mvc/view/engine/abstractengine.zep.c | 4 +- ext/phalcon/mvc/view/engine/php.zep.c | 4 +- ext/phalcon/mvc/view/engine/volt.zep.c | 34 +-- .../mvc/view/engine/volt/compiler.zep.c | 158 ++++++------ ext/phalcon/mvc/view/simple.zep.c | 22 +- .../paginator/adapter/abstractadapter.zep.c | 2 +- ext/phalcon/paginator/adapter/model.zep.c | 4 +- .../paginator/adapter/nativearray.zep.c | 2 +- .../paginator/adapter/querybuilder.zep.c | 2 +- .../session/adapter/libmemcached.zep.c | 2 +- ext/phalcon/session/adapter/redis.zep.c | 2 +- ext/phalcon/session/adapter/stream.zep.c | 24 +- ext/phalcon/session/bag.zep.c | 4 +- ext/phalcon/session/manager.zep.c | 2 +- .../storage/adapter/abstractadapter.zep.c | 2 +- ext/phalcon/storage/adapter/apcu.zep.c | 33 +-- .../storage/adapter/libmemcached.zep.c | 10 +- ext/phalcon/storage/adapter/memory.zep.c | 2 +- ext/phalcon/storage/adapter/redis.zep.c | 31 +-- ext/phalcon/storage/adapter/stream.zep.c | 72 +++--- ext/phalcon/storage/adapterfactory.zep.c | 2 +- ext/phalcon/storage/serializer/base64.zep.c | 4 +- ext/phalcon/storage/serializer/igbinary.zep.c | 14 +- ext/phalcon/storage/serializer/json.zep.c | 14 +- ext/phalcon/storage/serializer/php.zep.c | 10 +- ext/phalcon/support/debug.zep.c | 8 +- ext/phalcon/support/debug/dump.zep.c | 14 +- ext/phalcon/support/helper/arr/first.zep.c | 2 +- ext/phalcon/support/helper/arr/group.zep.c | 2 +- ext/phalcon/support/helper/arr/isunique.zep.c | 2 +- ext/phalcon/support/helper/arr/last.zep.c | 2 +- .../support/helper/arr/sliceleft.zep.c | 2 +- .../support/helper/arr/sliceright.zep.c | 2 +- .../support/helper/file/basename.zep.c | 4 +- ext/phalcon/support/helper/json/decode.zep.c | 6 +- ext/phalcon/support/helper/json/encode.zep.c | 4 +- ext/phalcon/support/helper/str/concat.zep.c | 8 +- .../support/helper/str/decapitalize.zep.c | 4 +- .../support/helper/str/dirfromfile.zep.c | 4 +- ext/phalcon/support/helper/str/dynamic.zep.c | 12 +- ext/phalcon/support/helper/str/friendly.zep.c | 2 +- ext/phalcon/support/helper/str/len.zep.c | 2 +- ext/phalcon/support/helper/str/random.zep.c | 20 +- ext/phalcon/support/version.zep.c | 4 +- ext/phalcon/tag.zep.c | 10 +- ext/phalcon/tag/select.zep.c | 6 +- .../translate/adapter/abstractadapter.zep.c | 2 +- ext/phalcon/translate/adapter/csv.zep.c | 4 +- ext/phalcon/translate/adapter/gettext.zep.c | 2 +- .../translate/adapter/nativearray.zep.c | 2 +- .../translate/interpolator/indexedarray.zep.c | 2 +- ext/phalcon/translate/translatefactory.zep.c | 2 +- phalcon/Mvc/Model/Row.zep | 2 +- 236 files changed, 1762 insertions(+), 1702 deletions(-) diff --git a/ext/phalcon/acl/adapter/memory.zep.c b/ext/phalcon/acl/adapter/memory.zep.c index f260cfccbe..e0eab5463d 100644 --- a/ext/phalcon/acl/adapter/memory.zep.c +++ b/ext/phalcon/acl/adapter/memory.zep.c @@ -263,10 +263,10 @@ 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, 139, componentValue); + ZEPHIR_CALL_METHOD(NULL, &componentObject, "__construct", NULL, 133, componentValue); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&componentName, &componentObject, "getname", NULL, 140); + ZEPHIR_CALL_METHOD(&componentName, &componentObject, "getname", NULL, 134); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("componentsNames"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset(&_1, &componentName))) { @@ -323,7 +323,7 @@ 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, 141, &_0, &componentName, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 135, &_0, &componentName, &_1); zephir_check_call_status(); _2 = Z_TYPE_P(accessList) != IS_ARRAY; if (_2) { @@ -474,7 +474,7 @@ 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, 141, &_0, &roleName, &_1, &_2); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 135, &_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))) { @@ -538,7 +538,7 @@ 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, 142, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 136, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -554,7 +554,7 @@ 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, 142, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 136, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_16$$12, "next", NULL, 0); @@ -598,7 +598,7 @@ 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, 142, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 136, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -614,7 +614,7 @@ 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, 142, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 136, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_25$$18, "next", NULL, 0); @@ -681,7 +681,7 @@ 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, 142, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 136, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -697,7 +697,7 @@ 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, 142, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 136, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_36$$27, "next", NULL, 0); @@ -741,7 +741,7 @@ 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, 142, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 136, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -757,7 +757,7 @@ 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, 142, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 136, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_43$$33, "next", NULL, 0); @@ -831,13 +831,13 @@ 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, 143, role); + ZEPHIR_CALL_METHOD(NULL, &roleObject, "__construct", NULL, 137, 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", 394); return; } - ZEPHIR_CALL_METHOD(&roleName, &roleObject, "getname", NULL, 144); + ZEPHIR_CALL_METHOD(&roleName, &roleObject, "getname", NULL, 138); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("roles"), PH_NOISY_CC | PH_READONLY); if (zephir_array_isset(&_1, &roleName)) { @@ -928,7 +928,7 @@ 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, 145, &role, &componentName, access, &_4$$4, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 139, &role, &componentName, access, &_4$$4, func); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -943,7 +943,7 @@ 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, 145, &role, &componentName, access, &_6$$5, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 139, &role, &componentName, access, &_6$$5, func); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &rolesArray, "next", NULL, 0); zephir_check_call_status(); @@ -1030,7 +1030,7 @@ 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, 145, &role, &componentName, access, &_4$$4, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 139, &role, &componentName, access, &_4$$4, func); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -1045,7 +1045,7 @@ 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, 145, &role, &componentName, access, &_6$$5, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 139, &role, &componentName, access, &_6$$5, func); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &rolesArray, "next", NULL, 0); zephir_check_call_status(); @@ -1463,7 +1463,7 @@ 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, 146, roleName, componentName, &access); + ZEPHIR_CALL_METHOD(&accessKey, this_ptr, "canaccess", NULL, 140, roleName, componentName, &access); zephir_check_call_status(); _10 = Z_TYPE_P(&accessKey) != IS_NULL; if (_10) { @@ -1492,9 +1492,9 @@ 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, 147, &funcAccess); + ZEPHIR_CALL_METHOD(NULL, &reflectionFunction, "__construct", NULL, 141, &funcAccess); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&reflectionParameters, &reflectionFunction, "getparameters", NULL, 148); + ZEPHIR_CALL_METHOD(&reflectionParameters, &reflectionFunction, "getparameters", NULL, 142); zephir_check_call_status(); ZEPHIR_INIT_VAR(¶meterNumber); ZVAL_LONG(¶meterNumber, zephir_fast_count_int(&reflectionParameters)); @@ -1510,7 +1510,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) } ZEPHIR_INIT_VAR(¶metersForFunction); array_init(¶metersForFunction); - ZEPHIR_CALL_METHOD(&numberOfRequiredParameters, &reflectionFunction, "getnumberofrequiredparameters", NULL, 149); + ZEPHIR_CALL_METHOD(&numberOfRequiredParameters, &reflectionFunction, "getnumberofrequiredparameters", NULL, 143); zephir_check_call_status(); ZEPHIR_CPY_WRT(&userParametersSizeShouldBe, ¶meterNumber); zephir_is_iterable(&reflectionParameters, 0, "phalcon/Acl/Adapter/Memory.zep", 766); @@ -1528,11 +1528,11 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&reflectionClass); object_init_ex(&reflectionClass, zephir_get_internal_ce(SL("reflectionclass"))); - ZEPHIR_CALL_METHOD(NULL, &reflectionClass, "__construct", &_17, 150, &className); + ZEPHIR_CALL_METHOD(NULL, &reflectionClass, "__construct", &_17, 144, &className); zephir_check_call_status(); _18$$18 = Z_TYPE_P(&roleObject) != IS_NULL; if (_18$$18) { - ZEPHIR_CALL_METHOD(&_19$$18, &reflectionClass, "isinstance", &_20, 151, &roleObject); + ZEPHIR_CALL_METHOD(&_19$$18, &reflectionClass, "isinstance", &_20, 145, &roleObject); zephir_check_call_status(); _18$$18 = zephir_is_true(&_19$$18); } @@ -1549,7 +1549,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) } _22$$18 = Z_TYPE_P(&componentObject) != IS_NULL; if (_22$$18) { - ZEPHIR_CALL_METHOD(&_23$$18, &reflectionClass, "isinstance", &_20, 151, &componentObject); + ZEPHIR_CALL_METHOD(&_23$$18, &reflectionClass, "isinstance", &_20, 145, &componentObject); zephir_check_call_status(); _22$$18 = zephir_is_true(&_23$$18); } @@ -1572,7 +1572,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) _27$$18 = _25$$18; if (_27$$18) { zephir_array_fetch(&_29$$18, ¶meters, ¶meterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 743); - ZEPHIR_CALL_METHOD(&_28$$18, &reflectionClass, "isinstance", &_20, 151, &_29$$18); + ZEPHIR_CALL_METHOD(&_28$$18, &reflectionClass, "isinstance", &_20, 145, &_29$$18); zephir_check_call_status(); _27$$18 = !zephir_is_true(&_28$$18); } @@ -1582,7 +1582,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) ZEPHIR_INIT_NVAR(&_31$$21); zephir_array_fetch(&_32$$21, ¶meters, ¶meterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 750); zephir_get_class(&_31$$21, &_32$$21, 0); - ZEPHIR_CALL_METHOD(&_33$$21, &reflectionClass, "getname", &_34, 152); + ZEPHIR_CALL_METHOD(&_33$$21, &reflectionClass, "getname", &_34, 146); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_35$$21); ZEPHIR_CONCAT_SSSVSVSVSVSVS(&_35$$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: ", &_31$$21, " , Class in defined function: ", &_33$$21, "."); @@ -1618,11 +1618,11 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&reflectionClass); object_init_ex(&reflectionClass, zephir_get_internal_ce(SL("reflectionclass"))); - ZEPHIR_CALL_METHOD(NULL, &reflectionClass, "__construct", &_17, 150, &className); + ZEPHIR_CALL_METHOD(NULL, &reflectionClass, "__construct", &_17, 144, &className); zephir_check_call_status(); _37$$24 = Z_TYPE_P(&roleObject) != IS_NULL; if (_37$$24) { - ZEPHIR_CALL_METHOD(&_38$$24, &reflectionClass, "isinstance", &_20, 151, &roleObject); + ZEPHIR_CALL_METHOD(&_38$$24, &reflectionClass, "isinstance", &_20, 145, &roleObject); zephir_check_call_status(); _37$$24 = zephir_is_true(&_38$$24); } @@ -1639,7 +1639,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) } _40$$24 = Z_TYPE_P(&componentObject) != IS_NULL; if (_40$$24) { - ZEPHIR_CALL_METHOD(&_41$$24, &reflectionClass, "isinstance", &_20, 151, &componentObject); + ZEPHIR_CALL_METHOD(&_41$$24, &reflectionClass, "isinstance", &_20, 145, &componentObject); zephir_check_call_status(); _40$$24 = zephir_is_true(&_41$$24); } @@ -1662,7 +1662,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) _45$$24 = _43$$24; if (_45$$24) { zephir_array_fetch(&_47$$24, ¶meters, ¶meterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 743); - ZEPHIR_CALL_METHOD(&_46$$24, &reflectionClass, "isinstance", &_20, 151, &_47$$24); + ZEPHIR_CALL_METHOD(&_46$$24, &reflectionClass, "isinstance", &_20, 145, &_47$$24); zephir_check_call_status(); _45$$24 = !zephir_is_true(&_46$$24); } @@ -1672,7 +1672,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) ZEPHIR_INIT_NVAR(&_49$$27); zephir_array_fetch(&_50$$27, ¶meters, ¶meterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 750); zephir_get_class(&_49$$27, &_50$$27, 0); - ZEPHIR_CALL_METHOD(&_51$$27, &reflectionClass, "getname", &_34, 152); + ZEPHIR_CALL_METHOD(&_51$$27, &reflectionClass, "getname", &_34, 146); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_52$$27); ZEPHIR_CONCAT_SSSVSVSVSVSVS(&_52$$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: ", &_49$$27, " , Class in defined function: ", &_51$$27, "."); @@ -1891,12 +1891,12 @@ 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, 141, &_0, &roleName, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 135, &_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, 141, &_2, &componentName, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 135, &_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); @@ -2092,7 +2092,7 @@ 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, 142, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 136, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -2108,7 +2108,7 @@ 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, 142, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 136, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_2$$6, "next", NULL, 0); @@ -2159,7 +2159,7 @@ 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, 142, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 136, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -2175,7 +2175,7 @@ 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, 142, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 136, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_12$$14, "next", NULL, 0); diff --git a/ext/phalcon/annotations/adapter/abstractadapter.zep.c b/ext/phalcon/annotations/adapter/abstractadapter.zep.c index d2cf703d1a..dda01ae4fb 100644 --- a/ext/phalcon/annotations/adapter/abstractadapter.zep.c +++ b/ext/phalcon/annotations/adapter/abstractadapter.zep.c @@ -431,7 +431,7 @@ PHP_METHOD(Phalcon_Annotations_Adapter_AbstractAdapter, setReader) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(reader, phalcon_annotations_readerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(reader, zephir_get_internal_ce(SL("phalcon\\annotations\\readerinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/annotations/adapter/apcu.zep.c b/ext/phalcon/annotations/adapter/apcu.zep.c index 8b15837413..8766d603a5 100644 --- a/ext/phalcon/annotations/adapter/apcu.zep.c +++ b/ext/phalcon/annotations/adapter/apcu.zep.c @@ -142,7 +142,7 @@ 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, 103, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_fetch", NULL, 0, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -168,7 +168,7 @@ PHP_METHOD(Phalcon_Annotations_Adapter_Apcu, write) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(key) - Z_PARAM_OBJECT_OF_CLASS(data, phalcon_annotations_reflection_ce) + Z_PARAM_OBJECT_OF_CLASS(data, zephir_get_internal_ce(SL("phalcon\\annotations\\reflection"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -192,7 +192,7 @@ 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, 104, &_0, data, &_3); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_store", NULL, 0, &_0, data, &_3); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/annotations/adapter/memory.zep.c b/ext/phalcon/annotations/adapter/memory.zep.c index 42f51577f7..3a69f54478 100644 --- a/ext/phalcon/annotations/adapter/memory.zep.c +++ b/ext/phalcon/annotations/adapter/memory.zep.c @@ -105,7 +105,7 @@ PHP_METHOD(Phalcon_Annotations_Adapter_Memory, write) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(key) - Z_PARAM_OBJECT_OF_CLASS(data, phalcon_annotations_reflection_ce) + Z_PARAM_OBJECT_OF_CLASS(data, zephir_get_internal_ce(SL("phalcon\\annotations\\reflection"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/annotations/adapter/stream.zep.c b/ext/phalcon/annotations/adapter/stream.zep.c index 5284fb8017..108f36aad1 100644 --- a/ext/phalcon/annotations/adapter/stream.zep.c +++ b/ext/phalcon/annotations/adapter/stream.zep.c @@ -154,33 +154,33 @@ 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, 129); + ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 123); 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, 130, &version, &_4, &_5); + ZEPHIR_CALL_FUNCTION(&_6, "version_compare", NULL, 124, &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_5__closure_ce, SL("__invoke")); ZVAL_LONG(&_8$$5, 2); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 131, &_7$$5, &_8$$5); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 125, &_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_6__closure_ce, SL("__invoke")); ZVAL_LONG(&_10$$6, 2); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 131, &_9$$6, &_10$$6); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 125, &_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, 132); + ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 126); 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); @@ -213,7 +213,7 @@ PHP_METHOD(Phalcon_Annotations_Adapter_Stream, write) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(key) - Z_PARAM_OBJECT_OF_CLASS(data, phalcon_annotations_reflection_ce) + Z_PARAM_OBJECT_OF_CLASS(data, zephir_get_internal_ce(SL("phalcon\\annotations\\reflection"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/annotations/annotation.zep.c b/ext/phalcon/annotations/annotation.zep.c index 17ee67169b..32419295af 100644 --- a/ext/phalcon/annotations/annotation.zep.c +++ b/ext/phalcon/annotations/annotation.zep.c @@ -276,7 +276,7 @@ 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, 153, &_3$$8); + ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_4, 147, &_3$$8); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); if (zephir_array_isset_string_fetch(&name, &item, SL("name"), 0)) { @@ -297,7 +297,7 @@ 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, 153, &_5$$11); + ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_4, 147, &_5$$11); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); if (zephir_array_isset_string_fetch(&name, &item, SL("name"), 0)) { @@ -314,7 +314,7 @@ 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, 154, &expr); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 148, &expr); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/annotations/annotationsfactory.zep.c b/ext/phalcon/annotations/annotationsfactory.zep.c index 54f500edcf..75786d8cae 100644 --- a/ext/phalcon/annotations/annotationsfactory.zep.c +++ b/ext/phalcon/annotations/annotationsfactory.zep.c @@ -136,7 +136,7 @@ PHP_METHOD(Phalcon_Annotations_AnnotationsFactory, load) array_init(&_2); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "options"); - ZEPHIR_CALL_METHOD(&options, &_1, "__invoke", NULL, 155, config, &_3, &_2); + ZEPHIR_CALL_METHOD(&options, &_1, "__invoke", NULL, 149, config, &_3, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "newinstance", NULL, 0, &name, &options); zephir_check_call_status(); diff --git a/ext/phalcon/annotations/collection.zep.c b/ext/phalcon/annotations/collection.zep.c index 748bee3800..5c2d484221 100644 --- a/ext/phalcon/annotations/collection.zep.c +++ b/ext/phalcon/annotations/collection.zep.c @@ -110,7 +110,7 @@ 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, 154, &annotationData); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", &_3, 148, &annotationData); zephir_check_call_status(); zephir_array_append(&annotations, &_2$$3, PH_SEPARATE, "phalcon/Annotations/Collection.zep", 55); } ZEND_HASH_FOREACH_END(); @@ -127,7 +127,7 @@ 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, 154, &annotationData); + ZEPHIR_CALL_METHOD(NULL, &_4$$4, "__construct", &_3, 148, &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); diff --git a/ext/phalcon/annotations/reader.zep.c b/ext/phalcon/annotations/reader.zep.c index f6e4943561..d6774e2b8f 100644 --- a/ext/phalcon/annotations/reader.zep.c +++ b/ext/phalcon/annotations/reader.zep.c @@ -110,15 +110,15 @@ 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, 150, &className); + ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 144, &className); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&comment, &reflection, "getdoccomment", NULL, 156); + ZEPHIR_CALL_METHOD(&comment, &reflection, "getdoccomment", NULL, 150); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) { ZEPHIR_INIT_VAR(&classAnnotations); - ZEPHIR_CALL_METHOD(&_0$$3, &reflection, "getfilename", NULL, 157); + ZEPHIR_CALL_METHOD(&_0$$3, &reflection, "getfilename", NULL, 151); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, &reflection, "getstartline", NULL, 158); + ZEPHIR_CALL_METHOD(&_1$$3, &reflection, "getstartline", NULL, 152); zephir_check_call_status(); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&classAnnotations, &comment, &_0$$3, &_1$$3); zephir_check_call_status(); @@ -126,7 +126,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_array_update_string(&annotations, SL("class"), &classAnnotations, PH_COPY | PH_SEPARATE); } } - ZEPHIR_CALL_METHOD(&constants, &reflection, "getconstants", NULL, 159); + ZEPHIR_CALL_METHOD(&constants, &reflection, "getconstants", NULL, 153); zephir_check_call_status(); if (zephir_fast_count_int(&constants)) { line = 1; @@ -140,13 +140,13 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) { ZEPHIR_INIT_NVAR(&constant); ZVAL_COPY(&constant, _2$$5); - ZEPHIR_CALL_METHOD(&constantReflection, &reflection, "getreflectionconstant", &_4, 160, &constant); + ZEPHIR_CALL_METHOD(&constantReflection, &reflection, "getreflectionconstant", &_4, 154, &constant); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&comment, &constantReflection, "getdoccomment", NULL, 0); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) { ZEPHIR_INIT_NVAR(&constantAnnotations); - ZEPHIR_CALL_METHOD(&_5$$7, &reflection, "getfilename", NULL, 157); + ZEPHIR_CALL_METHOD(&_5$$7, &reflection, "getfilename", NULL, 151); zephir_check_call_status(); ZVAL_LONG(&_6$$7, line); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&constantAnnotations, &comment, &_5$$7, &_6$$7); @@ -167,13 +167,13 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) } ZEPHIR_CALL_METHOD(&constant, &arrayKeys, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&constantReflection, &reflection, "getreflectionconstant", &_4, 160, &constant); + ZEPHIR_CALL_METHOD(&constantReflection, &reflection, "getreflectionconstant", &_4, 154, &constant); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&comment, &constantReflection, "getdoccomment", NULL, 0); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) { ZEPHIR_INIT_NVAR(&constantAnnotations); - ZEPHIR_CALL_METHOD(&_7$$10, &reflection, "getfilename", NULL, 157); + ZEPHIR_CALL_METHOD(&_7$$10, &reflection, "getfilename", NULL, 151); zephir_check_call_status(); ZVAL_LONG(&_8$$10, line); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&constantAnnotations, &comment, &_7$$10, &_8$$10); @@ -191,7 +191,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_array_update_string(&annotations, SL("constants"), &anotationsConstants, PH_COPY | PH_SEPARATE); } } - ZEPHIR_CALL_METHOD(&properties, &reflection, "getproperties", NULL, 161); + ZEPHIR_CALL_METHOD(&properties, &reflection, "getproperties", NULL, 155); zephir_check_call_status(); if (zephir_fast_count_int(&properties)) { line = 1; @@ -207,7 +207,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) { ZEPHIR_INIT_NVAR(&propertyAnnotations); - ZEPHIR_CALL_METHOD(&_11$$15, &reflection, "getfilename", NULL, 157); + ZEPHIR_CALL_METHOD(&_11$$15, &reflection, "getfilename", NULL, 151); zephir_check_call_status(); ZVAL_LONG(&_12$$15, line); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&propertyAnnotations, &comment, &_11$$15, &_12$$15); @@ -234,7 +234,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) { ZEPHIR_INIT_NVAR(&propertyAnnotations); - ZEPHIR_CALL_METHOD(&_14$$18, &reflection, "getfilename", NULL, 157); + ZEPHIR_CALL_METHOD(&_14$$18, &reflection, "getfilename", NULL, 151); zephir_check_call_status(); ZVAL_LONG(&_15$$18, line); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&propertyAnnotations, &comment, &_14$$18, &_15$$18); @@ -254,7 +254,7 @@ 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, 162); + ZEPHIR_CALL_METHOD(&methods, &reflection, "getmethods", NULL, 156); zephir_check_call_status(); if (0 == ZEPHIR_IS_EMPTY(&methods)) { ZEPHIR_INIT_VAR(&annotationsMethods); diff --git a/ext/phalcon/application/abstractapplication.zep.c b/ext/phalcon/application/abstractapplication.zep.c index 72c85b74be..3da014bda2 100644 --- a/ext/phalcon/application/abstractapplication.zep.c +++ b/ext/phalcon/application/abstractapplication.zep.c @@ -73,7 +73,7 @@ PHP_METHOD(Phalcon_Application_AbstractApplication, __construct) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 1) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -295,7 +295,7 @@ PHP_METHOD(Phalcon_Application_AbstractApplication, setEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/assets/collection.zep.c b/ext/phalcon/assets/collection.zep.c index 6f884e0486..184b7be9ef 100644 --- a/ext/phalcon/assets/collection.zep.c +++ b/ext/phalcon/assets/collection.zep.c @@ -115,7 +115,7 @@ PHP_METHOD(Phalcon_Assets_Collection, add) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(asset, phalcon_assets_assetinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(asset, zephir_get_internal_ce(SL("phalcon\\assets\\assetinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -124,7 +124,7 @@ PHP_METHOD(Phalcon_Assets_Collection, add) zephir_fetch_params(1, 1, 0, &asset); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 163, asset); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 157, asset); zephir_check_call_status(); RETURN_THIS(); } @@ -213,7 +213,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addCss) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processadd", NULL, 164, &_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(); } @@ -232,7 +232,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addFilter) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(filter, phalcon_assets_filterinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(filter, zephir_get_internal_ce(SL("phalcon\\assets\\filterinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -260,7 +260,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addInline) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(code, phalcon_assets_inline_ce) + Z_PARAM_OBJECT_OF_CLASS(code, zephir_get_internal_ce(SL("phalcon\\assets\\inline"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -269,7 +269,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addInline) zephir_fetch_params(1, 1, 0, &code); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 163, code); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 157, code); zephir_check_call_status(); RETURN_THIS(); } @@ -329,7 +329,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addInlineCss) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 165, &_0, &content, &_1, &attributes); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 159, &_0, &content, &_1, &attributes); zephir_check_call_status(); RETURN_MM(); } @@ -389,7 +389,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addInlineJs) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 165, &_0, &content, &_1, &attributes); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 159, &_0, &content, &_1, &attributes); zephir_check_call_status(); RETURN_MM(); } @@ -478,7 +478,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addJs) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processadd", NULL, 164, &_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(); } @@ -746,7 +746,7 @@ PHP_METHOD(Phalcon_Assets_Collection, has) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(asset, phalcon_assets_assetinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(asset, zephir_get_internal_ce(SL("phalcon\\assets\\assetinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1183,7 +1183,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addAsset) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(asset, phalcon_assets_assetinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(asset, zephir_get_internal_ce(SL("phalcon\\assets\\assetinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1286,7 +1286,7 @@ 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, 166, &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); @@ -1375,7 +1375,7 @@ 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, 166, &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); diff --git a/ext/phalcon/assets/manager.zep.c b/ext/phalcon/assets/manager.zep.c index 95e6059f69..b67eeaa778 100644 --- a/ext/phalcon/assets/manager.zep.c +++ b/ext/phalcon/assets/manager.zep.c @@ -78,7 +78,7 @@ PHP_METHOD(Phalcon_Assets_Manager, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(tagFactory, phalcon_html_tagfactory_ce) + Z_PARAM_OBJECT_OF_CLASS(tagFactory, zephir_get_internal_ce(SL("phalcon\\html\\tagfactory"))) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); @@ -117,7 +117,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addAsset) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(asset, phalcon_assets_asset_ce) + Z_PARAM_OBJECT_OF_CLASS(asset, zephir_get_internal_ce(SL("phalcon\\assets\\asset"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -154,7 +154,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addAssetByType) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(type) - Z_PARAM_OBJECT_OF_CLASS(asset, phalcon_assets_asset_ce) + Z_PARAM_OBJECT_OF_CLASS(asset, zephir_get_internal_ce(SL("phalcon\\assets\\asset"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -172,7 +172,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addAssetByType) } - ZEPHIR_CALL_METHOD(&collection, this_ptr, "checkandcreatecollection", NULL, 167, &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(); @@ -277,7 +277,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addCss) } else { ZVAL_BOOL(&_3, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 168, &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"); @@ -303,7 +303,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addInlineCode) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(code, phalcon_assets_inline_ce) + Z_PARAM_OBJECT_OF_CLASS(code, zephir_get_internal_ce(SL("phalcon\\assets\\inline"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -340,7 +340,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addInlineCodeByType) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(type) - Z_PARAM_OBJECT_OF_CLASS(code, phalcon_assets_inline_ce) + Z_PARAM_OBJECT_OF_CLASS(code, zephir_get_internal_ce(SL("phalcon\\assets\\inline"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -358,7 +358,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addInlineCodeByType) } - ZEPHIR_CALL_METHOD(&collection, this_ptr, "checkandcreatecollection", NULL, 167, &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(); @@ -421,7 +421,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addInlineCss) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 169, &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"); @@ -486,7 +486,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addInlineJs) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 170, &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"); @@ -598,7 +598,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addJs) } else { ZVAL_BOOL(&_3, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 171, &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"); @@ -634,7 +634,7 @@ PHP_METHOD(Phalcon_Assets_Manager, collection) zephir_get_strval(&name, name_param); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 167, &name); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 161, &name); zephir_check_call_status(); RETURN_MM(); } @@ -858,7 +858,7 @@ PHP_METHOD(Phalcon_Assets_Manager, getCss) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "css"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 167, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 161, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -882,7 +882,7 @@ PHP_METHOD(Phalcon_Assets_Manager, getJs) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "js"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 167, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 161, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -1048,7 +1048,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(collection, phalcon_assets_collection_ce) + Z_PARAM_OBJECT_OF_CLASS(collection, zephir_get_internal_ce(SL("phalcon\\assets\\collection"))) Z_PARAM_STR(type) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1132,7 +1132,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_FUNCTION(&_5$$8, "is_dir", NULL, 133, &completeTargetPath); + ZEPHIR_CALL_FUNCTION(&_5$$8, "is_dir", NULL, 127, &completeTargetPath); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_5$$8)) { ZEPHIR_INIT_VAR(&_6$$10); @@ -1221,13 +1221,13 @@ 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, 172, 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, 173, &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)) { @@ -1304,12 +1304,12 @@ 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, 172, 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, 173, &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)) { @@ -1398,13 +1398,13 @@ 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, 172, 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, 173, &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)) { @@ -1481,12 +1481,12 @@ 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, 172, 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, 173, &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)) { @@ -1508,13 +1508,13 @@ 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, 172, 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, 173, &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)) { @@ -1631,7 +1631,7 @@ PHP_METHOD(Phalcon_Assets_Manager, outputInline) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(collection, phalcon_assets_collection_ce) + Z_PARAM_OBJECT_OF_CLASS(collection, zephir_get_internal_ce(SL("phalcon\\assets\\collection"))) Z_PARAM_ZVAL(type) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1974,7 +1974,7 @@ PHP_METHOD(Phalcon_Assets_Manager, set) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(name) - Z_PARAM_OBJECT_OF_CLASS(collection, phalcon_assets_collection_ce) + Z_PARAM_OBJECT_OF_CLASS(collection, zephir_get_internal_ce(SL("phalcon\\assets\\collection"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2091,7 +2091,7 @@ PHP_METHOD(Phalcon_Assets_Manager, calculatePrefixedPath) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(3, 3) - Z_PARAM_OBJECT_OF_CLASS(collection, phalcon_assets_collection_ce) + Z_PARAM_OBJECT_OF_CLASS(collection, zephir_get_internal_ce(SL("phalcon\\assets\\collection"))) Z_PARAM_STR(path) Z_PARAM_STR(filePath) ZEND_PARSE_PARAMETERS_END(); @@ -2240,7 +2240,7 @@ 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, 174, 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(); } @@ -2361,7 +2361,7 @@ 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, 174, 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(); } diff --git a/ext/phalcon/autoload/loader.zep.c b/ext/phalcon/autoload/loader.zep.c index 473a0f4b91..32a4425210 100644 --- a/ext/phalcon/autoload/loader.zep.c +++ b/ext/phalcon/autoload/loader.zep.c @@ -357,7 +357,7 @@ 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, 175, 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); @@ -382,7 +382,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, addNamespace) } ZEPHIR_INIT_VAR(&_7); zephir_fast_array_merge(&_7, &source, &target); - ZEPHIR_CALL_FUNCTION(&_2, "array_unique", NULL, 176, &_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(); @@ -433,40 +433,40 @@ 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, 177, &_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, 178, &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, 177, &_4); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 171, &_4); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_5, this_ptr, "autoloadchecknamespaces", NULL, 179, &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, 177, &_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, 180, &_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, 177, &_10); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 171, &_10); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "loader:afterCheckClass"); @@ -713,7 +713,7 @@ 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, 181, &_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); @@ -863,7 +863,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, setDirectories) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 182, &directories, &_0, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 176, &directories, &_0, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -1069,7 +1069,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, setFiles) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 182, &files, &_0, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 176, &files, &_0, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -1141,7 +1141,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, setNamespaces) } ZEPHIR_INIT_NVAR(&directories); ZVAL_COPY(&directories, _1); - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "checkdirectories", &_6, 175, &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); @@ -1160,7 +1160,7 @@ 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, 175, &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); @@ -1204,7 +1204,7 @@ 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, 183, &_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); @@ -1250,7 +1250,7 @@ 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, 184, &_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); @@ -1259,7 +1259,7 @@ 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, 177, &_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(); @@ -1268,7 +1268,7 @@ 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, 177, &_4); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 171, &_4); zephir_check_call_status(); RETURN_MM_BOOL(0); } @@ -1441,7 +1441,7 @@ 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, 177, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 171, &_3$$3); zephir_check_call_status(); RETURN_MM_BOOL(1); } @@ -1556,7 +1556,7 @@ 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, 177, &_11$$6); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 171, &_11$$6); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -1586,7 +1586,7 @@ 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, 177, &_15$$9); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 171, &_15$$9); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -1631,7 +1631,7 @@ 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, 177, &_21$$13); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 171, &_21$$13); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -1661,7 +1661,7 @@ 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, 177, &_24$$16); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 171, &_24$$16); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -1758,13 +1758,13 @@ 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, 180, &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, 177, &_11$$5); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 171, &_11$$5); zephir_check_call_status(); RETURN_MM_BOOL(1); } @@ -1793,13 +1793,13 @@ 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, 180, &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, 177, &_18$$8); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 171, &_18$$8); zephir_check_call_status(); RETURN_MM_BOOL(1); } diff --git a/ext/phalcon/cache/abstractcache.zep.c b/ext/phalcon/cache/abstractcache.zep.c index 341181f32d..0a440d3206 100644 --- a/ext/phalcon/cache/abstractcache.zep.c +++ b/ext/phalcon/cache/abstractcache.zep.c @@ -60,7 +60,7 @@ PHP_METHOD(Phalcon_Cache_AbstractCache, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(adapter, phalcon_cache_adapter_adapterinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(adapter, zephir_get_internal_ce(SL("phalcon\\cache\\adapter\\adapterinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/cache/adapterfactory.zep.c b/ext/phalcon/cache/adapterfactory.zep.c index 04f380f14f..2e0845b24b 100644 --- a/ext/phalcon/cache/adapterfactory.zep.c +++ b/ext/phalcon/cache/adapterfactory.zep.c @@ -62,7 +62,7 @@ PHP_METHOD(Phalcon_Cache_AdapterFactory, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_storage_serializerfactory_ce) + Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\storage\\serializerfactory"))) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(services) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/phalcon/cache/cachefactory.zep.c b/ext/phalcon/cache/cachefactory.zep.c index 9d3ade37f6..b07609c8f2 100644 --- a/ext/phalcon/cache/cachefactory.zep.c +++ b/ext/phalcon/cache/cachefactory.zep.c @@ -55,7 +55,7 @@ PHP_METHOD(Phalcon_Cache_CacheFactory, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_cache_adapterfactory_ce) + Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\cache\\adapterfactory"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -215,7 +215,7 @@ 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, 185, &adapter); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 179, &adapter); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/cli/console.zep.c b/ext/phalcon/cli/console.zep.c index 115a01b52f..61c72a02aa 100644 --- a/ext/phalcon/cli/console.zep.c +++ b/ext/phalcon/cli/console.zep.c @@ -425,7 +425,7 @@ 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, 186, &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); @@ -457,7 +457,7 @@ 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, 186, &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); @@ -487,7 +487,7 @@ 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, 186, &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); @@ -519,7 +519,7 @@ 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, 186, &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); diff --git a/ext/phalcon/cli/router.zep.c b/ext/phalcon/cli/router.zep.c index 32be41145e..6746b71d4b 100644 --- a/ext/phalcon/cli/router.zep.c +++ b/ext/phalcon/cli/router.zep.c @@ -153,7 +153,7 @@ 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, 187, &_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", 119); ZEPHIR_INIT_NVAR(&_2$$3); @@ -165,7 +165,7 @@ 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, 187, &_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", 128); } @@ -223,7 +223,7 @@ 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, 187, &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); diff --git a/ext/phalcon/cli/task.zep.c b/ext/phalcon/cli/task.zep.c index 366803c071..ba9b15198c 100644 --- a/ext/phalcon/cli/task.zep.c +++ b/ext/phalcon/cli/task.zep.c @@ -106,7 +106,7 @@ PHP_METHOD(Phalcon_Cli_Task, setEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/config/adapter/grouped.zep.c b/ext/phalcon/config/adapter/grouped.zep.c index 2b8fa3a3e1..f7ca35413a 100644 --- a/ext/phalcon/config/adapter/grouped.zep.c +++ b/ext/phalcon/config/adapter/grouped.zep.c @@ -185,9 +185,9 @@ 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, 188); + ZEPHIR_CALL_METHOD(NULL, &_7$$6, "__construct", &_8, 182); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_9$$6, &_7$$6, "load", &_10, 189, &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(); @@ -226,9 +226,9 @@ PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) } else { ZEPHIR_INIT_NVAR(&_19$$10); object_init_ex(&_19$$10, phalcon_config_configfactory_ce); - ZEPHIR_CALL_METHOD(NULL, &_19$$10, "__construct", &_8, 188); + ZEPHIR_CALL_METHOD(NULL, &_19$$10, "__construct", &_8, 182); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_20$$10, &_19$$10, "load", &_10, 189, &configInstance); + ZEPHIR_CALL_METHOD(&_20$$10, &_19$$10, "load", &_10, 183, &configInstance); zephir_check_call_status(); ZEPHIR_CPY_WRT(&configInstance, &_20$$10); } @@ -261,9 +261,9 @@ PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) if (ZEPHIR_IS_IDENTICAL(&_22$$13, &defaultAdapter)) { ZEPHIR_INIT_NVAR(&_23$$14); object_init_ex(&_23$$14, phalcon_config_configfactory_ce); - ZEPHIR_CALL_METHOD(NULL, &_23$$14, "__construct", &_8, 188); + ZEPHIR_CALL_METHOD(NULL, &_23$$14, "__construct", &_8, 182); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_24$$14, &_23$$14, "load", &_10, 189, &configName); + ZEPHIR_CALL_METHOD(&_24$$14, &_23$$14, "load", &_10, 183, &configName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "merge", &_5, 0, &_24$$14); zephir_check_call_status(); @@ -302,9 +302,9 @@ PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) } else { ZEPHIR_INIT_NVAR(&_31$$18); object_init_ex(&_31$$18, phalcon_config_configfactory_ce); - ZEPHIR_CALL_METHOD(NULL, &_31$$18, "__construct", &_8, 188); + ZEPHIR_CALL_METHOD(NULL, &_31$$18, "__construct", &_8, 182); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_32$$18, &_31$$18, "load", &_10, 189, &configInstance); + ZEPHIR_CALL_METHOD(&_32$$18, &_31$$18, "load", &_10, 183, &configInstance); zephir_check_call_status(); ZEPHIR_CPY_WRT(&configInstance, &_32$$18); } diff --git a/ext/phalcon/config/adapter/ini.zep.c b/ext/phalcon/config/adapter/ini.zep.c index 81948cffe8..56e3ebae0b 100644 --- a/ext/phalcon/config/adapter/ini.zep.c +++ b/ext/phalcon/config/adapter/ini.zep.c @@ -542,7 +542,7 @@ 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, 190, &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); @@ -592,7 +592,7 @@ 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, 191, &filename, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("parse_ini_file", NULL, 185, &filename, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/config/adapter/json.zep.c b/ext/phalcon/config/adapter/json.zep.c index 56271cccfb..c185c2958c 100644 --- a/ext/phalcon/config/adapter/json.zep.c +++ b/ext/phalcon/config/adapter/json.zep.c @@ -98,7 +98,7 @@ 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, 192, &_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(); @@ -171,16 +171,16 @@ 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, 193); + 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, 194); + 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, 195, &_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(); diff --git a/ext/phalcon/config/adapter/yaml.zep.c b/ext/phalcon/config/adapter/yaml.zep.c index cc25e7b5c9..ea76df564d 100644 --- a/ext/phalcon/config/adapter/yaml.zep.c +++ b/ext/phalcon/config/adapter/yaml.zep.c @@ -207,7 +207,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Yaml, phpYamlParseFile) ZEPHIR_MAKE_REF(ndocs); - ZEPHIR_RETURN_CALL_FUNCTION("yaml_parse_file", NULL, 196, 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(); @@ -235,7 +235,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Yaml, phpExtensionLoaded) zephir_get_strval(&name, name_param); - ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 197, &name); + ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 191, &name); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/config/configfactory.zep.c b/ext/phalcon/config/configfactory.zep.c index 1945ad429d..29efffb351 100644 --- a/ext/phalcon/config/configfactory.zep.c +++ b/ext/phalcon/config/configfactory.zep.c @@ -335,7 +335,7 @@ 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, 198, config); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkconfigarray", NULL, 192, config); zephir_check_call_status(); RETVAL_ZVAL(config, 1, 0); RETURN_MM(); diff --git a/ext/phalcon/datamapper/pdo/connection.zep.c b/ext/phalcon/datamapper/pdo/connection.zep.c index 7365218cfc..9addcc5ccf 100644 --- a/ext/phalcon/datamapper/pdo/connection.zep.c +++ b/ext/phalcon/datamapper/pdo/connection.zep.c @@ -101,7 +101,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Connection, __construct) Z_PARAM_STR_OR_NULL(password) Z_PARAM_ARRAY(options) Z_PARAM_ARRAY(queries) - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(profiler, phalcon_datamapper_pdo_profiler_profilerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(profiler, zephir_get_internal_ce(SL("phalcon\\datamapper\\pdo\\profiler\\profilerinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -154,7 +154,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Connection, __construct) zephir_array_fetch_long(&_2$$3, &parts, 0, PH_NOISY | PH_READONLY, "phalcon/DataMapper/Pdo/Connection.zep", 67); ZEPHIR_INIT_VAR(&_3$$3); ZEPHIR_CONCAT_SVS(&_3$$3, "Driver not supported [", &_2$$3, "]"); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 195, &_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", 68); ZEPHIR_MM_RESTORE(); @@ -176,7 +176,7 @@ 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, 199); + ZEPHIR_CALL_METHOD(NULL, profiler, "__construct", NULL, 193); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, this_ptr, "setprofiler", NULL, 0, profiler); diff --git a/ext/phalcon/datamapper/pdo/connection/abstractconnection.zep.c b/ext/phalcon/datamapper/pdo/connection/abstractconnection.zep.c index 77f9e611c0..b691a5040c 100644 --- a/ext/phalcon/datamapper/pdo/connection/abstractconnection.zep.c +++ b/ext/phalcon/datamapper/pdo/connection/abstractconnection.zep.c @@ -1692,7 +1692,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Connection_AbstractConnection, setProfiler) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(profiler, phalcon_datamapper_pdo_profiler_profilerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(profiler, zephir_get_internal_ce(SL("phalcon\\datamapper\\pdo\\profiler\\profilerinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/datamapper/pdo/connection/decorated.zep.c b/ext/phalcon/datamapper/pdo/connection/decorated.zep.c index 482884d809..45e4ed4a61 100644 --- a/ext/phalcon/datamapper/pdo/connection/decorated.zep.c +++ b/ext/phalcon/datamapper/pdo/connection/decorated.zep.c @@ -69,7 +69,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Connection_Decorated, __construct) ZEND_PARSE_PARAMETERS_START(1, 2) Z_PARAM_OBJECT_OF_CLASS(pdo, php_pdo_get_dbh_ce()) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(profiler, phalcon_datamapper_pdo_profiler_profilerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(profiler, zephir_get_internal_ce(SL("phalcon\\datamapper\\pdo\\profiler\\profilerinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -88,7 +88,7 @@ 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, 199); + ZEPHIR_CALL_METHOD(NULL, profiler, "__construct", NULL, 193); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, this_ptr, "setprofiler", NULL, 0, profiler); diff --git a/ext/phalcon/datamapper/pdo/connectionlocator.zep.c b/ext/phalcon/datamapper/pdo/connectionlocator.zep.c index dd5ee737d5..4bccb51a11 100644 --- a/ext/phalcon/datamapper/pdo/connectionlocator.zep.c +++ b/ext/phalcon/datamapper/pdo/connectionlocator.zep.c @@ -99,7 +99,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_ConnectionLocator, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 3) - Z_PARAM_OBJECT_OF_CLASS(master, phalcon_datamapper_pdo_connection_connectioninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(master, zephir_get_internal_ce(SL("phalcon\\datamapper\\pdo\\connection\\connectioninterface"))) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(read) Z_PARAM_ARRAY(write) @@ -322,7 +322,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_ConnectionLocator, setMaster) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(callableObject, phalcon_datamapper_pdo_connection_connectioninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(callableObject, zephir_get_internal_ce(SL("phalcon\\datamapper\\pdo\\connection\\connectioninterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -468,7 +468,7 @@ 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, 200, &collection); + ZEPHIR_CALL_FUNCTION(&requested, "array_rand", NULL, 194, &collection); zephir_check_call_status(); } if (!(zephir_array_isset(&collection, &requested))) { diff --git a/ext/phalcon/datamapper/pdo/profiler/profiler.zep.c b/ext/phalcon/datamapper/pdo/profiler/profiler.zep.c index 8e42b94576..2e3ba5e426 100644 --- a/ext/phalcon/datamapper/pdo/profiler/profiler.zep.c +++ b/ext/phalcon/datamapper/pdo/profiler/profiler.zep.c @@ -89,7 +89,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, phalcon_logger_loggerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(logger, zephir_get_internal_ce(SL("phalcon\\logger\\loggerinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -190,9 +190,9 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, finish) object_init_ex(&ex, phalcon_datamapper_pdo_exception_exception_ce); ZEPHIR_CALL_METHOD(NULL, &ex, "__construct", NULL, 29); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&finish, "hrtime", NULL, 201, &__$true); + ZEPHIR_CALL_FUNCTION(&finish, "hrtime", NULL, 195, &__$true); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, &ex, "gettraceasstring", NULL, 202); + ZEPHIR_CALL_METHOD(&_1$$3, &ex, "gettraceasstring", NULL, 196); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "backtrace"); @@ -215,7 +215,7 @@ 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, 203, &values); + ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "encode", NULL, 197, &values); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_9$$3); @@ -426,7 +426,7 @@ 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, 201, &__$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); @@ -481,16 +481,16 @@ 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, 193); + 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, 194); + 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, 195, &_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", 209); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/datamapper/query/abstractquery.zep.c b/ext/phalcon/datamapper/query/abstractquery.zep.c index e7bf6b1818..078868a389 100644 --- a/ext/phalcon/datamapper/query/abstractquery.zep.c +++ b/ext/phalcon/datamapper/query/abstractquery.zep.c @@ -78,8 +78,8 @@ PHP_METHOD(Phalcon_DataMapper_Query_AbstractQuery, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_datamapper_pdo_connection_ce) - Z_PARAM_OBJECT_OF_CLASS(bind, phalcon_datamapper_query_bind_ce) + Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\datamapper\\pdo\\connection"))) + Z_PARAM_OBJECT_OF_CLASS(bind, zephir_get_internal_ce(SL("phalcon\\datamapper\\query\\bind"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/datamapper/query/delete.zep.c b/ext/phalcon/datamapper/query/delete.zep.c index dacd970f91..dc51f9f8f5 100644 --- a/ext/phalcon/datamapper/query/delete.zep.c +++ b/ext/phalcon/datamapper/query/delete.zep.c @@ -66,8 +66,8 @@ PHP_METHOD(Phalcon_DataMapper_Query_Delete, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_datamapper_pdo_connection_ce) - Z_PARAM_OBJECT_OF_CLASS(bind, phalcon_datamapper_query_bind_ce) + Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\datamapper\\pdo\\connection"))) + Z_PARAM_OBJECT_OF_CLASS(bind, zephir_get_internal_ce(SL("phalcon\\datamapper\\query\\bind"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/datamapper/query/insert.zep.c b/ext/phalcon/datamapper/query/insert.zep.c index 0c045d6080..0667a66903 100644 --- a/ext/phalcon/datamapper/query/insert.zep.c +++ b/ext/phalcon/datamapper/query/insert.zep.c @@ -67,8 +67,8 @@ PHP_METHOD(Phalcon_DataMapper_Query_Insert, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_datamapper_pdo_connection_ce) - Z_PARAM_OBJECT_OF_CLASS(bind, phalcon_datamapper_query_bind_ce) + Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\datamapper\\pdo\\connection"))) + Z_PARAM_OBJECT_OF_CLASS(bind, zephir_get_internal_ce(SL("phalcon\\datamapper\\query\\bind"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -333,7 +333,7 @@ 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, 204); + 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(); diff --git a/ext/phalcon/datamapper/query/queryfactory.zep.c b/ext/phalcon/datamapper/query/queryfactory.zep.c index f3dce8216f..a94191c361 100644 --- a/ext/phalcon/datamapper/query/queryfactory.zep.c +++ b/ext/phalcon/datamapper/query/queryfactory.zep.c @@ -128,7 +128,7 @@ PHP_METHOD(Phalcon_DataMapper_Query_QueryFactory, newDelete) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_datamapper_pdo_connection_ce) + Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\datamapper\\pdo\\connection"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -140,7 +140,7 @@ 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, 205, connection, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 199, connection, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -164,7 +164,7 @@ PHP_METHOD(Phalcon_DataMapper_Query_QueryFactory, newInsert) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_datamapper_pdo_connection_ce) + Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\datamapper\\pdo\\connection"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -176,7 +176,7 @@ 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, 206, connection, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 200, connection, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -205,7 +205,7 @@ PHP_METHOD(Phalcon_DataMapper_Query_QueryFactory, newSelect) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_datamapper_pdo_connection_ce) + Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\datamapper\\pdo\\connection"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -251,7 +251,7 @@ PHP_METHOD(Phalcon_DataMapper_Query_QueryFactory, newUpdate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_datamapper_pdo_connection_ce) + Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\datamapper\\pdo\\connection"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -263,7 +263,7 @@ 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, 207, connection, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 201, connection, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/datamapper/query/select.zep.c b/ext/phalcon/datamapper/query/select.zep.c index 5af463d025..49232ccafe 100644 --- a/ext/phalcon/datamapper/query/select.zep.c +++ b/ext/phalcon/datamapper/query/select.zep.c @@ -920,7 +920,7 @@ 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, 208, &_0, &_1); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 202, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -1043,9 +1043,9 @@ 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, 209); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 203); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "buildfrom", NULL, 210); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "buildfrom", NULL, 204); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6); ZVAL_STRING(&_6, "WHERE"); diff --git a/ext/phalcon/datamapper/query/update.zep.c b/ext/phalcon/datamapper/query/update.zep.c index 18972f2e5f..a59d00390a 100644 --- a/ext/phalcon/datamapper/query/update.zep.c +++ b/ext/phalcon/datamapper/query/update.zep.c @@ -66,8 +66,8 @@ PHP_METHOD(Phalcon_DataMapper_Query_Update, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_datamapper_pdo_connection_ce) - Z_PARAM_OBJECT_OF_CLASS(bind, phalcon_datamapper_query_bind_ce) + Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\datamapper\\pdo\\connection"))) + Z_PARAM_OBJECT_OF_CLASS(bind, zephir_get_internal_ce(SL("phalcon\\datamapper\\query\\bind"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -293,7 +293,7 @@ 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, 211); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 205); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5); ZVAL_STRING(&_5, "WHERE"); diff --git a/ext/phalcon/db/adapter/abstractadapter.zep.c b/ext/phalcon/db/adapter/abstractadapter.zep.c index 929fe8dc20..b1cf8d3c28 100644 --- a/ext/phalcon/db/adapter/abstractadapter.zep.c +++ b/ext/phalcon/db/adapter/abstractadapter.zep.c @@ -210,7 +210,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, addColumn) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -266,7 +266,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, addForeignKey) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(reference, phalcon_db_referenceinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(reference, zephir_get_internal_ce(SL("phalcon\\db\\referenceinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -322,7 +322,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, addIndex) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(index, phalcon_db_indexinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(index, zephir_get_internal_ce(SL("phalcon\\db\\indexinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -378,7 +378,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, addPrimaryKey) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(index, phalcon_db_indexinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(index, zephir_get_internal_ce(SL("phalcon\\db\\indexinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1858,7 +1858,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getColumnDefinition) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2756,9 +2756,9 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, modifyColumn) ZEND_PARSE_PARAMETERS_START(3, 4) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(currentColumn, phalcon_db_columninterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(currentColumn, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2919,7 +2919,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, setEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2942,7 +2942,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, setDialect) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(dialect, phalcon_db_dialectinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(dialect, zephir_get_internal_ce(SL("phalcon\\db\\dialectinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/db/adapter/pdo/mysql.zep.c b/ext/phalcon/db/adapter/pdo/mysql.zep.c index 4942ed9584..02fd958bc9 100644 --- a/ext/phalcon/db/adapter/pdo/mysql.zep.c +++ b/ext/phalcon/db/adapter/pdo/mysql.zep.c @@ -142,7 +142,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, addForeignKey) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(reference, phalcon_db_referenceinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(reference, zephir_get_internal_ce(SL("phalcon\\db\\referenceinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -666,7 +666,7 @@ 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, 212, &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); @@ -968,7 +968,7 @@ 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, 212, &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); diff --git a/ext/phalcon/db/adapter/pdo/postgresql.zep.c b/ext/phalcon/db/adapter/pdo/postgresql.zep.c index d120818382..a45897d646 100644 --- a/ext/phalcon/db/adapter/pdo/postgresql.zep.c +++ b/ext/phalcon/db/adapter/pdo/postgresql.zep.c @@ -788,7 +788,7 @@ 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, 212, &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); @@ -1087,7 +1087,7 @@ 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, 212, &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); @@ -1487,9 +1487,9 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Postgresql, modifyColumn) ZEND_PARSE_PARAMETERS_START(3, 4) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(currentColumn, phalcon_db_columninterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(currentColumn, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/db/adapter/pdo/sqlite.zep.c b/ext/phalcon/db/adapter/pdo/sqlite.zep.c index 24c2dfa5dc..8650bf7aab 100644 --- a/ext/phalcon/db/adapter/pdo/sqlite.zep.c +++ b/ext/phalcon/db/adapter/pdo/sqlite.zep.c @@ -453,7 +453,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) 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, 212, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_33$$3, "__construct", &_41, 206, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_33$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 307); ZEPHIR_CPY_WRT(&oldColumn, &columnName); @@ -618,7 +618,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) 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, 212, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_71$$28, "__construct", &_41, 206, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_71$$28, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 307); ZEPHIR_CPY_WRT(&oldColumn, &columnName); diff --git a/ext/phalcon/db/adapter/pdofactory.zep.c b/ext/phalcon/db/adapter/pdofactory.zep.c index 8b139a36c8..19477bce44 100644 --- a/ext/phalcon/db/adapter/pdofactory.zep.c +++ b/ext/phalcon/db/adapter/pdofactory.zep.c @@ -139,7 +139,7 @@ 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, 155, config, &_3, &_2); + ZEPHIR_CALL_METHOD(&options, &_1, "__invoke", NULL, 149, config, &_3, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "newinstance", NULL, 0, &name, &options); zephir_check_call_status(); diff --git a/ext/phalcon/db/dialect.zep.c b/ext/phalcon/db/dialect.zep.c index 16b60c5a04..573faf6c6a 100644 --- a/ext/phalcon/db/dialect.zep.c +++ b/ext/phalcon/db/dialect.zep.c @@ -1227,7 +1227,7 @@ PHP_METHOD(Phalcon_Db_Dialect, getColumnSize) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1258,7 +1258,7 @@ PHP_METHOD(Phalcon_Db_Dialect, getColumnSizeAndScale) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1290,7 +1290,7 @@ PHP_METHOD(Phalcon_Db_Dialect, checkColumnType) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1326,7 +1326,7 @@ PHP_METHOD(Phalcon_Db_Dialect, checkColumnTypeSql) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/db/dialect/mysql.zep.c b/ext/phalcon/db/dialect/mysql.zep.c index f804217105..80b4edb36b 100644 --- a/ext/phalcon/db/dialect/mysql.zep.c +++ b/ext/phalcon/db/dialect/mysql.zep.c @@ -83,7 +83,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, addColumn) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -143,7 +143,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, addColumn) } _8$$5 = _7$$5; if (!(_8$$5)) { - ZEPHIR_CALL_FUNCTION(&_9$$5, "is_float", NULL, 213, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_9$$5, "is_float", NULL, 207, &defaultValue); zephir_check_call_status(); _8$$5 = zephir_is_true(&_9$$5); } @@ -154,7 +154,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, addColumn) } else { ZEPHIR_INIT_VAR(&_11$$7); ZVAL_STRING(&_11$$7, "\""); - ZEPHIR_CALL_FUNCTION(&_12$$7, "addcslashes", NULL, 214, &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, "\""); @@ -219,7 +219,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, addForeignKey) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(reference, phalcon_db_referenceinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(reference, zephir_get_internal_ce(SL("phalcon\\db\\referenceinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -322,7 +322,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, addIndex) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(index, phalcon_db_indexinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(index, zephir_get_internal_ce(SL("phalcon\\db\\indexinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -397,7 +397,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, addPrimaryKey) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(index, phalcon_db_indexinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(index, zephir_get_internal_ce(SL("phalcon\\db\\indexinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -642,7 +642,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) } _11$$10 = _10$$10; if (!(_11$$10)) { - ZEPHIR_CALL_FUNCTION(&_12$$10, "is_float", &_13, 213, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_12$$10, "is_float", &_13, 207, &defaultValue); zephir_check_call_status(); _11$$10 = zephir_is_true(&_12$$10); } @@ -653,7 +653,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) } else { ZEPHIR_INIT_NVAR(&_15$$12); ZVAL_STRING(&_15$$12, "\""); - ZEPHIR_CALL_FUNCTION(&_16$$12, "addcslashes", &_17, 214, &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, "\""); @@ -722,7 +722,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) } _30$$19 = _29$$19; if (!(_30$$19)) { - ZEPHIR_CALL_FUNCTION(&_31$$19, "is_float", &_13, 213, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_31$$19, "is_float", &_13, 207, &defaultValue); zephir_check_call_status(); _30$$19 = zephir_is_true(&_31$$19); } @@ -733,7 +733,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) } else { ZEPHIR_INIT_NVAR(&_33$$21); ZVAL_STRING(&_33$$21, "\""); - ZEPHIR_CALL_FUNCTION(&_34$$21, "addcslashes", &_17, 214, &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, "\""); @@ -1615,7 +1615,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1635,7 +1635,7 @@ 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, 215, 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); @@ -1697,7 +1697,7 @@ 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, 215, 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); @@ -1708,9 +1708,9 @@ 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, 216, 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, 215, 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); @@ -1730,9 +1730,9 @@ 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, 216, 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, 215, 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); @@ -1745,7 +1745,7 @@ 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, 215, 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); @@ -1782,7 +1782,7 @@ 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, 215, 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); @@ -1801,7 +1801,7 @@ 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, 215, 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); @@ -1852,7 +1852,7 @@ 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, 215, 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); @@ -1901,7 +1901,7 @@ 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, 214, &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, "\", "); @@ -1920,7 +1920,7 @@ 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, 214, &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, "\", "); @@ -1940,7 +1940,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } else { ZEPHIR_INIT_VAR(&_50$$64); ZVAL_STRING(&_50$$64, "\""); - ZEPHIR_CALL_FUNCTION(&_51$$64, "addcslashes", &_41, 214, &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, "\")"); @@ -2099,9 +2099,9 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, modifyColumn) ZEND_PARSE_PARAMETERS_START(3, 4) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(currentColumn, phalcon_db_columninterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(currentColumn, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2187,7 +2187,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, modifyColumn) } _13$$8 = _12$$8; if (!(_13$$8)) { - ZEPHIR_CALL_FUNCTION(&_14$$8, "is_float", NULL, 213, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_14$$8, "is_float", NULL, 207, &defaultValue); zephir_check_call_status(); _13$$8 = zephir_is_true(&_14$$8); } @@ -2198,7 +2198,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, modifyColumn) } else { ZEPHIR_INIT_VAR(&_16$$10); ZVAL_STRING(&_16$$10, "\""); - ZEPHIR_CALL_FUNCTION(&_17$$10, "addcslashes", NULL, 214, &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, "\""); @@ -2583,7 +2583,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, checkColumnSizeAndScale) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2630,7 +2630,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, checkColumnUnsigned) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/db/dialect/postgresql.zep.c b/ext/phalcon/db/dialect/postgresql.zep.c index 0bb87c4498..1af558ffb4 100644 --- a/ext/phalcon/db/dialect/postgresql.zep.c +++ b/ext/phalcon/db/dialect/postgresql.zep.c @@ -74,7 +74,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Postgresql, addColumn) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -167,7 +167,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Postgresql, addForeignKey) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(reference, phalcon_db_referenceinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(reference, zephir_get_internal_ce(SL("phalcon\\db\\referenceinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -267,7 +267,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Postgresql, addIndex) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(index, phalcon_db_indexinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(index, zephir_get_internal_ce(SL("phalcon\\db\\indexinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -349,7 +349,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Postgresql, addPrimaryKey) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(index, phalcon_db_indexinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(index, zephir_get_internal_ce(SL("phalcon\\db\\indexinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1512,7 +1512,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Postgresql, getColumnDefinition) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1657,7 +1657,7 @@ 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, 214, &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, "', "); @@ -1676,7 +1676,7 @@ 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, 214, &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, "', "); @@ -1696,7 +1696,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Postgresql, getColumnDefinition) } else { ZEPHIR_INIT_VAR(&_21$$41); ZVAL_STRING(&_21$$41, "\'"); - ZEPHIR_CALL_FUNCTION(&_22$$41, "addcslashes", &_12, 214, &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, "')"); @@ -1849,9 +1849,9 @@ PHP_METHOD(Phalcon_Db_Dialect_Postgresql, modifyColumn) ZEND_PARSE_PARAMETERS_START(3, 4) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(currentColumn, phalcon_db_columninterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(currentColumn, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2258,7 +2258,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Postgresql, castDefault) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2305,7 +2305,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Postgresql, castDefault) } else { ZEPHIR_INIT_VAR(&_7$$6); ZVAL_STRING(&_7$$6, "\'"); - ZEPHIR_CALL_FUNCTION(&_8$$6, "addcslashes", NULL, 214, &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, "'"); diff --git a/ext/phalcon/db/dialect/sqlite.zep.c b/ext/phalcon/db/dialect/sqlite.zep.c index 068274dad0..3584c75969 100644 --- a/ext/phalcon/db/dialect/sqlite.zep.c +++ b/ext/phalcon/db/dialect/sqlite.zep.c @@ -78,7 +78,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, addColumn) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -129,7 +129,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, addColumn) } else { ZEPHIR_INIT_VAR(&_7$$5); ZVAL_STRING(&_7$$5, "\""); - ZEPHIR_CALL_FUNCTION(&_8$$5, "addcslashes", NULL, 214, &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, "\""); @@ -169,7 +169,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, addForeignKey) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(reference, phalcon_db_referenceinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(reference, zephir_get_internal_ce(SL("phalcon\\db\\referenceinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -229,7 +229,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, addIndex) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(index, phalcon_db_indexinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(index, zephir_get_internal_ce(SL("phalcon\\db\\indexinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -307,7 +307,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, addPrimaryKey) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(index, phalcon_db_indexinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(index, zephir_get_internal_ce(SL("phalcon\\db\\indexinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -533,7 +533,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, createTable) } else { ZEPHIR_INIT_NVAR(&_13$$12); ZVAL_STRING(&_13$$12, "\""); - ZEPHIR_CALL_FUNCTION(&_14$$12, "addcslashes", &_15, 214, &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, "\""); @@ -597,7 +597,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, createTable) } else { ZEPHIR_INIT_NVAR(&_26$$20); ZVAL_STRING(&_26$$20, "\""); - ZEPHIR_CALL_FUNCTION(&_27$$20, "addcslashes", &_15, 214, &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, "\""); @@ -1458,7 +1458,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, getColumnDefinition) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1614,7 +1614,7 @@ 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, 214, &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, "\", "); @@ -1633,7 +1633,7 @@ 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, 214, &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, "\", "); @@ -1653,7 +1653,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, getColumnDefinition) } else { ZEPHIR_INIT_VAR(&_21$$43); ZVAL_STRING(&_21$$43, "\""); - ZEPHIR_CALL_FUNCTION(&_22$$43, "addcslashes", &_12, 214, &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, "\")"); @@ -1837,9 +1837,9 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, modifyColumn) ZEND_PARSE_PARAMETERS_START(3, 4) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(currentColumn, phalcon_db_columninterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(currentColumn, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/db/profiler.zep.c b/ext/phalcon/db/profiler.zep.c index 6c6ac840fb..10d73e0e0c 100644 --- a/ext/phalcon/db/profiler.zep.c +++ b/ext/phalcon/db/profiler.zep.c @@ -267,15 +267,15 @@ PHP_METHOD(Phalcon_Db_Profiler, startProfile) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlstatement", NULL, 217, &sqlStatement); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlstatement", NULL, 211, &sqlStatement); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlvariables", NULL, 218, &sqlVariables); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlvariables", NULL, 212, &sqlVariables); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlbindtypes", NULL, 219, &sqlBindTypes); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlbindtypes", NULL, 213, &sqlBindTypes); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_0, "hrtime", NULL, 201, &__$true); + ZEPHIR_CALL_FUNCTION(&_0, "hrtime", NULL, 195, &__$true); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setinitialtime", NULL, 220, &_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); @@ -307,7 +307,7 @@ PHP_METHOD(Phalcon_Db_Profiler, stopProfile) zephir_read_property(&_0, this_ptr, ZEND_STRL("activeProfile"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&activeProfile, &_0); - ZEPHIR_CALL_FUNCTION(&_1, "hrtime", NULL, 201, &__$true); + ZEPHIR_CALL_FUNCTION(&_1, "hrtime", NULL, 195, &__$true); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setfinaltime", NULL, 0, &_1); zephir_check_call_status(); diff --git a/ext/phalcon/db/result/pdoresult.zep.c b/ext/phalcon/db/result/pdoresult.zep.c index f39c5f0f34..0328774118 100644 --- a/ext/phalcon/db/result/pdoresult.zep.c +++ b/ext/phalcon/db/result/pdoresult.zep.c @@ -112,7 +112,7 @@ PHP_METHOD(Phalcon_Db_Result_PdoResult, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 5) - Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_db_adapter_adapterinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\db\\adapter\\adapterinterface"))) Z_PARAM_OBJECT_OF_CLASS(result, zephir_get_internal_ce(SL("pdostatement"))) Z_PARAM_OPTIONAL Z_PARAM_ZVAL_OR_NULL(sqlStatement) diff --git a/ext/phalcon/di/abstractinjectionaware.zep.c b/ext/phalcon/di/abstractinjectionaware.zep.c index 50d6d32e6e..826bdc908b 100644 --- a/ext/phalcon/di/abstractinjectionaware.zep.c +++ b/ext/phalcon/di/abstractinjectionaware.zep.c @@ -65,7 +65,7 @@ PHP_METHOD(Phalcon_Di_AbstractInjectionAware, setDI) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/di/di.zep.c b/ext/phalcon/di/di.zep.c index 1992b1116b..fe0a83c3ce 100644 --- a/ext/phalcon/di/di.zep.c +++ b/ext/phalcon/di/di.zep.c @@ -684,7 +684,7 @@ PHP_METHOD(Phalcon_Di_Di, loadFromConfig) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(config, phalcon_config_configinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(config, zephir_get_internal_ce(SL("phalcon\\config\\configinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1097,7 +1097,7 @@ PHP_METHOD(Phalcon_Di_Di, register) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(provider, phalcon_di_serviceproviderinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(provider, zephir_get_internal_ce(SL("phalcon\\di\\serviceproviderinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1248,7 +1248,7 @@ PHP_METHOD(Phalcon_Di_Di, setDefault) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1271,7 +1271,7 @@ PHP_METHOD(Phalcon_Di_Di, setInternalEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1298,7 +1298,7 @@ PHP_METHOD(Phalcon_Di_Di, setService) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(name) - Z_PARAM_OBJECT_OF_CLASS(rawDefinition, phalcon_di_serviceinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(rawDefinition, zephir_get_internal_ce(SL("phalcon\\di\\serviceinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/di/injectable.zep.c b/ext/phalcon/di/injectable.zep.c index 8b64c9a842..9b0b4b97cb 100644 --- a/ext/phalcon/di/injectable.zep.c +++ b/ext/phalcon/di/injectable.zep.c @@ -238,7 +238,7 @@ PHP_METHOD(Phalcon_Di_Injectable, setDI) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/di/service.zep.c b/ext/phalcon/di/service.zep.c index 2375df756f..d4d2a8b5fd 100644 --- a/ext/phalcon/di/service.zep.c +++ b/ext/phalcon/di/service.zep.c @@ -216,7 +216,7 @@ PHP_METHOD(Phalcon_Di_Service, resolve) ZEND_PARSE_PARAMETERS_START(0, 2) Z_PARAM_OPTIONAL Z_PARAM_ZVAL_OR_NULL(parameters) - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -295,7 +295,7 @@ PHP_METHOD(Phalcon_Di_Service, resolve) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&instance, &builder, "build", NULL, 221, container, &definition, parameters); + ZEPHIR_CALL_METHOD(&instance, &builder, "build", NULL, 215, container, &definition, parameters); zephir_check_call_status(); } else { found = 0; diff --git a/ext/phalcon/di/service/builder.zep.c b/ext/phalcon/di/service/builder.zep.c index f36e953cc2..6aa19db329 100644 --- a/ext/phalcon/di/service/builder.zep.c +++ b/ext/phalcon/di/service/builder.zep.c @@ -117,7 +117,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 3) - Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) Z_PARAM_ARRAY(definition) Z_PARAM_OPTIONAL Z_PARAM_ZVAL_OR_NULL(parameters) @@ -152,7 +152,7 @@ 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, 222, 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); @@ -228,7 +228,7 @@ 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, 222, 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(); @@ -296,7 +296,7 @@ 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, 222, 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(); @@ -370,7 +370,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_37$$28, this_ptr, "buildparameter", &_38, 223, 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(); @@ -422,7 +422,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_45$$32, this_ptr, "buildparameter", &_38, 223, 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); @@ -473,7 +473,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, buildParameter) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(3, 3) - Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) Z_PARAM_LONG(position) Z_PARAM_ARRAY(argument) ZEND_PARSE_PARAMETERS_END(); @@ -603,7 +603,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, buildParameters) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) Z_PARAM_ARRAY(arguments) ZEND_PARSE_PARAMETERS_END(); #endif @@ -628,7 +628,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, buildParameters) } ZEPHIR_INIT_NVAR(&argument); ZVAL_COPY(&argument, _0); - ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "buildparameter", &_5, 223, 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", 298); } ZEND_HASH_FOREACH_END(); @@ -645,7 +645,7 @@ 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, 223, 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", 298); ZEPHIR_CALL_METHOD(NULL, &arguments, "next", NULL, 0); diff --git a/ext/phalcon/dispatcher/abstractdispatcher.zep.c b/ext/phalcon/dispatcher/abstractdispatcher.zep.c index 607f2dd197..e0a56e3aec 100644 --- a/ext/phalcon/dispatcher/abstractdispatcher.zep.c +++ b/ext/phalcon/dispatcher/abstractdispatcher.zep.c @@ -1750,7 +1750,7 @@ PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, setEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1826,7 +1826,7 @@ PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, setModelBinder) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(modelBinder, phalcon_mvc_model_binderinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(modelBinder, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\binderinterface"))) Z_PARAM_OPTIONAL Z_PARAM_ZVAL_OR_NULL(cache) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/phalcon/encryption/crypt.zep.c b/ext/phalcon/encryption/crypt.zep.c index e7060428b4..8020a518fd 100644 --- a/ext/phalcon/encryption/crypt.zep.c +++ b/ext/phalcon/encryption/crypt.zep.c @@ -165,7 +165,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, __construct) Z_PARAM_OPTIONAL Z_PARAM_STR(cipher) Z_PARAM_BOOL(useSigning) - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(padFactory, phalcon_encryption_crypt_padfactory_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(padFactory, zephir_get_internal_ce(SL("phalcon\\encryption\\crypt\\padfactory"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -194,7 +194,7 @@ 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, 224); + ZEPHIR_CALL_METHOD(NULL, padFactory, "__construct", NULL, 218); zephir_check_call_status(); } zephir_update_property_zval(this_ptr, ZEND_STRL("padFactory"), padFactory); @@ -303,14 +303,14 @@ 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, 225); + ZEPHIR_CALL_METHOD(&mode, this_ptr, "getmode", NULL, 219); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 226, &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, 227, &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, ""); @@ -326,18 +326,18 @@ PHP_METHOD(Phalcon_Encryption_Crypt, decrypt) 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, 227, &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, 227, &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, 227, &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); @@ -348,7 +348,7 @@ 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, 228, &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); @@ -428,7 +428,7 @@ 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, 229, &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(); @@ -511,9 +511,9 @@ 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, 225); + ZEPHIR_CALL_METHOD(&mode, this_ptr, "getmode", NULL, 219); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 226, &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(); @@ -529,7 +529,7 @@ 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, 228, &_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(); @@ -594,7 +594,7 @@ 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, 230, &_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, "+/"); @@ -609,7 +609,7 @@ 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, 230, &_5); + ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 224, &_5); zephir_check_call_status(); RETURN_MM(); } @@ -693,11 +693,11 @@ 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, 231); + ZEPHIR_RETURN_CALL_FUNCTION("hash_hmac_algos", NULL, 225); zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_RETURN_CALL_FUNCTION("hash_algos", NULL, 232); + ZEPHIR_RETURN_CALL_FUNCTION("hash_algos", NULL, 226); zephir_check_call_status(); RETURN_MM(); } @@ -783,7 +783,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, isValidDecryptLength) if (ZEPHIR_IS_FALSE_IDENTICAL(&length)) { RETURN_MM_BOOL(0); } - ZEPHIR_CALL_FUNCTION(&_1, "mb_strlen", NULL, 233, &input); + ZEPHIR_CALL_FUNCTION(&_1, "mb_strlen", NULL, 227, &input); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_LE(&length, &_1)); } @@ -914,7 +914,7 @@ 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, 234, &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); @@ -1128,7 +1128,7 @@ 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, 113, &_2$$5, &type, &cipher); + ZEPHIR_CALL_FUNCTION(&_3$$5, "sprintf", NULL, 107, &_2$$5, &type, &cipher); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$5, "__construct", NULL, 29, &_3$$5); zephir_check_call_status(); @@ -1205,10 +1205,10 @@ 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, 235, &_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, 233, &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; @@ -1316,7 +1316,7 @@ 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, 235, &_3, &mode); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkismode", NULL, 229, &_3, &mode); zephir_check_call_status(); _1 = ZEPHIR_IS_TRUE_IDENTICAL(&_2); } @@ -1401,7 +1401,7 @@ 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, 235, &_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); @@ -1478,7 +1478,7 @@ 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, 235, &_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); @@ -1493,11 +1493,11 @@ 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, 236, &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, 236, &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)) { @@ -1561,7 +1561,7 @@ 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, 235, &_3, &mode); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkismode", NULL, 229, &_3, &mode); zephir_check_call_status(); _1 = ZEPHIR_IS_TRUE_IDENTICAL(&_2); } @@ -1639,7 +1639,7 @@ 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, 235, &_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); @@ -1654,13 +1654,13 @@ 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, 237, &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, 237, &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)) { @@ -1705,7 +1705,7 @@ 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, 238, &__$true); + ZEPHIR_CALL_FUNCTION(&available, "openssl_get_cipher_methods", NULL, 232, &__$true); zephir_check_call_status(); ZEPHIR_INIT_VAR(&allowed); array_init(&allowed); @@ -1846,9 +1846,9 @@ 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, 239, &_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, 234, &_4); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getivlength", NULL, 228, &_4); zephir_check_call_status(); RETURN_MM(); } @@ -1884,7 +1884,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, getIvLength) zephir_get_strval(&cipher, cipher_param); - ZEPHIR_CALL_FUNCTION(&length, "openssl_cipher_iv_length", NULL, 240, &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); @@ -1919,7 +1919,7 @@ 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, 241, &_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)); @@ -1982,7 +1982,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, phpOpensslCipherIvLength) zephir_get_strval(&cipher, cipher_param); - ZEPHIR_RETURN_CALL_FUNCTION("openssl_cipher_iv_length", NULL, 240, &cipher); + ZEPHIR_RETURN_CALL_FUNCTION("openssl_cipher_iv_length", NULL, 234, &cipher); zephir_check_call_status(); RETURN_MM(); } @@ -2009,7 +2009,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, phpOpensslRandomPseudoBytes) ZVAL_LONG(&_0, length); - ZEPHIR_RETURN_CALL_FUNCTION("openssl_random_pseudo_bytes", NULL, 242, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("openssl_random_pseudo_bytes", NULL, 236, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/crypt/padding/ansi.zep.c b/ext/phalcon/encryption/crypt/padding/ansi.zep.c index ae5b2e81d7..61363c1c02 100644 --- a/ext/phalcon/encryption/crypt/padding/ansi.zep.c +++ b/ext/phalcon/encryption/crypt/padding/ansi.zep.c @@ -71,13 +71,13 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Ansi, pad) ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 243, &_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, 243, &_0); + ZEPHIR_CALL_FUNCTION(&_3, "chr", NULL, 237, &_0); zephir_check_call_status(); ZEPHIR_CONCAT_VV(return_value, &_2, &_3); RETURN_MM(); @@ -133,7 +133,7 @@ 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, 244, &last); + ZEPHIR_CALL_FUNCTION(&ord, "ord", NULL, 238, &last); zephir_check_call_status(); if (ZEPHIR_LE_LONG(&ord, blockSize)) { ZEPHIR_CPY_WRT(&paddingSize, &ord); @@ -141,7 +141,7 @@ 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, 243, &_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); diff --git a/ext/phalcon/encryption/crypt/padding/iso10126.zep.c b/ext/phalcon/encryption/crypt/padding/iso10126.zep.c index 62daf661d6..5008e604e9 100644 --- a/ext/phalcon/encryption/crypt/padding/iso10126.zep.c +++ b/ext/phalcon/encryption/crypt/padding/iso10126.zep.c @@ -91,15 +91,15 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Iso10126, pad) } ZEPHIR_INIT_NVAR(&counter); ZVAL_LONG(&counter, _1); - ZEPHIR_CALL_FUNCTION(&_3$$3, "rand", &_4, 245); + ZEPHIR_CALL_FUNCTION(&_3$$3, "rand", &_4, 239); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_5$$3, "chr", &_6, 243, &_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, 243, &_7); + ZEPHIR_CALL_FUNCTION(&_8, "chr", &_6, 237, &_7); zephir_check_call_status(); zephir_concat_self(&padding, &_8); RETURN_CCTOR(&padding); @@ -145,7 +145,7 @@ 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, 244, &last); + ZEPHIR_RETURN_CALL_FUNCTION("ord", NULL, 238, &last); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/crypt/padding/isoiek.zep.c b/ext/phalcon/encryption/crypt/padding/isoiek.zep.c index f1245782eb..15d9003083 100644 --- a/ext/phalcon/encryption/crypt/padding/isoiek.zep.c +++ b/ext/phalcon/encryption/crypt/padding/isoiek.zep.c @@ -71,10 +71,10 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_IsoIek, pad) ZVAL_LONG(&_0, 0x80); - ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 243, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 237, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_FUNCTION(&_2, "chr", NULL, 243, &_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); @@ -123,7 +123,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_IsoIek, unpad) paddingSize = 0; - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 233, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 227, &input); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 84, &input); zephir_check_call_status(); @@ -133,7 +133,7 @@ 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, 243, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 237, &_2); zephir_check_call_status(); _0 = ZEPHIR_IS_IDENTICAL(&_1, &_3); } @@ -149,7 +149,7 @@ 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, 243, &_2); + ZEPHIR_CALL_FUNCTION(&_7, "chr", &_4, 237, &_2); zephir_check_call_status(); if (ZEPHIR_IS_EQUAL(&_6, &_7)) { paddingSize++; diff --git a/ext/phalcon/encryption/crypt/padding/pkcs7.zep.c b/ext/phalcon/encryption/crypt/padding/pkcs7.zep.c index d48e3355eb..108f2a3ee7 100644 --- a/ext/phalcon/encryption/crypt/padding/pkcs7.zep.c +++ b/ext/phalcon/encryption/crypt/padding/pkcs7.zep.c @@ -68,7 +68,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Pkcs7, pad) ZVAL_LONG(&_0, paddingSize); - ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 243, &_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); @@ -116,17 +116,17 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Pkcs7, unpad) blockSize = zephir_get_intval(blockSize_param); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 233, &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, 244, &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, 243, &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(); diff --git a/ext/phalcon/encryption/crypt/padding/space.zep.c b/ext/phalcon/encryption/crypt/padding/space.zep.c index 78bc78d56f..f798a6d8c7 100644 --- a/ext/phalcon/encryption/crypt/padding/space.zep.c +++ b/ext/phalcon/encryption/crypt/padding/space.zep.c @@ -112,7 +112,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Space, unpad) blockSize = zephir_get_intval(blockSize_param); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 233, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 227, &input); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 84, &input); zephir_check_call_status(); @@ -123,7 +123,7 @@ 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, 243, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 237, &_2); zephir_check_call_status(); _0 = ZEPHIR_IS_EQUAL(&_1, &_3); } diff --git a/ext/phalcon/encryption/crypt/padding/zero.zep.c b/ext/phalcon/encryption/crypt/padding/zero.zep.c index 4720782758..3f9c784784 100644 --- a/ext/phalcon/encryption/crypt/padding/zero.zep.c +++ b/ext/phalcon/encryption/crypt/padding/zero.zep.c @@ -68,7 +68,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Zero, pad) ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 243, &_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); @@ -113,7 +113,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Zero, unpad) blockSize = zephir_get_intval(blockSize_param); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 233, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 227, &input); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 84, &input); zephir_check_call_status(); @@ -124,7 +124,7 @@ 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, 243, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 237, &_2); zephir_check_call_status(); _0 = ZEPHIR_IS_EQUAL(&_1, &_3); } diff --git a/ext/phalcon/encryption/crypt/padfactory.zep.c b/ext/phalcon/encryption/crypt/padfactory.zep.c index faa6269e5c..947d256574 100644 --- a/ext/phalcon/encryption/crypt/padfactory.zep.c +++ b/ext/phalcon/encryption/crypt/padfactory.zep.c @@ -173,7 +173,7 @@ 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, 155, &map, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(&_0, "__invoke", NULL, 149, &map, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/security.zep.c b/ext/phalcon/encryption/security.zep.c index 2c6ae88e88..a54f8dec80 100644 --- a/ext/phalcon/encryption/security.zep.c +++ b/ext/phalcon/encryption/security.zep.c @@ -146,8 +146,8 @@ PHP_METHOD(Phalcon_Encryption_Security, __construct) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 2) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(session, phalcon_session_managerinterface_ce) - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(request, phalcon_http_requestinterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(session, zephir_get_internal_ce(SL("phalcon\\session\\managerinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(request, zephir_get_internal_ce(SL("phalcon\\http\\requestinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -227,7 +227,7 @@ PHP_METHOD(Phalcon_Encryption_Security, checkHash) if (_0) { RETURN_MM_BOOL(0); } - ZEPHIR_RETURN_CALL_FUNCTION("password_verify", NULL, 246, &password, &passwordHash); + ZEPHIR_RETURN_CALL_FUNCTION("password_verify", NULL, 240, &password, &passwordHash); zephir_check_call_status(); RETURN_MM(); } @@ -287,13 +287,13 @@ PHP_METHOD(Phalcon_Encryption_Security, checkToken) } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "processtokenkey", NULL, 247, &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, 248, &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(); @@ -371,14 +371,14 @@ PHP_METHOD(Phalcon_Encryption_Security, computeHmac) ZVAL_BOOL(&_0, (raw ? 1 : 0)); - ZEPHIR_CALL_FUNCTION(&hmac, "hash_hmac", NULL, 228, &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, 113, &_2$$3, &algo); + ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 107, &_2$$3, &algo); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_3$$3); zephir_check_call_status(); @@ -472,7 +472,7 @@ PHP_METHOD(Phalcon_Encryption_Security, getHashInformation) zephir_get_strval(&hash, hash_param); - ZEPHIR_RETURN_CALL_FUNCTION("password_get_info", NULL, 249, &hash); + ZEPHIR_RETURN_CALL_FUNCTION("password_get_info", NULL, 243, &hash); zephir_check_call_status(); RETURN_MM(); } @@ -790,11 +790,11 @@ PHP_METHOD(Phalcon_Encryption_Security, hash) } - ZEPHIR_CALL_METHOD(&cost, this_ptr, "processcost", NULL, 250, &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, 113, &_0, &cost); + ZEPHIR_CALL_FUNCTION(&formatted, "sprintf", NULL, 107, &_0, &cost); zephir_check_call_status(); ZEPHIR_INIT_VAR(&prefix); ZVAL_STRING(&prefix, ""); @@ -824,14 +824,14 @@ 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, 113, &_2$$6, &formatted); + ZEPHIR_CALL_FUNCTION(&prefix, "sprintf", NULL, 107, &_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, 113, &_3$$7, &formatted); + ZEPHIR_CALL_FUNCTION(&prefix, "sprintf", NULL, 107, &_3$$7, &formatted); zephir_check_call_status(); break; } @@ -845,7 +845,7 @@ 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, 251, &password, &salt); + ZEPHIR_RETURN_CALL_FUNCTION("crypt", NULL, 245, &password, &salt); zephir_check_call_status(); RETURN_MM(); } @@ -853,11 +853,11 @@ 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, 252); + ZEPHIR_CALL_METHOD(&algorithm, this_ptr, "processalgorithm", NULL, 246); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&arguments, this_ptr, "processargonoptions", NULL, 253, &options); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "processargonoptions", NULL, 247, &options); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("password_hash", NULL, 254, &password, &algorithm, &arguments); + ZEPHIR_RETURN_CALL_FUNCTION("password_hash", NULL, 248, &password, &algorithm, &arguments); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/security/jwt/builder.zep.c b/ext/phalcon/encryption/security/jwt/builder.zep.c index 9a854a9a23..8e4baea9c8 100644 --- a/ext/phalcon/encryption/security/jwt/builder.zep.c +++ b/ext/phalcon/encryption/security/jwt/builder.zep.c @@ -80,7 +80,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(signer, phalcon_encryption_security_jwt_signer_signerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(signer, zephir_get_internal_ce(SL("phalcon\\encryption\\security\\jwt\\signer\\signerinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -497,27 +497,27 @@ 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, 255, &_2); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "encode", NULL, 249, &_2); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&encodedClaims, this_ptr, "encodeurl", NULL, 256, &_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, 257, &_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, 255, &_5); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "encode", NULL, 249, &_5); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&encodedHeaders, this_ptr, "encodeurl", NULL, 256, &_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, 257, &_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); @@ -525,14 +525,14 @@ 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, 256, &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, 258, &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, 259, &headers, &claims, &signature); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 253, &headers, &claims, &signature); zephir_check_call_status(); RETURN_MM(); } @@ -1091,7 +1091,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, encodeUrl) } - ZEPHIR_CALL_FUNCTION(&_0, "base64_encode", NULL, 230, &input); + ZEPHIR_CALL_FUNCTION(&_0, "base64_encode", NULL, 224, &input); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "+/"); @@ -1155,16 +1155,16 @@ 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, 193); + 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, 194); + 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, 195, &_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", 446); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/encryption/security/jwt/signer/hmac.zep.c b/ext/phalcon/encryption/security/jwt/signer/hmac.zep.c index faff3027a8..3e7b9cf5a9 100644 --- a/ext/phalcon/encryption/security/jwt/signer/hmac.zep.c +++ b/ext/phalcon/encryption/security/jwt/signer/hmac.zep.c @@ -177,7 +177,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Signer_Hmac, sign) } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethash", NULL, 260, &payload, &passphrase); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethash", NULL, 254, &payload, &passphrase); zephir_check_call_status(); RETURN_MM(); } @@ -220,7 +220,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Signer_Hmac, verify) zephir_get_strval(&passphrase, passphrase_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "gethash", NULL, 260, &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)); } @@ -262,7 +262,7 @@ 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, 228, &_0, &payload, &passphrase, &__$true); + ZEPHIR_RETURN_CALL_FUNCTION("hash_hmac", NULL, 222, &_0, &payload, &passphrase, &__$true); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/security/jwt/token/parser.zep.c b/ext/phalcon/encryption/security/jwt/token/parser.zep.c index c0fb5118ce..c2dfc8e7f4 100644 --- a/ext/phalcon/encryption/security/jwt/token/parser.zep.c +++ b/ext/phalcon/encryption/security/jwt/token/parser.zep.c @@ -89,7 +89,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, parse) } - ZEPHIR_CALL_METHOD(&results, this_ptr, "parsetoken", NULL, 261, &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", 37); @@ -97,14 +97,14 @@ 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", 38); ZEPHIR_OBS_VAR(&encodedSignature); zephir_array_fetch_long(&encodedSignature, &results, 2, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 39); - ZEPHIR_CALL_METHOD(&headers, this_ptr, "decodeheaders", NULL, 262, &encodedHeaders); + ZEPHIR_CALL_METHOD(&headers, this_ptr, "decodeheaders", NULL, 256, &encodedHeaders); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&claims, this_ptr, "decodeclaims", NULL, 263, &encodedClaims); + ZEPHIR_CALL_METHOD(&claims, this_ptr, "decodeclaims", NULL, 257, &encodedClaims); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&signature, this_ptr, "decodesignature", NULL, 264, &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, 259, &headers, &claims, &signature); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 253, &headers, &claims, &signature); zephir_check_call_status(); RETURN_MM(); } @@ -146,10 +146,10 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeClaims) zephir_get_strval(&claims, claims_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "decodeurl", NULL, 265, &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, 266, &_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", 63); @@ -170,7 +170,7 @@ 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, 257, &decoded, &claims); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 251, &decoded, &claims); zephir_check_call_status(); RETURN_MM(); } @@ -207,10 +207,10 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeHeaders) zephir_get_strval(&headers, headers_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "decodeurl", NULL, 265, &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, 266, &_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", 92); @@ -221,7 +221,7 @@ 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, 257, &decoded, &headers); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 251, &decoded, &headers); zephir_check_call_status(); RETURN_MM(); } @@ -252,7 +252,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeSignature) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(headers, phalcon_encryption_security_jwt_token_item_ce) + Z_PARAM_OBJECT_OF_CLASS(headers, zephir_get_internal_ce(SL("phalcon\\encryption\\security\\jwt\\token\\item"))) Z_PARAM_STR(signature) ZEND_PARSE_PARAMETERS_END(); #endif @@ -276,11 +276,11 @@ 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, 265, &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, 258, &decoded, &signature); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 252, &decoded, &signature); zephir_check_call_status(); RETURN_MM(); } @@ -397,16 +397,16 @@ 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, 193); + 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, 194); + 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, 195, &_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", 167); ZEPHIR_MM_RESTORE(); @@ -470,7 +470,7 @@ 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, 229, &_5); + ZEPHIR_CALL_FUNCTION(&data, "base64_decode", NULL, 223, &_5); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&data)) { ZEPHIR_INIT_NVAR(&data); diff --git a/ext/phalcon/encryption/security/jwt/token/token.zep.c b/ext/phalcon/encryption/security/jwt/token/token.zep.c index 83dc2e8b8e..7849fe13b7 100644 --- a/ext/phalcon/encryption/security/jwt/token/token.zep.c +++ b/ext/phalcon/encryption/security/jwt/token/token.zep.c @@ -73,9 +73,9 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(3, 3) - Z_PARAM_OBJECT_OF_CLASS(headers, phalcon_encryption_security_jwt_token_item_ce) - Z_PARAM_OBJECT_OF_CLASS(claims, phalcon_encryption_security_jwt_token_item_ce) - Z_PARAM_OBJECT_OF_CLASS(signature, phalcon_encryption_security_jwt_token_signature_ce) + Z_PARAM_OBJECT_OF_CLASS(headers, zephir_get_internal_ce(SL("phalcon\\encryption\\security\\jwt\\token\\item"))) + Z_PARAM_OBJECT_OF_CLASS(claims, zephir_get_internal_ce(SL("phalcon\\encryption\\security\\jwt\\token\\item"))) + Z_PARAM_OBJECT_OF_CLASS(signature, zephir_get_internal_ce(SL("phalcon\\encryption\\security\\jwt\\token\\signature"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -204,7 +204,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(validator, phalcon_encryption_security_jwt_validator_ce) + Z_PARAM_OBJECT_OF_CLASS(validator, zephir_get_internal_ce(SL("phalcon\\encryption\\security\\jwt\\validator"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -314,7 +314,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, verify) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(signer, phalcon_encryption_security_jwt_signer_signerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(signer, zephir_get_internal_ce(SL("phalcon\\encryption\\security\\jwt\\signer\\signerinterface"))) Z_PARAM_STR(key) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/encryption/security/jwt/validator.zep.c b/ext/phalcon/encryption/security/jwt/validator.zep.c index 70b013f062..c8163d6910 100644 --- a/ext/phalcon/encryption/security/jwt/validator.zep.c +++ b/ext/phalcon/encryption/security/jwt/validator.zep.c @@ -80,7 +80,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(token, phalcon_encryption_security_jwt_token_token_ce) + Z_PARAM_OBJECT_OF_CLASS(token, zephir_get_internal_ce(SL("phalcon\\encryption\\security\\jwt\\token\\token"))) Z_PARAM_OPTIONAL Z_PARAM_LONG(timeShift) ZEND_PARSE_PARAMETERS_END(); @@ -198,7 +198,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, setToken) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(token, phalcon_encryption_security_jwt_token_token_ce) + Z_PARAM_OBJECT_OF_CLASS(token, zephir_get_internal_ce(SL("phalcon\\encryption\\security\\jwt\\token\\token"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -364,7 +364,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateExpiration) _7 = zephir_is_true(&_6); if (_7) { ZVAL_LONG(&_9, timestamp); - ZEPHIR_CALL_METHOD(&_8, this_ptr, "gettimestamp", NULL, 267, &_9); + ZEPHIR_CALL_METHOD(&_8, this_ptr, "gettimestamp", NULL, 261, &_9); zephir_check_call_status(); _7 = ZEPHIR_GT_LONG(&_8, tokenExpirationTime); } @@ -472,7 +472,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateIssuedAt) zephir_check_call_status(); tokenIssuedAt = zephir_get_intval(&_2); ZVAL_LONG(&_5, timestamp); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "gettimestamp", NULL, 267, &_5); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "gettimestamp", NULL, 261, &_5); zephir_check_call_status(); if (ZEPHIR_LE_LONG(&_4, tokenIssuedAt)) { ZEPHIR_INIT_ZVAL_NREF(_6$$3); @@ -586,7 +586,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateNotBefore) zephir_check_call_status(); tokenNotBefore = zephir_get_intval(&_2); ZVAL_LONG(&_5, timestamp); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "gettimestamp", NULL, 267, &_5); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "gettimestamp", NULL, 261, &_5); zephir_check_call_status(); if (ZEPHIR_LE_LONG(&_4, tokenNotBefore)) { ZEPHIR_INIT_ZVAL_NREF(_6$$3); @@ -624,7 +624,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateSignature) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(signer, phalcon_encryption_security_jwt_signer_signerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(signer, zephir_get_internal_ce(SL("phalcon\\encryption\\security\\jwt\\signer\\signerinterface"))) Z_PARAM_STR(passphrase) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/encryption/security/random.zep.c b/ext/phalcon/encryption/security/random.zep.c index f96483476e..30ae17f949 100644 --- a/ext/phalcon/encryption/security/random.zep.c +++ b/ext/phalcon/encryption/security/random.zep.c @@ -259,7 +259,7 @@ 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, 230, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 224, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -327,7 +327,7 @@ 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, 230, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "base64_encode", NULL, 224, &_0); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "+/"); @@ -400,7 +400,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Random, bytes) len = 16; } ZVAL_LONG(&_0, len); - ZEPHIR_RETURN_CALL_FUNCTION("random_bytes", NULL, 268, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("random_bytes", NULL, 262, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -453,7 +453,7 @@ 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, 269, &_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, 21, &_3); @@ -503,7 +503,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Random, number) } ZVAL_LONG(&_0, 0); ZVAL_LONG(&_1, len); - ZEPHIR_RETURN_CALL_FUNCTION("random_int", NULL, 270, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("random_int", NULL, 264, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -555,7 +555,7 @@ 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, 269, &_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(); @@ -570,7 +570,7 @@ 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, 271, &ary, &_7); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 265, &ary, &_7); ZEPHIR_UNREF(&ary); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_7); @@ -636,7 +636,7 @@ 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, 269, &_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) { diff --git a/ext/phalcon/events/abstracteventsaware.zep.c b/ext/phalcon/events/abstracteventsaware.zep.c index bab4ff9f05..e8edbd91a6 100644 --- a/ext/phalcon/events/abstracteventsaware.zep.c +++ b/ext/phalcon/events/abstracteventsaware.zep.c @@ -68,7 +68,7 @@ PHP_METHOD(Phalcon_Events_AbstractEventsAware, setEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/events/manager.zep.c b/ext/phalcon/events/manager.zep.c index 30ae8829b8..029e96b638 100644 --- a/ext/phalcon/events/manager.zep.c +++ b/ext/phalcon/events/manager.zep.c @@ -137,7 +137,7 @@ PHP_METHOD(Phalcon_Events_Manager, attach) } ZVAL_LONG(&_2$$4, 1); - ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "setextractflags", NULL, 272, &_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); } @@ -146,7 +146,7 @@ PHP_METHOD(Phalcon_Events_Manager, attach) priority = 100; } ZVAL_LONG(&_4, priority); - ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "insert", NULL, 273, handler, &_4); + ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "insert", NULL, 267, handler, &_4); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -259,7 +259,7 @@ PHP_METHOD(Phalcon_Events_Manager, detach) } ZVAL_LONG(&_2$$4, 1); - ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "setextractflags", NULL, 272, &_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); @@ -280,7 +280,7 @@ 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", 134); zephir_array_fetch_string(&_8$$6, &data, SL("priority"), PH_NOISY | PH_READONLY, "phalcon/Events/Manager.zep", 136); - ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "insert", &_9, 273, &_7$$6, &_8$$6); + ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "insert", &_9, 267, &_7$$6, &_8$$6); zephir_check_call_status(); } } @@ -488,19 +488,19 @@ PHP_METHOD(Phalcon_Events_Manager, fire) } else { ZVAL_BOOL(&_4, 0); } - ZEPHIR_CALL_METHOD(NULL, &event, "__construct", NULL, 274, &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, 275, &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, 275, &fireEvents, &event); + ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", NULL, 269, &fireEvents, &event); zephir_check_call_status(); } } @@ -539,7 +539,7 @@ PHP_METHOD(Phalcon_Events_Manager, fireQueue) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_OBJECT_OF_CLASS(queue, spl_ce_SplPriorityQueue) - Z_PARAM_OBJECT_OF_CLASS(event, phalcon_events_eventinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(event, zephir_get_internal_ce(SL("phalcon\\events\\eventinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/filter/filter.zep.c b/ext/phalcon/filter/filter.zep.c index e6dc489583..cba7c413ca 100644 --- a/ext/phalcon/filter/filter.zep.c +++ b/ext/phalcon/filter/filter.zep.c @@ -265,7 +265,7 @@ 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", 125); - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "createinstance", NULL, 276, &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); } @@ -354,7 +354,7 @@ PHP_METHOD(Phalcon_Filter_Filter, sanitize) } else { ZVAL_BOOL(&_0$$3, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarraysanitizers", NULL, 277, sanitizers, value, &_0$$3); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarraysanitizers", NULL, 271, sanitizers, value, &_0$$3); zephir_check_call_status(); RETURN_MM(); } @@ -363,11 +363,11 @@ PHP_METHOD(Phalcon_Filter_Filter, sanitize) _1 = !noRecursive; } if (_1) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarrayvalues", NULL, 278, 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, 279, value, sanitizers); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "sanitizer", NULL, 273, value, sanitizers); zephir_check_call_status(); RETURN_MM(); } @@ -583,7 +583,7 @@ PHP_METHOD(Phalcon_Filter_Filter, processArraySanitizers) } ZEPHIR_INIT_NVAR(&sanitizer); ZVAL_COPY(&sanitizer, _0); - ZEPHIR_CALL_METHOD(&split, this_ptr, "splitsanitizerparameters", &_4, 280, &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", 281); @@ -595,11 +595,11 @@ PHP_METHOD(Phalcon_Filter_Filter, processArraySanitizers) } else { ZVAL_BOOL(&_6$$5, 0); } - ZEPHIR_CALL_METHOD(&_5$$5, this_ptr, "processvalueisarray", &_7, 281, value, &sanitizerName, &sanitizerParams, &_6$$5); + ZEPHIR_CALL_METHOD(&_5$$5, this_ptr, "processvalueisarray", &_7, 275, value, &sanitizerName, &sanitizerParams, &_6$$5); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_5$$5); } else { - ZEPHIR_CALL_METHOD(&_8$$6, this_ptr, "processvalueisnotarray", &_9, 282, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_8$$6, this_ptr, "processvalueisnotarray", &_9, 276, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_8$$6); } @@ -617,7 +617,7 @@ 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, 280, &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", 281); @@ -629,11 +629,11 @@ PHP_METHOD(Phalcon_Filter_Filter, processArraySanitizers) } else { ZVAL_BOOL(&_11$$8, 0); } - ZEPHIR_CALL_METHOD(&_10$$8, this_ptr, "processvalueisarray", &_7, 281, value, &sanitizerName, &sanitizerParams, &_11$$8); + ZEPHIR_CALL_METHOD(&_10$$8, this_ptr, "processvalueisarray", &_7, 275, value, &sanitizerName, &sanitizerParams, &_11$$8); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_10$$8); } else { - ZEPHIR_CALL_METHOD(&_12$$9, this_ptr, "processvalueisnotarray", &_9, 282, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_12$$9, this_ptr, "processvalueisnotarray", &_9, 276, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_12$$9); } @@ -715,7 +715,7 @@ PHP_METHOD(Phalcon_Filter_Filter, processArrayValues) } ZEPHIR_INIT_NVAR(&itemValue); ZVAL_COPY(&itemValue, _0); - ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "sanitizer", &_5, 279, &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(); @@ -732,7 +732,7 @@ 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, 279, &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); @@ -863,11 +863,11 @@ PHP_METHOD(Phalcon_Filter_Filter, processValueIsArray) if (noRecursive) { - ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "sanitizer", NULL, 279, 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); } else { - ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "processarrayvalues", NULL, 278, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "processarrayvalues", NULL, 272, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_1$$4); } @@ -914,7 +914,7 @@ PHP_METHOD(Phalcon_Filter_Filter, processValueIsNotArray) if (Z_TYPE_P(value) != IS_ARRAY) { - ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "sanitizer", NULL, 279, 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); } diff --git a/ext/phalcon/filter/filterfactory.zep.c b/ext/phalcon/filter/filterfactory.zep.c index 442417f4fd..b9d1721b48 100644 --- a/ext/phalcon/filter/filterfactory.zep.c +++ b/ext/phalcon/filter/filterfactory.zep.c @@ -59,7 +59,7 @@ 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, 283, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 277, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/absint.zep.c b/ext/phalcon/filter/sanitize/absint.zep.c index 500872f50d..890ecbb1be 100644 --- a/ext/phalcon/filter/sanitize/absint.zep.c +++ b/ext/phalcon/filter/sanitize/absint.zep.c @@ -66,10 +66,10 @@ PHP_METHOD(Phalcon_Filter_Sanitize_AbsInt, __invoke) ZVAL_LONG(&_0, 519); - ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 284, 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, 285, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("abs", NULL, 279, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/email.zep.c b/ext/phalcon/filter/sanitize/email.zep.c index a308314aad..e14ee246ba 100644 --- a/ext/phalcon/filter/sanitize/email.zep.c +++ b/ext/phalcon/filter/sanitize/email.zep.c @@ -66,7 +66,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_Email, __invoke) ZVAL_LONG(&_0, 517); ZVAL_LONG(&_1, 1048576); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 284, input, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 278, input, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/floatval.zep.c b/ext/phalcon/filter/sanitize/floatval.zep.c index 36a17208ac..37e8ced42b 100644 --- a/ext/phalcon/filter/sanitize/floatval.zep.c +++ b/ext/phalcon/filter/sanitize/floatval.zep.c @@ -72,7 +72,7 @@ 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, 284, 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)); } diff --git a/ext/phalcon/filter/sanitize/intval.zep.c b/ext/phalcon/filter/sanitize/intval.zep.c index 6b4db3e00b..1b7056308b 100644 --- a/ext/phalcon/filter/sanitize/intval.zep.c +++ b/ext/phalcon/filter/sanitize/intval.zep.c @@ -66,7 +66,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_IntVal, __invoke) ZVAL_LONG(&_0, 519); - ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 284, input, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 278, input, &_0); zephir_check_call_status(); RETURN_MM_LONG(zephir_get_intval(&_1)); } diff --git a/ext/phalcon/filter/sanitize/lower.zep.c b/ext/phalcon/filter/sanitize/lower.zep.c index 6652a4d5f8..b219169f94 100644 --- a/ext/phalcon/filter/sanitize/lower.zep.c +++ b/ext/phalcon/filter/sanitize/lower.zep.c @@ -87,7 +87,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_Lower, __invoke) zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 286, &input); + ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 280, &input); zephir_check_call_status(); zephir_fast_strtolower(return_value, &_2); RETURN_MM(); diff --git a/ext/phalcon/filter/sanitize/special.zep.c b/ext/phalcon/filter/sanitize/special.zep.c index 8c796af026..293595dbff 100644 --- a/ext/phalcon/filter/sanitize/special.zep.c +++ b/ext/phalcon/filter/sanitize/special.zep.c @@ -64,7 +64,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_Special, __invoke) ZVAL_LONG(&_0, 515); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 284, input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 278, input, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/specialfull.zep.c b/ext/phalcon/filter/sanitize/specialfull.zep.c index d7971189d8..93ec691b8b 100644 --- a/ext/phalcon/filter/sanitize/specialfull.zep.c +++ b/ext/phalcon/filter/sanitize/specialfull.zep.c @@ -64,7 +64,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_SpecialFull, __invoke) ZVAL_LONG(&_0, 522); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 284, input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 278, input, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/stringval.zep.c b/ext/phalcon/filter/sanitize/stringval.zep.c index 04b798a37c..b1f4bba8d1 100644 --- a/ext/phalcon/filter/sanitize/stringval.zep.c +++ b/ext/phalcon/filter/sanitize/stringval.zep.c @@ -73,7 +73,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_StringVal, __invoke) ZVAL_LONG(&_0, flags); - ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 287, &input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 281, &input, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/stringvallegacy.zep.c b/ext/phalcon/filter/sanitize/stringvallegacy.zep.c index f380d95e67..7ecfbe8c60 100644 --- a/ext/phalcon/filter/sanitize/stringvallegacy.zep.c +++ b/ext/phalcon/filter/sanitize/stringvallegacy.zep.c @@ -83,7 +83,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_StringValLegacy, __invoke) } if (_0) { ZVAL_LONG(&_2$$3, 513); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 284, input, &_2$$3); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 278, input, &_2$$3); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/striptags.zep.c b/ext/phalcon/filter/sanitize/striptags.zep.c index a2ba250ec5..8362bb8ff5 100644 --- a/ext/phalcon/filter/sanitize/striptags.zep.c +++ b/ext/phalcon/filter/sanitize/striptags.zep.c @@ -75,7 +75,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_Striptags, __invoke) } - ZEPHIR_RETURN_CALL_FUNCTION("strip_tags", NULL, 288, &input); + ZEPHIR_RETURN_CALL_FUNCTION("strip_tags", NULL, 282, &input); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/upper.zep.c b/ext/phalcon/filter/sanitize/upper.zep.c index e9fcbcd2b6..0da8e49add 100644 --- a/ext/phalcon/filter/sanitize/upper.zep.c +++ b/ext/phalcon/filter/sanitize/upper.zep.c @@ -87,7 +87,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_Upper, __invoke) zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 286, &input); + ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 280, &input); zephir_check_call_status(); zephir_fast_strtoupper(return_value, &_2); RETURN_MM(); diff --git a/ext/phalcon/filter/sanitize/upperwords.zep.c b/ext/phalcon/filter/sanitize/upperwords.zep.c index f2b8c3e922..d9bd4e7628 100644 --- a/ext/phalcon/filter/sanitize/upperwords.zep.c +++ b/ext/phalcon/filter/sanitize/upperwords.zep.c @@ -86,9 +86,9 @@ PHP_METHOD(Phalcon_Filter_Sanitize_UpperWords, __invoke) zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 286, &input); + ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 280, &input); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ucwords", NULL, 289, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("ucwords", NULL, 283, &_2); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/url.zep.c b/ext/phalcon/filter/sanitize/url.zep.c index 6082248e71..4ec57d8838 100644 --- a/ext/phalcon/filter/sanitize/url.zep.c +++ b/ext/phalcon/filter/sanitize/url.zep.c @@ -64,7 +64,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_Url, __invoke) ZVAL_LONG(&_0, 518); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 284, input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 278, input, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/validation.zep.c b/ext/phalcon/filter/validation.zep.c index 16fc0b9a3c..d4a720f53e 100644 --- a/ext/phalcon/filter/validation.zep.c +++ b/ext/phalcon/filter/validation.zep.c @@ -159,7 +159,7 @@ PHP_METHOD(Phalcon_Filter_Validation, add) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_ZVAL(field) - Z_PARAM_OBJECT_OF_CLASS(validator, phalcon_filter_validation_validatorinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(validator, zephir_get_internal_ce(SL("phalcon\\filter\\validation\\validatorinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -229,7 +229,7 @@ PHP_METHOD(Phalcon_Filter_Validation, appendMessage) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(message, phalcon_messages_messageinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(message, zephir_get_internal_ce(SL("phalcon\\messages\\messageinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -246,7 +246,7 @@ 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, 290, message); + ZEPHIR_CALL_METHOD(NULL, &messages, "appendmessage", NULL, 284, message); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("messages"), &messages); RETURN_THIS(); @@ -647,7 +647,7 @@ 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, 291, &entity, &field); + ZEPHIR_CALL_FUNCTION(&_7$$13, "property_exists", NULL, 285, &entity, &field); zephir_check_call_status(); if ((zephir_method_exists(&entity, &method) == SUCCESS)) { ZEPHIR_CALL_METHOD_ZVAL(NULL, &entity, &method, NULL, 0, &value); @@ -689,7 +689,7 @@ PHP_METHOD(Phalcon_Filter_Validation, rule) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_ZVAL(field) - Z_PARAM_OBJECT_OF_CLASS(validator, phalcon_filter_validation_validatorinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(validator, zephir_get_internal_ce(SL("phalcon\\filter\\validation\\validatorinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1311,7 +1311,7 @@ PHP_METHOD(Phalcon_Filter_Validation, preChecking) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_ZVAL(field) - Z_PARAM_OBJECT_OF_CLASS(validator, phalcon_filter_validation_validatorinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(validator, zephir_get_internal_ce(SL("phalcon\\filter\\validation\\validatorinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1329,7 +1329,7 @@ PHP_METHOD(Phalcon_Filter_Validation, preChecking) { ZEPHIR_INIT_NVAR(&singleField); ZVAL_COPY(&singleField, _0$$3); - ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "prechecking", &_3, 292, &singleField, validator); + ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "prechecking", &_3, 286, &singleField, validator); zephir_check_call_status(); zephir_array_append(&results, &_2$$4, PH_SEPARATE, "phalcon/Filter/Validation.zep", 607); if (zephir_fast_in_array(&__$false, &results)) { @@ -1348,7 +1348,7 @@ 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, 292, &singleField, validator); + ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "prechecking", &_3, 286, &singleField, validator); zephir_check_call_status(); zephir_array_append(&results, &_4$$6, PH_SEPARATE, "phalcon/Filter/Validation.zep", 607); if (zephir_fast_in_array(&__$false, &results)) { diff --git a/ext/phalcon/filter/validation/abstractvalidator.zep.c b/ext/phalcon/filter/validation/abstractvalidator.zep.c index 67330d2355..2e458c61dc 100644 --- a/ext/phalcon/filter/validation/abstractvalidator.zep.c +++ b/ext/phalcon/filter/validation/abstractvalidator.zep.c @@ -550,7 +550,7 @@ PHP_METHOD(Phalcon_Filter_Validation_AbstractValidator, prepareLabel) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_STR(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -670,7 +670,7 @@ PHP_METHOD(Phalcon_Filter_Validation_AbstractValidator, messageFactory) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 3) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(replacements) diff --git a/ext/phalcon/filter/validation/abstractvalidatorcomposite.zep.c b/ext/phalcon/filter/validation/abstractvalidatorcomposite.zep.c index 0657f38044..a953cebea0 100644 --- a/ext/phalcon/filter/validation/abstractvalidatorcomposite.zep.c +++ b/ext/phalcon/filter/validation/abstractvalidatorcomposite.zep.c @@ -81,7 +81,7 @@ PHP_METHOD(Phalcon_Filter_Validation_AbstractValidatorComposite, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/filter/validation/validator/alnum.zep.c b/ext/phalcon/filter/validation/validator/alnum.zep.c index 059c7948a5..586f883fe5 100644 --- a/ext/phalcon/filter/validation/validator/alnum.zep.c +++ b/ext/phalcon/filter/validation/validator/alnum.zep.c @@ -134,7 +134,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Alnum, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -152,7 +152,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Alnum, validate) RETURN_MM_BOOL(1); } zephir_cast_to_string(&_1, &value); - ZEPHIR_CALL_FUNCTION(&_2, "ctype_alnum", NULL, 293, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "ctype_alnum", NULL, 287, &_1); zephir_check_call_status(); if (!(zephir_is_true(&_2))) { ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "messagefactory", NULL, 0, validation, field); diff --git a/ext/phalcon/filter/validation/validator/alpha.zep.c b/ext/phalcon/filter/validation/validator/alpha.zep.c index 5e8a7df752..65c5a2c43e 100644 --- a/ext/phalcon/filter/validation/validator/alpha.zep.c +++ b/ext/phalcon/filter/validation/validator/alpha.zep.c @@ -138,7 +138,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Alpha, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/filter/validation/validator/between.zep.c b/ext/phalcon/filter/validation/validator/between.zep.c index 514e98574e..6abcfc7472 100644 --- a/ext/phalcon/filter/validation/validator/between.zep.c +++ b/ext/phalcon/filter/validation/validator/between.zep.c @@ -152,7 +152,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Between, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/filter/validation/validator/callback.zep.c b/ext/phalcon/filter/validation/validator/callback.zep.c index e0ce7af5f0..5fae0f6124 100644 --- a/ext/phalcon/filter/validation/validator/callback.zep.c +++ b/ext/phalcon/filter/validation/validator/callback.zep.c @@ -144,7 +144,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Callback, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -165,7 +165,7 @@ 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, 184, &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) { diff --git a/ext/phalcon/filter/validation/validator/confirmation.zep.c b/ext/phalcon/filter/validation/validator/confirmation.zep.c index 6b05387672..0daad2c118 100644 --- a/ext/phalcon/filter/validation/validator/confirmation.zep.c +++ b/ext/phalcon/filter/validation/validator/confirmation.zep.c @@ -150,7 +150,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Confirmation, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -174,7 +174,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Confirmation, validate) zephir_check_call_status(); zephir_cast_to_string(&_3, &value); zephir_cast_to_string(&_4, &valueWith); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "compare", NULL, 294, &_3, &_4); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "compare", NULL, 288, &_3, &_4); zephir_check_call_status(); if (!(zephir_is_true(&_2))) { ZEPHIR_INIT_VAR(&_5$$4); @@ -257,7 +257,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Confirmation, compare) zephir_check_call_status(); zephir_get_strval(&b, &_5$$3); } - ZEPHIR_CALL_FUNCTION(&_6, "strcmp", NULL, 295, &a, &b); + ZEPHIR_CALL_FUNCTION(&_6, "strcmp", NULL, 289, &a, &b); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_LONG_IDENTICAL(&_6, 0)); } diff --git a/ext/phalcon/filter/validation/validator/creditcard.zep.c b/ext/phalcon/filter/validation/validator/creditcard.zep.c index 67a26fb708..bc9a82cf1b 100644 --- a/ext/phalcon/filter/validation/validator/creditcard.zep.c +++ b/ext/phalcon/filter/validation/validator/creditcard.zep.c @@ -134,7 +134,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_CreditCard, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -152,7 +152,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_CreditCard, validate) RETURN_MM_BOOL(1); } zephir_cast_to_string(&_1, &value); - ZEPHIR_CALL_METHOD(&valid, this_ptr, "verifybyluhnalgorithm", NULL, 296, &_1); + ZEPHIR_CALL_METHOD(&valid, this_ptr, "verifybyluhnalgorithm", NULL, 290, &_1); zephir_check_call_status(); if (!(zephir_is_true(&valid))) { ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "messagefactory", NULL, 0, validation, field); @@ -212,7 +212,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_CreditCard, verifyByLuhnAlgorithm zephir_check_call_status(); zephir_get_arrval(&_1, &_0); ZEPHIR_CPY_WRT(&digits, &_1); - ZEPHIR_CALL_FUNCTION(&_3, "array_reverse", NULL, 297, &digits); + ZEPHIR_CALL_FUNCTION(&_3, "array_reverse", NULL, 291, &digits); zephir_check_call_status(); zephir_is_iterable(&_3, 0, "phalcon/Filter/Validation/Validator/CreditCard.zep", 109); if (Z_TYPE_P(&_3) == IS_ARRAY) { @@ -264,7 +264,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_CreditCard, verifyByLuhnAlgorithm ZEPHIR_INIT_NVAR(&position); ZEPHIR_CALL_FUNCTION(&_10, "str_split", NULL, 84, &hash); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&result, "array_sum", NULL, 298, &_10); + ZEPHIR_CALL_FUNCTION(&result, "array_sum", NULL, 292, &_10); zephir_check_call_status(); RETURN_MM_BOOL((zephir_safe_mod_zval_long(&result, 10) == 0)); } diff --git a/ext/phalcon/filter/validation/validator/date.zep.c b/ext/phalcon/filter/validation/validator/date.zep.c index 96c0525603..74bd42cbbb 100644 --- a/ext/phalcon/filter/validation/validator/date.zep.c +++ b/ext/phalcon/filter/validation/validator/date.zep.c @@ -142,7 +142,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Date, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -171,7 +171,7 @@ 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, 299, &value, &format); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "checkdate", NULL, 293, &value, &format); zephir_check_call_status(); if (!(zephir_is_true(&_3))) { ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "messagefactory", NULL, 0, validation, field); diff --git a/ext/phalcon/filter/validation/validator/digit.zep.c b/ext/phalcon/filter/validation/validator/digit.zep.c index 949d038702..d3766111a5 100644 --- a/ext/phalcon/filter/validation/validator/digit.zep.c +++ b/ext/phalcon/filter/validation/validator/digit.zep.c @@ -135,7 +135,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Digit, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -155,7 +155,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Digit, validate) _1 = Z_TYPE_P(&value) == IS_LONG; if (!(_1)) { zephir_cast_to_string(&_2, &value); - ZEPHIR_CALL_FUNCTION(&_3, "ctype_digit", NULL, 300, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "ctype_digit", NULL, 294, &_2); zephir_check_call_status(); _1 = zephir_is_true(&_3); } diff --git a/ext/phalcon/filter/validation/validator/email.zep.c b/ext/phalcon/filter/validation/validator/email.zep.c index 92e21dc7a5..9f5cd83ec8 100644 --- a/ext/phalcon/filter/validation/validator/email.zep.c +++ b/ext/phalcon/filter/validation/validator/email.zep.c @@ -133,7 +133,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Email, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -151,7 +151,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Email, validate) RETURN_MM_BOOL(1); } ZVAL_LONG(&_1, 274); - ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 284, &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); diff --git a/ext/phalcon/filter/validation/validator/exclusionin.zep.c b/ext/phalcon/filter/validation/validator/exclusionin.zep.c index 5c94f3a590..d9d0bf8e6b 100644 --- a/ext/phalcon/filter/validation/validator/exclusionin.zep.c +++ b/ext/phalcon/filter/validation/validator/exclusionin.zep.c @@ -156,7 +156,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_ExclusionIn, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -207,7 +207,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_ExclusionIn, validate) return; } } - ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 301, &value, &domain, &strict); + ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 295, &value, &domain, &strict); zephir_check_call_status(); if (zephir_is_true(&_5)) { ZEPHIR_INIT_VAR(&replacePairs); diff --git a/ext/phalcon/filter/validation/validator/file.zep.c b/ext/phalcon/filter/validation/validator/file.zep.c index ddd3f32b91..12751bb27c 100644 --- a/ext/phalcon/filter/validation/validator/file.zep.c +++ b/ext/phalcon/filter/validation/validator/file.zep.c @@ -242,21 +242,21 @@ 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, 155, &options, &_0$$3); + ZEPHIR_CALL_METHOD(&messageFileEmpty, &helper, "__invoke", NULL, 149, &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, 155, &options, &_1$$4); + ZEPHIR_CALL_METHOD(&messageIniSize, &helper, "__invoke", NULL, 149, &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, 155, &options, &_2$$5); + ZEPHIR_CALL_METHOD(&messageValid, &helper, "__invoke", NULL, 149, &options, &_2$$5); zephir_check_call_status(); zephir_array_unset_string(&options, SL("messageValid"), PH_SEPARATE); } @@ -303,11 +303,11 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) 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, 155, &options, &_16$$7); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 149, &options, &_16$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$7); ZVAL_STRING(&_16$$7, "includedMinSize"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 155, &options, &_16$$7); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 149, &options, &_16$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_min_ce); @@ -316,18 +316,18 @@ 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, 302, &_17$$7); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_18, 296, &_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, 155, &options, &_19$$8); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 149, &options, &_19$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_19$$8); ZVAL_STRING(&_19$$8, "includedSize"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 155, &options, &_19$$8); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 149, &options, &_19$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_max_ce); @@ -336,7 +336,7 @@ 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, 303, &_20$$8); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_21, 297, &_20$$8); zephir_check_call_status(); zephir_array_unset_string(&options, SL("maxSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageSize"), PH_SEPARATE); @@ -344,7 +344,7 @@ 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, 155, &options, &_22$$9); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 149, &options, &_22$$9); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_equal_ce); @@ -352,14 +352,14 @@ 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, 304, &_23$$9); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_24, 298, &_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, 155, &options, &_25$$10); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 149, &options, &_25$$10); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_mimetype_ce); @@ -367,18 +367,18 @@ 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, 305, &_26$$10); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_27, 299, &_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, 155, &options, &_28$$11); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 149, &options, &_28$$11); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_28$$11); ZVAL_STRING(&_28$$11, "includedMaxResolution"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 155, &options, &_28$$11); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 149, &options, &_28$$11); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_max_ce); @@ -387,7 +387,7 @@ 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, 306, &_29$$11); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_30, 300, &_29$$11); zephir_check_call_status(); zephir_array_unset_string(&options, SL("maxResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMaxResolution"), PH_SEPARATE); @@ -395,11 +395,11 @@ 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, 155, &options, &_31$$12); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 149, &options, &_31$$12); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_31$$12); ZVAL_STRING(&_31$$12, "includedMinResolution"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 155, &options, &_31$$12); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 149, &options, &_31$$12); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_min_ce); @@ -408,7 +408,7 @@ 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, 307, &_32$$12); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 301, &_32$$12); zephir_check_call_status(); zephir_array_unset_string(&options, SL("minResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMinResolution"), PH_SEPARATE); @@ -416,7 +416,7 @@ 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, 155, &options, &_34$$13); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 149, &options, &_34$$13); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_equal_ce); @@ -424,7 +424,7 @@ 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, 308, &_35$$13); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 302, &_35$$13); zephir_check_call_status(); zephir_array_unset_string(&options, SL("equalResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageEqualResolution"), PH_SEPARATE); @@ -432,15 +432,15 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) continue; } if (Z_TYPE_P(&messageFileEmpty) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagefileempty", &_37, 309, &messageFileEmpty); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagefileempty", &_37, 303, &messageFileEmpty); zephir_check_call_status(); } if (Z_TYPE_P(&messageIniSize) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessageinisize", &_38, 310, &messageIniSize); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessageinisize", &_38, 304, &messageIniSize); zephir_check_call_status(); } if (Z_TYPE_P(&messageValid) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagevalid", &_39, 311, &messageValid); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagevalid", &_39, 305, &messageValid); zephir_check_call_status(); } zephir_update_property_array_append(this_ptr, SL("validators"), &validator); @@ -489,11 +489,11 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) 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, 155, &options, &_48$$19); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 149, &options, &_48$$19); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_48$$19); ZVAL_STRING(&_48$$19, "includedMinSize"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 155, &options, &_48$$19); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 149, &options, &_48$$19); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_min_ce); @@ -502,18 +502,18 @@ 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, 308, &_49$$19); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 302, &_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, 155, &options, &_50$$20); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 149, &options, &_50$$20); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_50$$20); ZVAL_STRING(&_50$$20, "includedSize"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 155, &options, &_50$$20); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 149, &options, &_50$$20); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_max_ce); @@ -522,7 +522,7 @@ 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, 308, &_51$$20); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 302, &_51$$20); zephir_check_call_status(); zephir_array_unset_string(&options, SL("maxSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageSize"), PH_SEPARATE); @@ -530,7 +530,7 @@ 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, 155, &options, &_52$$21); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 149, &options, &_52$$21); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_equal_ce); @@ -538,14 +538,14 @@ 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, 308, &_53$$21); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 302, &_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, 155, &options, &_54$$22); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 149, &options, &_54$$22); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_mimetype_ce); @@ -553,18 +553,18 @@ 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, 308, &_55$$22); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 302, &_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, 155, &options, &_56$$23); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 149, &options, &_56$$23); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_56$$23); ZVAL_STRING(&_56$$23, "includedMaxResolution"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 155, &options, &_56$$23); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 149, &options, &_56$$23); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_max_ce); @@ -573,7 +573,7 @@ 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, 308, &_57$$23); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 302, &_57$$23); zephir_check_call_status(); zephir_array_unset_string(&options, SL("maxResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMaxResolution"), PH_SEPARATE); @@ -581,11 +581,11 @@ 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, 155, &options, &_58$$24); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 149, &options, &_58$$24); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_58$$24); ZVAL_STRING(&_58$$24, "includedMinResolution"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 155, &options, &_58$$24); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 149, &options, &_58$$24); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_min_ce); @@ -594,7 +594,7 @@ 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, 308, &_59$$24); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 302, &_59$$24); zephir_check_call_status(); zephir_array_unset_string(&options, SL("minResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMinResolution"), PH_SEPARATE); @@ -602,7 +602,7 @@ 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, 155, &options, &_60$$25); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 149, &options, &_60$$25); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_equal_ce); @@ -610,7 +610,7 @@ 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, 308, &_61$$25); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 302, &_61$$25); zephir_check_call_status(); zephir_array_unset_string(&options, SL("equalResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageEqualResolution"), PH_SEPARATE); @@ -618,15 +618,15 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) continue; } if (Z_TYPE_P(&messageFileEmpty) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagefileempty", &_37, 309, &messageFileEmpty); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagefileempty", &_37, 303, &messageFileEmpty); zephir_check_call_status(); } if (Z_TYPE_P(&messageIniSize) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessageinisize", &_38, 310, &messageIniSize); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessageinisize", &_38, 304, &messageIniSize); zephir_check_call_status(); } if (Z_TYPE_P(&messageValid) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagevalid", &_39, 311, &messageValid); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagevalid", &_39, 305, &messageValid); zephir_check_call_status(); } zephir_update_property_array_append(this_ptr, SL("validators"), &validator); diff --git a/ext/phalcon/filter/validation/validator/file/abstractfile.zep.c b/ext/phalcon/filter/validation/validator/file/abstractfile.zep.c index 964f60368c..4e629a2917 100644 --- a/ext/phalcon/filter/validation/validator/file/abstractfile.zep.c +++ b/ext/phalcon/filter/validation/validator/file/abstractfile.zep.c @@ -118,7 +118,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkUpload) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -176,7 +176,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkUploadIsE #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -257,7 +257,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkUploadIsV #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -336,7 +336,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkUploadMax #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -550,7 +550,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, isAllowEmpty) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_STR(field) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/filter/validation/validator/file/mimetype.zep.c b/ext/phalcon/filter/validation/validator/file/mimetype.zep.c index 965e52cae0..240d77636c 100644 --- a/ext/phalcon/filter/validation/validator/file/mimetype.zep.c +++ b/ext/phalcon/filter/validation/validator/file/mimetype.zep.c @@ -116,7 +116,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_MimeType, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -147,12 +147,12 @@ 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, 312, &_2$$6); + ZEPHIR_CALL_FUNCTION(&tmp, "finfo_open", NULL, 306, &_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, 313, &tmp, &_3$$6); + ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 307, &tmp, &_3$$6); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 314, &tmp); + ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 308, &tmp); zephir_check_call_status(); } else { ZEPHIR_OBS_NVAR(&mime); diff --git a/ext/phalcon/filter/validation/validator/file/resolution/equal.zep.c b/ext/phalcon/filter/validation/validator/file/resolution/equal.zep.c index e5bd323885..9d5c6c2c67 100644 --- a/ext/phalcon/filter/validation/validator/file/resolution/equal.zep.c +++ b/ext/phalcon/filter/validation/validator/file/resolution/equal.zep.c @@ -151,7 +151,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Resolution_Equal, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -169,7 +169,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Resolution_Equal, validate) 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, 315, &_1); + ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 309, &_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); diff --git a/ext/phalcon/filter/validation/validator/file/resolution/max.zep.c b/ext/phalcon/filter/validation/validator/file/resolution/max.zep.c index 9c68cc560e..b2e01a18ab 100644 --- a/ext/phalcon/filter/validation/validator/file/resolution/max.zep.c +++ b/ext/phalcon/filter/validation/validator/file/resolution/max.zep.c @@ -160,7 +160,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Resolution_Max, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -180,7 +180,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Resolution_Max, validate) 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, 315, &_1); + ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 309, &_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); diff --git a/ext/phalcon/filter/validation/validator/file/resolution/min.zep.c b/ext/phalcon/filter/validation/validator/file/resolution/min.zep.c index 1c773a3887..71fa7ea55a 100644 --- a/ext/phalcon/filter/validation/validator/file/resolution/min.zep.c +++ b/ext/phalcon/filter/validation/validator/file/resolution/min.zep.c @@ -160,7 +160,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Resolution_Min, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -180,7 +180,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Resolution_Min, validate) 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, 315, &_1); + ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 309, &_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); diff --git a/ext/phalcon/filter/validation/validator/file/size/equal.zep.c b/ext/phalcon/filter/validation/validator/file/size/equal.zep.c index 1e06724c21..b186b82eff 100644 --- a/ext/phalcon/filter/validation/validator/file/size/equal.zep.c +++ b/ext/phalcon/filter/validation/validator/file/size/equal.zep.c @@ -154,7 +154,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Size_Equal, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/filter/validation/validator/file/size/max.zep.c b/ext/phalcon/filter/validation/validator/file/size/max.zep.c index 079a659bdd..b1a480b056 100644 --- a/ext/phalcon/filter/validation/validator/file/size/max.zep.c +++ b/ext/phalcon/filter/validation/validator/file/size/max.zep.c @@ -159,7 +159,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Size_Max, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/filter/validation/validator/file/size/min.zep.c b/ext/phalcon/filter/validation/validator/file/size/min.zep.c index 8f9ec53e1c..a5d4e57425 100644 --- a/ext/phalcon/filter/validation/validator/file/size/min.zep.c +++ b/ext/phalcon/filter/validation/validator/file/size/min.zep.c @@ -159,7 +159,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Size_Min, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/filter/validation/validator/identical.zep.c b/ext/phalcon/filter/validation/validator/identical.zep.c index 834832639b..eb7bcd4665 100644 --- a/ext/phalcon/filter/validation/validator/identical.zep.c +++ b/ext/phalcon/filter/validation/validator/identical.zep.c @@ -147,7 +147,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Identical, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/filter/validation/validator/inclusionin.zep.c b/ext/phalcon/filter/validation/validator/inclusionin.zep.c index 3026b15e7c..2455b3ac43 100644 --- a/ext/phalcon/filter/validation/validator/inclusionin.zep.c +++ b/ext/phalcon/filter/validation/validator/inclusionin.zep.c @@ -150,7 +150,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_InclusionIn, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -201,7 +201,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_InclusionIn, validate) return; } } - ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 301, &value, &domain, &strict); + ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 295, &value, &domain, &strict); zephir_check_call_status(); if (!(zephir_is_true(&_5))) { ZEPHIR_INIT_VAR(&replacePairs); diff --git a/ext/phalcon/filter/validation/validator/ip.zep.c b/ext/phalcon/filter/validation/validator/ip.zep.c index 04fbe1331c..9989761738 100644 --- a/ext/phalcon/filter/validation/validator/ip.zep.c +++ b/ext/phalcon/filter/validation/validator/ip.zep.c @@ -172,7 +172,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Ip, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -240,7 +240,7 @@ 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, 284, &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); diff --git a/ext/phalcon/filter/validation/validator/numericality.zep.c b/ext/phalcon/filter/validation/validator/numericality.zep.c index 4a34729923..cb293d0559 100644 --- a/ext/phalcon/filter/validation/validator/numericality.zep.c +++ b/ext/phalcon/filter/validation/validator/numericality.zep.c @@ -139,7 +139,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Numericality, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/filter/validation/validator/presenceof.zep.c b/ext/phalcon/filter/validation/validator/presenceof.zep.c index 909ecfb6d7..7b1e270384 100644 --- a/ext/phalcon/filter/validation/validator/presenceof.zep.c +++ b/ext/phalcon/filter/validation/validator/presenceof.zep.c @@ -132,7 +132,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_PresenceOf, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/filter/validation/validator/regex.zep.c b/ext/phalcon/filter/validation/validator/regex.zep.c index a4f26e3999..b24d7a4133 100644 --- a/ext/phalcon/filter/validation/validator/regex.zep.c +++ b/ext/phalcon/filter/validation/validator/regex.zep.c @@ -145,7 +145,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Regex, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/filter/validation/validator/stringlength.zep.c b/ext/phalcon/filter/validation/validator/stringlength.zep.c index a9e9e15079..5bc34c2782 100644 --- a/ext/phalcon/filter/validation/validator/stringlength.zep.c +++ b/ext/phalcon/filter/validation/validator/stringlength.zep.c @@ -205,7 +205,7 @@ 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, 316, &_8$$4); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_9, 310, &_8$$4); zephir_check_call_status(); zephir_array_unset_string(&options, SL("min"), PH_SEPARATE); zephir_array_unset_string(&options, SL("message"), PH_SEPARATE); @@ -234,7 +234,7 @@ 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, 317, &_10$$9); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 311, &_10$$9); zephir_check_call_status(); zephir_array_unset_string(&options, SL("max"), PH_SEPARATE); zephir_array_unset_string(&options, SL("message"), PH_SEPARATE); @@ -289,7 +289,7 @@ 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, 317, &_15$$16); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 311, &_15$$16); zephir_check_call_status(); zephir_array_unset_string(&options, SL("min"), PH_SEPARATE); zephir_array_unset_string(&options, SL("message"), PH_SEPARATE); @@ -318,7 +318,7 @@ 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, 317, &_16$$21); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 311, &_16$$21); zephir_check_call_status(); zephir_array_unset_string(&options, SL("max"), PH_SEPARATE); zephir_array_unset_string(&options, SL("message"), PH_SEPARATE); diff --git a/ext/phalcon/filter/validation/validator/stringlength/max.zep.c b/ext/phalcon/filter/validation/validator/stringlength/max.zep.c index bba70f675a..ebafa6bcae 100644 --- a/ext/phalcon/filter/validation/validator/stringlength/max.zep.c +++ b/ext/phalcon/filter/validation/validator/stringlength/max.zep.c @@ -159,7 +159,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength_Max, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -178,7 +178,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength_Max, validate) } if ((zephir_function_exists_ex(ZEND_STRL("mb_strlen")) == SUCCESS)) { zephir_cast_to_string(&_1$$4, &value); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 233, &_1$$4); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 227, &_1$$4); zephir_check_call_status(); } else { zephir_cast_to_string(&_2$$5, &value); diff --git a/ext/phalcon/filter/validation/validator/stringlength/min.zep.c b/ext/phalcon/filter/validation/validator/stringlength/min.zep.c index 4cead63891..536abb60ea 100644 --- a/ext/phalcon/filter/validation/validator/stringlength/min.zep.c +++ b/ext/phalcon/filter/validation/validator/stringlength/min.zep.c @@ -159,7 +159,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength_Min, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -178,7 +178,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength_Min, validate) } if ((zephir_function_exists_ex(ZEND_STRL("mb_strlen")) == SUCCESS)) { zephir_cast_to_string(&_1$$4, &value); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 233, &_1$$4); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 227, &_1$$4); zephir_check_call_status(); } else { zephir_cast_to_string(&_2$$5, &value); diff --git a/ext/phalcon/filter/validation/validator/uniqueness.zep.c b/ext/phalcon/filter/validation/validator/uniqueness.zep.c index 13844f3890..4b104117ef 100644 --- a/ext/phalcon/filter/validation/validator/uniqueness.zep.c +++ b/ext/phalcon/filter/validation/validator/uniqueness.zep.c @@ -176,7 +176,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Uniqueness, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -301,7 +301,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Uniqueness, isUniqueness) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -648,7 +648,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Uniqueness, isUniquenessModel) 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, 318, &_11$$6, &_12$$6); + ZEPHIR_CALL_FUNCTION(&_13$$6, "range", &_14, 312, &_11$$6, &_12$$6); zephir_check_call_status(); _9$$6 = !ZEPHIR_IS_IDENTICAL(&_10$$6, &_13$$6); } @@ -1052,7 +1052,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Uniqueness, isUniquenessModel) 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, 318, &_89$$37, &_90$$37); + ZEPHIR_CALL_FUNCTION(&_91$$37, "range", &_14, 312, &_89$$37, &_90$$37); zephir_check_call_status(); _87$$37 = !ZEPHIR_IS_IDENTICAL(&_88$$37, &_91$$37); } diff --git a/ext/phalcon/filter/validation/validator/url.zep.c b/ext/phalcon/filter/validation/validator/url.zep.c index b1cbb5d0ac..7cf2939980 100644 --- a/ext/phalcon/filter/validation/validator/url.zep.c +++ b/ext/phalcon/filter/validation/validator/url.zep.c @@ -138,7 +138,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Url, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -159,11 +159,11 @@ 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, 284, &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, 284, &value, &_3$$5); + ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 278, &value, &_3$$5); zephir_check_call_status(); } if (!(zephir_is_true(&result))) { diff --git a/ext/phalcon/flash/abstractflash.zep.c b/ext/phalcon/flash/abstractflash.zep.c index 76cb89225f..0a637f8f31 100644 --- a/ext/phalcon/flash/abstractflash.zep.c +++ b/ext/phalcon/flash/abstractflash.zep.c @@ -117,8 +117,8 @@ PHP_METHOD(Phalcon_Flash_AbstractFlash, __construct) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 2) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(escaper, phalcon_html_escaper_escaperinterface_ce) - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(session, phalcon_session_managerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(escaper, zephir_get_internal_ce(SL("phalcon\\html\\escaper\\escaperinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(session, zephir_get_internal_ce(SL("phalcon\\session\\managerinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -548,7 +548,7 @@ PHP_METHOD(Phalcon_Flash_AbstractFlash, setEscaperService) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(escaperService, phalcon_html_escaper_escaperinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(escaperService, zephir_get_internal_ce(SL("phalcon\\html\\escaper\\escaperinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/forms/element/abstractelement.zep.c b/ext/phalcon/forms/element/abstractelement.zep.c index 69996a2b05..5e4b243621 100644 --- a/ext/phalcon/forms/element/abstractelement.zep.c +++ b/ext/phalcon/forms/element/abstractelement.zep.c @@ -224,7 +224,7 @@ PHP_METHOD(Phalcon_Forms_Element_AbstractElement, addValidator) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(validator, phalcon_filter_validation_validatorinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(validator, zephir_get_internal_ce(SL("phalcon\\filter\\validation\\validatorinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -326,7 +326,7 @@ PHP_METHOD(Phalcon_Forms_Element_AbstractElement, appendMessage) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(message, phalcon_messages_messageinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(message, zephir_get_internal_ce(SL("phalcon\\messages\\messageinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -898,7 +898,7 @@ PHP_METHOD(Phalcon_Forms_Element_AbstractElement, setForm) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(form, phalcon_forms_form_ce) + Z_PARAM_OBJECT_OF_CLASS(form, zephir_get_internal_ce(SL("phalcon\\forms\\form"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -950,7 +950,7 @@ PHP_METHOD(Phalcon_Forms_Element_AbstractElement, setMessages) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(messages, phalcon_messages_messages_ce) + Z_PARAM_OBJECT_OF_CLASS(messages, zephir_get_internal_ce(SL("phalcon\\messages\\messages"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1010,7 +1010,7 @@ PHP_METHOD(Phalcon_Forms_Element_AbstractElement, setTagFactory) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(tagFactory, phalcon_html_tagfactory_ce) + Z_PARAM_OBJECT_OF_CLASS(tagFactory, zephir_get_internal_ce(SL("phalcon\\html\\tagfactory"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/forms/form.zep.c b/ext/phalcon/forms/form.zep.c index 066153961b..8f2b028c1f 100644 --- a/ext/phalcon/forms/form.zep.c +++ b/ext/phalcon/forms/form.zep.c @@ -186,7 +186,7 @@ PHP_METHOD(Phalcon_Forms_Form, add) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 3) - Z_PARAM_OBJECT_OF_CLASS(element, phalcon_forms_element_elementinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(element, zephir_get_internal_ce(SL("phalcon\\forms\\element\\elementinterface"))) Z_PARAM_OPTIONAL Z_PARAM_STR_OR_NULL(position) Z_PARAM_BOOL_OR_NULL(type, is_null_true) @@ -1430,7 +1430,7 @@ 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, 319); + ZEPHIR_CALL_METHOD(NULL, &validation, "__construct", NULL, 313); zephir_check_call_status(); } zephir_read_property(&_8, this_ptr, ZEND_STRL("elements"), PH_NOISY_CC | PH_READONLY); @@ -1453,7 +1453,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) { ZEPHIR_INIT_NVAR(&validator); ZVAL_COPY(&validator, _11$$10); - ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 320, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 314, &name, &validator); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -1467,7 +1467,7 @@ 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, 320, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 314, &name, &validator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &validators, "next", NULL, 0); zephir_check_call_status(); @@ -1477,7 +1477,7 @@ 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, 321, &name, &filters); + ZEPHIR_CALL_METHOD(NULL, &validation, "setfilters", &_14, 315, &name, &filters); zephir_check_call_status(); } } ZEND_HASH_FOREACH_END(); @@ -1505,7 +1505,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) { ZEPHIR_INIT_NVAR(&validator); ZVAL_COPY(&validator, _15$$15); - ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 320, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 314, &name, &validator); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -1519,7 +1519,7 @@ 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, 320, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 314, &name, &validator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &validators, "next", NULL, 0); zephir_check_call_status(); @@ -1529,7 +1529,7 @@ 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, 321, &name, &filters); + ZEPHIR_CALL_METHOD(NULL, &validation, "setfilters", &_14, 315, &name, &filters); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, &_8, "next", NULL, 0); @@ -1537,7 +1537,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) } } ZEPHIR_INIT_NVAR(&element); - ZEPHIR_CALL_METHOD(&messages, &validation, "validate", NULL, 322, data, entity); + ZEPHIR_CALL_METHOD(&messages, &validation, "validate", NULL, 316, data, entity); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_17, &messages, "count", NULL, 0); zephir_check_call_status(); @@ -1854,7 +1854,7 @@ PHP_METHOD(Phalcon_Forms_Form, setAttributes) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(attributes, phalcon_html_attributes_ce) + Z_PARAM_OBJECT_OF_CLASS(attributes, zephir_get_internal_ce(SL("phalcon\\html\\attributes"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1904,7 +1904,7 @@ PHP_METHOD(Phalcon_Forms_Form, setTagFactory) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(tagFactory, phalcon_html_tagfactory_ce) + Z_PARAM_OBJECT_OF_CLASS(tagFactory, zephir_get_internal_ce(SL("phalcon\\html\\tagfactory"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1930,7 +1930,7 @@ PHP_METHOD(Phalcon_Forms_Form, setValidation) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_validationinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation\\validationinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/forms/manager.zep.c b/ext/phalcon/forms/manager.zep.c index 1411d1c2a9..aded136590 100644 --- a/ext/phalcon/forms/manager.zep.c +++ b/ext/phalcon/forms/manager.zep.c @@ -83,7 +83,7 @@ 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, 323, entity); + ZEPHIR_CALL_METHOD(NULL, &form, "__construct", NULL, 317, entity); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("forms"), &name, &form); RETURN_CCTOR(&form); @@ -179,7 +179,7 @@ PHP_METHOD(Phalcon_Forms_Manager, set) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(name) - Z_PARAM_OBJECT_OF_CLASS(form, phalcon_forms_form_ce) + Z_PARAM_OBJECT_OF_CLASS(form, zephir_get_internal_ce(SL("phalcon\\forms\\form"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/html/attributes.zep.c b/ext/phalcon/html/attributes.zep.c index fded749eff..af5484fd46 100644 --- a/ext/phalcon/html/attributes.zep.c +++ b/ext/phalcon/html/attributes.zep.c @@ -164,7 +164,7 @@ 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, 287, &value, &_5$$4, &_6$$4, &__$true); + ZEPHIR_CALL_FUNCTION(&_7$$4, "htmlspecialchars", &_8, 281, &value, &_5$$4, &_6$$4, &__$true); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_9$$4); ZEPHIR_CONCAT_VSVS(&_9$$4, &key, "=\"", &_7$$4, "\" "); @@ -192,7 +192,7 @@ 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, 287, &value, &_11$$6, &_12$$6, &__$true); + ZEPHIR_CALL_FUNCTION(&_13$$6, "htmlspecialchars", &_8, 281, &value, &_11$$6, &_12$$6, &__$true); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_14$$6); ZEPHIR_CONCAT_VSVS(&_14$$6, &key, "=\"", &_13$$6, "\" "); diff --git a/ext/phalcon/html/breadcrumbs.zep.c b/ext/phalcon/html/breadcrumbs.zep.c index 5b0c8f4a6d..dd47c46280 100644 --- a/ext/phalcon/html/breadcrumbs.zep.c +++ b/ext/phalcon/html/breadcrumbs.zep.c @@ -241,7 +241,7 @@ 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, 324, &urls); + ZEPHIR_CALL_FUNCTION(&lastUrl, "end", NULL, 318, &urls); ZEPHIR_UNREF(&urls); zephir_check_call_status(); ZEPHIR_OBS_VAR(&lastLabel); diff --git a/ext/phalcon/html/escaper.zep.c b/ext/phalcon/html/escaper.zep.c index fce61bec30..082607f42d 100644 --- a/ext/phalcon/html/escaper.zep.c +++ b/ext/phalcon/html/escaper.zep.c @@ -257,9 +257,9 @@ PHP_METHOD(Phalcon_Html_Escaper, css) zephir_get_strval(&input, input_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 325, &input); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 319, &input); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapecss", NULL, 326, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapecss", NULL, 320, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -332,7 +332,7 @@ PHP_METHOD(Phalcon_Html_Escaper, detectEncoding) { ZEPHIR_INIT_NVAR(&charset); ZVAL_COPY(&charset, _2); - ZEPHIR_CALL_FUNCTION(&_4$$5, "mb_detect_encoding", &_5, 327, &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); @@ -349,7 +349,7 @@ 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, 327, &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); @@ -359,7 +359,7 @@ PHP_METHOD(Phalcon_Html_Escaper, detectEncoding) } } ZEPHIR_INIT_NVAR(&charset); - ZEPHIR_RETURN_CALL_FUNCTION("mb_detect_encoding", &_5, 327, &input); + ZEPHIR_RETURN_CALL_FUNCTION("mb_detect_encoding", &_5, 321, &input); zephir_check_call_status(); RETURN_MM(); } @@ -622,7 +622,7 @@ 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, 287, &input, &_0, &_1, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 281, &input, &_0, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -658,9 +658,9 @@ PHP_METHOD(Phalcon_Html_Escaper, js) zephir_get_strval(&input, input_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 325, &input); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 319, &input); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapejs", NULL, 328, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapejs", NULL, 322, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -696,11 +696,11 @@ PHP_METHOD(Phalcon_Html_Escaper, normalizeEncoding) zephir_get_strval(&input, input_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "detectencoding", NULL, 329, &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, 330, &input, &_1, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 324, &input, &_1, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -876,7 +876,7 @@ PHP_METHOD(Phalcon_Html_Escaper, url) zephir_get_strval(&input, input_param); - ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 331, &input); + ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 325, &input); zephir_check_call_status(); RETURN_MM(); } @@ -916,7 +916,7 @@ PHP_METHOD(Phalcon_Html_Escaper, phpHtmlSpecialChars) 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, 287, &input, &_0, &_1, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 281, &input, &_0, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/html/helper/abstracthelper.zep.c b/ext/phalcon/html/helper/abstracthelper.zep.c index 183ed41a95..f8cfbf57a7 100644 --- a/ext/phalcon/html/helper/abstracthelper.zep.c +++ b/ext/phalcon/html/helper/abstracthelper.zep.c @@ -74,7 +74,7 @@ PHP_METHOD(Phalcon_Html_Helper_AbstractHelper, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(escaper, phalcon_html_escaper_escaperinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(escaper, zephir_get_internal_ce(SL("phalcon\\html\\escaper\\escaperinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/html/helper/input/checkbox.zep.c b/ext/phalcon/html/helper/input/checkbox.zep.c index 53ac8f5fa2..04ce62c3ea 100644 --- a/ext/phalcon/html/helper/input/checkbox.zep.c +++ b/ext/phalcon/html/helper/input/checkbox.zep.c @@ -69,7 +69,7 @@ PHP_METHOD(Phalcon_Html_Helper_Input_Checkbox, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(escaper, phalcon_html_escaper_escaperinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(escaper, zephir_get_internal_ce(SL("phalcon\\html\\escaper\\escaperinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/html/helper/input/select.zep.c b/ext/phalcon/html/helper/input/select.zep.c index 87c65f4b60..5be0fbff35 100644 --- a/ext/phalcon/html/helper/input/select.zep.c +++ b/ext/phalcon/html/helper/input/select.zep.c @@ -115,7 +115,7 @@ PHP_METHOD(Phalcon_Html_Helper_Input_Select, add) } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "processvalue", NULL, 332, &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); diff --git a/ext/phalcon/html/helper/meta.zep.c b/ext/phalcon/html/helper/meta.zep.c index 20cb0a44db..c15f01171a 100644 --- a/ext/phalcon/html/helper/meta.zep.c +++ b/ext/phalcon/html/helper/meta.zep.c @@ -130,7 +130,7 @@ PHP_METHOD(Phalcon_Html_Helper_Meta, addHttp) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "http-equiv"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addelement", NULL, 333, &_0, &httpEquiv, &content); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addelement", NULL, 327, &_0, &httpEquiv, &content); zephir_check_call_status(); RETURN_MM(); } @@ -170,7 +170,7 @@ PHP_METHOD(Phalcon_Html_Helper_Meta, addName) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "name"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 333, &_0, &name, &content); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 327, &_0, &name, &content); zephir_check_call_status(); RETURN_THIS(); } @@ -210,7 +210,7 @@ PHP_METHOD(Phalcon_Html_Helper_Meta, addProperty) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "property"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 333, &_0, &name, &content); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 327, &_0, &name, &content); zephir_check_call_status(); RETURN_THIS(); } diff --git a/ext/phalcon/html/helper/title.zep.c b/ext/phalcon/html/helper/title.zep.c index df7fd6371c..3a2ad5c663 100644 --- a/ext/phalcon/html/helper/title.zep.c +++ b/ext/phalcon/html/helper/title.zep.c @@ -158,7 +158,7 @@ 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, 334, &_0, &_1, &_3); + ZEPHIR_CALL_FUNCTION(&items, "array_merge", NULL, 328, &_0, &_1, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); array_init(&_4); @@ -412,7 +412,7 @@ PHP_METHOD(Phalcon_Html_Helper_Title, prepend) zephir_read_property(&_2, this_ptr, ZEND_STRL("prepend"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&prepend, &_2); ZEPHIR_MAKE_REF(&prepend); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 271, &prepend, &text); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 265, &prepend, &text); ZEPHIR_UNREF(&prepend); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("prepend"), &prepend); diff --git a/ext/phalcon/html/link/evolvablelinkprovider.zep.c b/ext/phalcon/html/link/evolvablelinkprovider.zep.c index 50d7cedffb..73d49a4701 100644 --- a/ext/phalcon/html/link/evolvablelinkprovider.zep.c +++ b/ext/phalcon/html/link/evolvablelinkprovider.zep.c @@ -61,7 +61,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, phalcon_html_link_interfaces_linkinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(link, zephir_get_internal_ce(SL("phalcon\\html\\link\\interfaces\\linkinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -98,7 +98,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, phalcon_html_link_interfaces_linkinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(link, zephir_get_internal_ce(SL("phalcon\\html\\link\\interfaces\\linkinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/html/tagfactory.zep.c b/ext/phalcon/html/tagfactory.zep.c index 3275381f0b..3f4a6bc0e1 100644 --- a/ext/phalcon/html/tagfactory.zep.c +++ b/ext/phalcon/html/tagfactory.zep.c @@ -119,7 +119,7 @@ PHP_METHOD(Phalcon_Html_TagFactory, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(escaper, phalcon_html_escaper_escaperinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(escaper, zephir_get_internal_ce(SL("phalcon\\html\\escaper\\escaperinterface"))) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(services) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/phalcon/http/cookie.zep.c b/ext/phalcon/http/cookie.zep.c index 33f0f7bd3c..a78297b23f 100644 --- a/ext/phalcon/http/cookie.zep.c +++ b/ext/phalcon/http/cookie.zep.c @@ -311,32 +311,32 @@ 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, 335, &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, 335, &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, 335, &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, 335, &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, 335, &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_INIT_NVAR(&_8); ZVAL_STRING(&_8, ""); - ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 336, &name, &_8, &options); + ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 330, &name, &_8, &options); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -857,30 +857,30 @@ PHP_METHOD(Phalcon_Http_Cookie, send) } ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "expires"); - ZEPHIR_CALL_METHOD(&_13, this_ptr, "getarrval", NULL, 335, &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, 335, &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, 335, &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, 335, &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, 335, &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, 336, &name, &encryptValue, &options); + ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 330, &name, &encryptValue, &options); zephir_check_call_status(); RETURN_THIS(); } @@ -1264,14 +1264,14 @@ PHP_METHOD(Phalcon_Http_Cookie, assertSignKeyIsLongEnough) } - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 233, &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, 113, &_1$$3, &length); + ZEPHIR_CALL_FUNCTION(&_2$$3, "sprintf", NULL, 107, &_1$$3, &length); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 29, &_2$$3); zephir_check_call_status(); diff --git a/ext/phalcon/http/request.zep.c b/ext/phalcon/http/request.zep.c index 5902c33f9c..487f24fce9 100644 --- a/ext/phalcon/http/request.zep.c +++ b/ext/phalcon/http/request.zep.c @@ -184,7 +184,7 @@ PHP_METHOD(Phalcon_Http_Request, get) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 337, &_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(); } @@ -210,7 +210,7 @@ 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, 338, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 332, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -237,13 +237,13 @@ PHP_METHOD(Phalcon_Http_Request, getBasicAuth) ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "PHP_AUTH_USER"); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 339, &_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, 339, &_1); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "hasserver", NULL, 333, &_1); zephir_check_call_status(); _2 = !zephir_is_true(&_3); } @@ -285,7 +285,7 @@ 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, 340, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 334, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -311,7 +311,7 @@ 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, 340, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 334, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -337,7 +337,7 @@ 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, 340, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 334, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -440,7 +440,7 @@ PHP_METHOD(Phalcon_Http_Request, getClientAddress) ZEPHIR_INIT_VAR(&address); ZVAL_NULL(&address); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 341); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 335); zephir_check_call_status(); if (trustForwardedHeader) { ZEPHIR_OBS_NVAR(&address); @@ -487,7 +487,7 @@ 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, 338, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 332, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -508,7 +508,7 @@ PHP_METHOD(Phalcon_Http_Request, getContentType) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 341); + 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(); @@ -547,7 +547,7 @@ PHP_METHOD(Phalcon_Http_Request, getDigestAuth) ZEPHIR_INIT_VAR(&auth); array_init(&auth); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 341); + 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)) { @@ -939,7 +939,7 @@ 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, 341); + 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)) { @@ -1033,7 +1033,7 @@ 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, 341); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 335); zephir_check_call_status(); zephir_is_iterable(&server, 0, "phalcon/Http/Request.zep", 460); if (Z_TYPE_P(&server) == IS_ARRAY) { @@ -1059,7 +1059,7 @@ 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, 289, &_4$$4); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 283, &_4$$4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_11$$4); ZEPHIR_INIT_NVAR(&_12$$4); @@ -1083,7 +1083,7 @@ 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, 289, &_15$$5); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 283, &_15$$5); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_19$$5); ZEPHIR_INIT_NVAR(&_20$$5); @@ -1120,7 +1120,7 @@ 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, 289, &_22$$7); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 283, &_22$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_28$$7); ZEPHIR_INIT_NVAR(&_29$$7); @@ -1144,7 +1144,7 @@ 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, 289, &_32$$8); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 283, &_32$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_36$$8); ZEPHIR_INIT_NVAR(&_37$$8); @@ -1282,7 +1282,7 @@ 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, 342, &_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", 544); ZEPHIR_MM_RESTORE(); @@ -1311,7 +1311,7 @@ PHP_METHOD(Phalcon_Http_Request, getHTTPReferer) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 341); + 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(""); @@ -1381,7 +1381,7 @@ 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, 338, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 332, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -1421,7 +1421,7 @@ PHP_METHOD(Phalcon_Http_Request, getMethod) zephir_get_global(&_REQUEST, SL("_REQUEST")); ZEPHIR_INIT_VAR(&returnMethod); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 341); + 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))) { @@ -1435,7 +1435,7 @@ 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, 343, &_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))) { @@ -1544,7 +1544,7 @@ PHP_METHOD(Phalcon_Http_Request, getPatch) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getpatchput", NULL, 344, &_0, &name, filters, defaultValue, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getpatchput", NULL, 338, &_0, &name, filters, defaultValue, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -1587,7 +1587,7 @@ PHP_METHOD(Phalcon_Http_Request, getPort) if (zephir_memnstr_str(&host, SL(":"), "phalcon/Http/Request.zep", 681)) { ZEPHIR_INIT_VAR(&_3$$4); ZVAL_STRING(&_3$$4, ":"); - ZEPHIR_CALL_FUNCTION(&pos, "strrpos", NULL, 241, &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)); @@ -1696,7 +1696,7 @@ PHP_METHOD(Phalcon_Http_Request, getPost) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 337, &_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(); } @@ -1788,7 +1788,7 @@ PHP_METHOD(Phalcon_Http_Request, getPut) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getpatchput", NULL, 344, &_0, &name, filters, defaultValue, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getpatchput", NULL, 338, &_0, &name, filters, defaultValue, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -1883,7 +1883,7 @@ PHP_METHOD(Phalcon_Http_Request, getQuery) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 337, &_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(); } @@ -1984,7 +1984,7 @@ PHP_METHOD(Phalcon_Http_Request, getServer) } - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 341); + 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(); @@ -2016,7 +2016,7 @@ 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, 345, &_1$$3); + ZEPHIR_RETURN_CALL_FUNCTION("gethostbyname", NULL, 339, &_1$$3); zephir_check_call_status(); RETURN_MM(); } @@ -2173,7 +2173,7 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) zephir_array_fetch_string(&_7$$5, &input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 886); zephir_array_fetch_string(&_8$$5, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 887); zephir_array_fetch_string(&_9$$5, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 888); - ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 346, &_5$$5, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &prefix); + ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 340, &_5$$5, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &prefix); zephir_check_call_status(); zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 915); if (Z_TYPE_P(&smoothInput) == IS_ARRAY) { @@ -2208,7 +2208,7 @@ 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", 906); - ZEPHIR_CALL_METHOD(NULL, &_16$$8, "__construct", &_18, 347, &dataFile, &_17$$8); + ZEPHIR_CALL_METHOD(NULL, &_16$$8, "__construct", &_18, 341, &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", 903); @@ -2217,7 +2217,7 @@ 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", 911); - ZEPHIR_CALL_METHOD(NULL, &_20$$9, "__construct", &_18, 347, &dataFile, &_21$$9); + ZEPHIR_CALL_METHOD(NULL, &_20$$9, "__construct", &_18, 341, &dataFile, &_21$$9); zephir_check_call_status(); zephir_array_append(&files, &_20$$9, PH_SEPARATE, "phalcon/Http/Request.zep", 911); } @@ -2262,7 +2262,7 @@ 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", 906); - ZEPHIR_CALL_METHOD(NULL, &_26$$12, "__construct", &_18, 347, &dataFile, &_27$$12); + ZEPHIR_CALL_METHOD(NULL, &_26$$12, "__construct", &_18, 341, &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", 903); @@ -2271,7 +2271,7 @@ 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", 911); - ZEPHIR_CALL_METHOD(NULL, &_29$$13, "__construct", &_18, 347, &dataFile, &_30$$13); + ZEPHIR_CALL_METHOD(NULL, &_29$$13, "__construct", &_18, 341, &dataFile, &_30$$13); zephir_check_call_status(); zephir_array_append(&files, &_29$$13, PH_SEPARATE, "phalcon/Http/Request.zep", 911); } @@ -2291,13 +2291,13 @@ 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, 347, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_33$$16, "__construct", &_18, 341, &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, 347, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_34$$17, "__construct", &_18, 341, &input, &prefix); zephir_check_call_status(); zephir_array_append(&files, &_34$$17, PH_SEPARATE, "phalcon/Http/Request.zep", 920); } @@ -2325,7 +2325,7 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) zephir_array_fetch_string(&_38$$19, &input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 886); zephir_array_fetch_string(&_39$$19, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 887); zephir_array_fetch_string(&_40$$19, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 888); - ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 346, &_36$$19, &_37$$19, &_38$$19, &_39$$19, &_40$$19, &prefix); + ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 340, &_36$$19, &_37$$19, &_38$$19, &_39$$19, &_40$$19, &prefix); zephir_check_call_status(); zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 915); if (Z_TYPE_P(&smoothInput) == IS_ARRAY) { @@ -2361,7 +2361,7 @@ 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", 906); - ZEPHIR_CALL_METHOD(NULL, &_47$$22, "__construct", &_18, 347, &dataFile, &_48$$22); + ZEPHIR_CALL_METHOD(NULL, &_47$$22, "__construct", &_18, 341, &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", 903); @@ -2370,7 +2370,7 @@ 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", 911); - ZEPHIR_CALL_METHOD(NULL, &_50$$23, "__construct", &_18, 347, &dataFile, &_51$$23); + ZEPHIR_CALL_METHOD(NULL, &_50$$23, "__construct", &_18, 341, &dataFile, &_51$$23); zephir_check_call_status(); zephir_array_append(&files, &_50$$23, PH_SEPARATE, "phalcon/Http/Request.zep", 911); } @@ -2415,7 +2415,7 @@ 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", 906); - ZEPHIR_CALL_METHOD(NULL, &_56$$26, "__construct", &_18, 347, &dataFile, &_57$$26); + ZEPHIR_CALL_METHOD(NULL, &_56$$26, "__construct", &_18, 341, &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", 903); @@ -2424,7 +2424,7 @@ 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", 911); - ZEPHIR_CALL_METHOD(NULL, &_59$$27, "__construct", &_18, 347, &dataFile, &_60$$27); + ZEPHIR_CALL_METHOD(NULL, &_59$$27, "__construct", &_18, 341, &dataFile, &_60$$27); zephir_check_call_status(); zephir_array_append(&files, &_59$$27, PH_SEPARATE, "phalcon/Http/Request.zep", 911); } @@ -2444,13 +2444,13 @@ 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, 347, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_63$$30, "__construct", &_18, 341, &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, 347, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_64$$31, "__construct", &_18, 341, &input, &prefix); zephir_check_call_status(); zephir_array_append(&files, &_64$$31, PH_SEPARATE, "phalcon/Http/Request.zep", 920); } @@ -2663,13 +2663,13 @@ 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, 339, &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, 339, &_6); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "hasserver", NULL, 333, &_6); zephir_check_call_status(); _4 = zephir_is_true(&_5); } @@ -2862,7 +2862,7 @@ PHP_METHOD(Phalcon_Http_Request, hasServer) } - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 341); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 335); zephir_check_call_status(); RETURN_MM_BOOL(zephir_array_isset(&server, &name)); } @@ -2887,7 +2887,7 @@ 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, 339, &_1); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 333, &_1); zephir_check_call_status(); _2 = zephir_is_true(&_0); if (_2) { @@ -2916,7 +2916,7 @@ PHP_METHOD(Phalcon_Http_Request, isConnect) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 348); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 342); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "CONNECT")); } @@ -2937,7 +2937,7 @@ PHP_METHOD(Phalcon_Http_Request, isDelete) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 348); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 342); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "DELETE")); } @@ -2958,7 +2958,7 @@ PHP_METHOD(Phalcon_Http_Request, isGet) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 348); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 342); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "GET")); } @@ -2979,7 +2979,7 @@ PHP_METHOD(Phalcon_Http_Request, isHead) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 348); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 342); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "HEAD")); } @@ -3027,7 +3027,7 @@ PHP_METHOD(Phalcon_Http_Request, isMethod) } - ZEPHIR_CALL_METHOD(&httpMethod, this_ptr, "getmethod", NULL, 348); + ZEPHIR_CALL_METHOD(&httpMethod, this_ptr, "getmethod", NULL, 342); zephir_check_call_status(); if (Z_TYPE_P(methods) == IS_STRING) { _0$$3 = strict; @@ -3061,7 +3061,7 @@ PHP_METHOD(Phalcon_Http_Request, isMethod) } else { ZVAL_BOOL(&_7$$6, 0); } - ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "ismethod", &_8, 349, &method, &_7$$6); + ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "ismethod", &_8, 343, &method, &_7$$6); zephir_check_call_status(); if (zephir_is_true(&_6$$6)) { RETURN_MM_BOOL(1); @@ -3083,7 +3083,7 @@ PHP_METHOD(Phalcon_Http_Request, isMethod) } else { ZVAL_BOOL(&_10$$8, 0); } - ZEPHIR_CALL_METHOD(&_9$$8, this_ptr, "ismethod", &_8, 349, &method, &_10$$8); + ZEPHIR_CALL_METHOD(&_9$$8, this_ptr, "ismethod", &_8, 343, &method, &_10$$8); zephir_check_call_status(); if (zephir_is_true(&_9$$8)) { RETURN_MM_BOOL(1); @@ -3118,7 +3118,7 @@ PHP_METHOD(Phalcon_Http_Request, isOptions) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 348); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 342); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "OPTIONS")); } @@ -3139,7 +3139,7 @@ PHP_METHOD(Phalcon_Http_Request, isPatch) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 348); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 342); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "PATCH")); } @@ -3160,7 +3160,7 @@ PHP_METHOD(Phalcon_Http_Request, isPost) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 348); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 342); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "POST")); } @@ -3181,7 +3181,7 @@ PHP_METHOD(Phalcon_Http_Request, isPut) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 348); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 342); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "PUT")); } @@ -3202,7 +3202,7 @@ PHP_METHOD(Phalcon_Http_Request, isPurge) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 348); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 342); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "PURGE")); } @@ -3259,7 +3259,7 @@ PHP_METHOD(Phalcon_Http_Request, isSoap) ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "HTTP_SOAPACTION"); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 339, &_1); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 333, &_1); zephir_check_call_status(); if (zephir_is_true(&_0)) { RETURN_MM_BOOL(1); @@ -3288,7 +3288,7 @@ PHP_METHOD(Phalcon_Http_Request, isTrace) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 348); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 342); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "TRACE")); } @@ -3397,7 +3397,7 @@ PHP_METHOD(Phalcon_Http_Request, numFiles) } else { ZVAL_BOOL(&_4$$8, 0); } - ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "hasfilehelper", &_5, 350, &error, &_4$$8); + ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "hasfilehelper", &_5, 344, &error, &_4$$8); zephir_check_call_status(); numberFiles += zephir_get_numberval(&_3$$8); } @@ -3431,7 +3431,7 @@ PHP_METHOD(Phalcon_Http_Request, numFiles) } else { ZVAL_BOOL(&_8$$13, 0); } - ZEPHIR_CALL_METHOD(&_7$$13, this_ptr, "hasfilehelper", &_5, 350, &error, &_8$$13); + ZEPHIR_CALL_METHOD(&_7$$13, this_ptr, "hasfilehelper", &_5, 344, &error, &_8$$13); zephir_check_call_status(); numberFiles += zephir_get_numberval(&_7$$13); } @@ -3560,7 +3560,7 @@ PHP_METHOD(Phalcon_Http_Request, setParameterFilters) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 351); + ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 345); zephir_check_call_status(); zephir_is_iterable(&filters, 0, "phalcon/Http/Request.zep", 1323); if (Z_TYPE_P(&filters) == IS_ARRAY) { @@ -3901,7 +3901,7 @@ PHP_METHOD(Phalcon_Http_Request, getHelper) RETURN_MM(); } if (Z_TYPE_P(filters) != IS_NULL) { - ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 351); + ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 345); zephir_check_call_status(); if (noRecursive) { ZVAL_BOOL(&_3$$6, 1); @@ -3977,7 +3977,7 @@ PHP_METHOD(Phalcon_Http_Request, hasFileHelper) } else { ZVAL_BOOL(&_4$$7, 0); } - ZEPHIR_CALL_METHOD(&_3$$7, this_ptr, "hasfilehelper", &_5, 350, &value, &_4$$7); + ZEPHIR_CALL_METHOD(&_3$$7, this_ptr, "hasfilehelper", &_5, 344, &value, &_4$$7); zephir_check_call_status(); numberFiles += zephir_get_numberval(&_3$$7); } @@ -4008,7 +4008,7 @@ PHP_METHOD(Phalcon_Http_Request, hasFileHelper) } else { ZVAL_BOOL(&_8$$11, 0); } - ZEPHIR_CALL_METHOD(&_7$$11, this_ptr, "hasfilehelper", &_5, 350, &value, &_8$$11); + ZEPHIR_CALL_METHOD(&_7$$11, this_ptr, "hasfilehelper", &_5, 344, &value, &_8$$11); zephir_check_call_status(); numberFiles += zephir_get_numberval(&_7$$11); } @@ -4402,7 +4402,7 @@ 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, 341); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 335); zephir_check_call_status(); if (Z_TYPE_P(&container) != IS_NULL) { ZEPHIR_INIT_VAR(&_1$$3); @@ -4437,13 +4437,13 @@ PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) } ZEPHIR_INIT_VAR(&_8); ZVAL_STRING(&_8, "PHP_AUTH_USER"); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 339, &_8); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 333, &_8); zephir_check_call_status(); _9 = zephir_is_true(&_0); if (_9) { ZEPHIR_INIT_NVAR(&_8); ZVAL_STRING(&_8, "PHP_AUTH_PW"); - ZEPHIR_CALL_METHOD(&_10, this_ptr, "hasserver", NULL, 339, &_8); + ZEPHIR_CALL_METHOD(&_10, this_ptr, "hasserver", NULL, 333, &_8); zephir_check_call_status(); _9 = zephir_is_true(&_10); } @@ -4461,11 +4461,11 @@ PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) } else { ZEPHIR_INIT_VAR(&_15$$8); ZVAL_STRING(&_15$$8, "HTTP_AUTHORIZATION"); - ZEPHIR_CALL_METHOD(&_14$$8, this_ptr, "hasserver", NULL, 339, &_15$$8); + ZEPHIR_CALL_METHOD(&_14$$8, this_ptr, "hasserver", NULL, 333, &_15$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_15$$8); ZVAL_STRING(&_15$$8, "REDIRECT_HTTP_AUTHORIZATION"); - ZEPHIR_CALL_METHOD(&_16$$8, this_ptr, "hasserver", NULL, 339, &_15$$8); + ZEPHIR_CALL_METHOD(&_16$$8, this_ptr, "hasserver", NULL, 333, &_15$$8); zephir_check_call_status(); if (zephir_is_true(&_14$$8)) { ZEPHIR_INIT_VAR(&_17$$9); @@ -4481,29 +4481,29 @@ PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) if (zephir_is_true(&authHeader)) { ZEPHIR_INIT_VAR(&_19$$11); ZVAL_STRING(&_19$$11, "basic "); - ZEPHIR_CALL_FUNCTION(&_20$$11, "stripos", NULL, 352, &authHeader, &_19$$11); + ZEPHIR_CALL_FUNCTION(&_20$$11, "stripos", NULL, 346, &authHeader, &_19$$11); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_19$$11); ZVAL_STRING(&_19$$11, "digest "); - ZEPHIR_CALL_FUNCTION(&_21$$11, "stripos", NULL, 352, &authHeader, &_19$$11); + ZEPHIR_CALL_FUNCTION(&_21$$11, "stripos", NULL, 346, &authHeader, &_19$$11); zephir_check_call_status(); _22$$11 = ZEPHIR_IS_LONG_IDENTICAL(&_21$$11, 0); if (_22$$11) { ZEPHIR_INIT_NVAR(&_19$$11); ZVAL_STRING(&_19$$11, "PHP_AUTH_DIGEST"); - ZEPHIR_CALL_METHOD(&_23$$11, this_ptr, "hasserver", NULL, 339, &_19$$11); + ZEPHIR_CALL_METHOD(&_23$$11, this_ptr, "hasserver", NULL, 333, &_19$$11); zephir_check_call_status(); _22$$11 = !zephir_is_true(&_23$$11); } ZEPHIR_INIT_NVAR(&_19$$11); ZVAL_STRING(&_19$$11, "bearer "); - ZEPHIR_CALL_FUNCTION(&_24$$11, "stripos", NULL, 352, &authHeader, &_19$$11); + ZEPHIR_CALL_FUNCTION(&_24$$11, "stripos", NULL, 346, &authHeader, &_19$$11); zephir_check_call_status(); if (ZEPHIR_IS_LONG_IDENTICAL(&_20$$11, 0)) { ZVAL_LONG(&_25$$12, 6); ZEPHIR_INIT_VAR(&_26$$12); zephir_substr(&_26$$12, &authHeader, 6 , 0, ZEPHIR_SUBSTR_NO_LENGTH); - ZEPHIR_CALL_FUNCTION(&_27$$12, "base64_decode", NULL, 229, &_26$$12); + ZEPHIR_CALL_FUNCTION(&_27$$12, "base64_decode", NULL, 223, &_26$$12); zephir_check_call_status(); ZEPHIR_INIT_VAR(&exploded); zephir_fast_explode_str(&exploded, SL(":"), &_27$$12, 2 ); @@ -4527,7 +4527,7 @@ PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) zephir_array_fetch_string(&_31$$17, &headers, SL("Php-Auth-Pw"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1566); ZEPHIR_INIT_VAR(&_32$$17); ZEPHIR_CONCAT_VSV(&_32$$17, &_30$$17, ":", &_31$$17); - ZEPHIR_CALL_FUNCTION(&_33$$17, "base64_encode", NULL, 230, &_32$$17); + ZEPHIR_CALL_FUNCTION(&_33$$17, "base64_encode", NULL, 224, &_32$$17); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_34$$17); ZEPHIR_CONCAT_SV(&_34$$17, "Basic ", &_33$$17); @@ -4666,7 +4666,7 @@ PHP_METHOD(Phalcon_Http_Request, smoothFiles) zephir_array_fetch(&_8$$5, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1618); zephir_array_fetch(&_9$$5, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1619); zephir_array_fetch(&_10$$5, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1620); - ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 346, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &_10$$5, &p); + ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 340, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &_10$$5, &p); zephir_check_call_status(); zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1627); if (Z_TYPE_P(&parentFiles) == IS_ARRAY) { @@ -4735,7 +4735,7 @@ PHP_METHOD(Phalcon_Http_Request, smoothFiles) zephir_array_fetch(&_18$$10, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1618); zephir_array_fetch(&_19$$10, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1619); zephir_array_fetch(&_20$$10, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1620); - ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 346, &_16$$10, &_17$$10, &_18$$10, &_19$$10, &_20$$10, &p); + ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 340, &_16$$10, &_17$$10, &_18$$10, &_19$$10, &_20$$10, &p); zephir_check_call_status(); zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1627); if (Z_TYPE_P(&parentFiles) == IS_ARRAY) { @@ -4996,7 +4996,7 @@ PHP_METHOD(Phalcon_Http_Request, getPatchPut) if (_0$$3) { ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "json"); - ZEPHIR_CALL_FUNCTION(&_2$$3, "stripos", NULL, 352, &contentType, &_1$$3); + ZEPHIR_CALL_FUNCTION(&_2$$3, "stripos", NULL, 346, &contentType, &_1$$3); zephir_check_call_status(); _0$$3 = !ZEPHIR_IS_FALSE(&_2$$3); } @@ -5014,7 +5014,7 @@ PHP_METHOD(Phalcon_Http_Request, getPatchPut) ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "getrawbody", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&cached); - ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 353, &_4$$6, &cached); + ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 347, &_4$$6, &cached); ZEPHIR_UNREF(&cached); zephir_check_call_status(); } @@ -5030,7 +5030,7 @@ PHP_METHOD(Phalcon_Http_Request, getPatchPut) } else { ZVAL_BOOL(&_6, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 337, &cached, &name, filters, defaultValue, &_5, &_6); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 331, &cached, &name, filters, defaultValue, &_5, &_6); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/http/request/file.zep.c b/ext/phalcon/http/request/file.zep.c index 2b54f9d025..8ffb91c57e 100644 --- a/ext/phalcon/http/request/file.zep.c +++ b/ext/phalcon/http/request/file.zep.c @@ -140,7 +140,7 @@ 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, 114, &_0$$3); + ZEPHIR_CALL_FUNCTION(&_1$$3, "defined", NULL, 108, &_0$$3); zephir_check_call_status(); if (zephir_is_true(&_1$$3)) { ZVAL_LONG(&_2$$4, 4); @@ -151,22 +151,22 @@ PHP_METHOD(Phalcon_Http_Request_File, __construct) } ZEPHIR_INIT_VAR(&_5); ZVAL_STRING(&_5, "tmp_name"); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "getarrval", NULL, 354, &file, &_5); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "getarrval", NULL, 348, &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, 354, &file, &_5); + ZEPHIR_CALL_METHOD(&_6, this_ptr, "getarrval", NULL, 348, &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, 354, &file, &_5); + ZEPHIR_CALL_METHOD(&_7, this_ptr, "getarrval", NULL, 348, &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, 354, &file, &_5); + ZEPHIR_CALL_METHOD(&_8, this_ptr, "getarrval", NULL, 348, &file, &_5); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("error"), &_8); if (zephir_is_true(key)) { @@ -241,15 +241,15 @@ PHP_METHOD(Phalcon_Http_Request_File, getRealType) ZEPHIR_MM_GROW(); ZVAL_LONG(&_0, 16); - ZEPHIR_CALL_FUNCTION(&finfo, "finfo_open", NULL, 312, &_0); + ZEPHIR_CALL_FUNCTION(&finfo, "finfo_open", NULL, 306, &_0); zephir_check_call_status(); 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, 313, &finfo, &_0); + ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 307, &finfo, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 314, &finfo); + ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 308, &finfo); zephir_check_call_status(); RETURN_CCTOR(&mime); } @@ -354,7 +354,7 @@ 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, 355, &_0, &destination); + ZEPHIR_RETURN_CALL_FUNCTION("move_uploaded_file", NULL, 349, &_0, &destination); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/http/response.zep.c b/ext/phalcon/http/response.zep.c index 2bc6898b72..a0078cfd1f 100644 --- a/ext/phalcon/http/response.zep.c +++ b/ext/phalcon/http/response.zep.c @@ -502,7 +502,7 @@ 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, 356, location, &_1$$5); + ZEPHIR_CALL_FUNCTION(&_2$$5, "strstr", NULL, 350, location, &_1$$5); zephir_check_call_status(); _0$$5 = zephir_is_true(&_2$$5); } @@ -667,7 +667,7 @@ PHP_METHOD(Phalcon_Http_Response, send) _3$$5 = ((zephir_fast_strlen_ev(&file)) ? 1 : 0); } if (_3$$5) { - ZEPHIR_CALL_FUNCTION(NULL, "readfile", NULL, 357, &file); + ZEPHIR_CALL_FUNCTION(NULL, "readfile", NULL, 351, &file); zephir_check_call_status(); } } @@ -948,7 +948,7 @@ PHP_METHOD(Phalcon_Http_Response, setCookies) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(cookies, phalcon_http_response_cookiesinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(cookies, zephir_get_internal_ce(SL("phalcon\\http\\response\\cookiesinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -972,7 +972,7 @@ PHP_METHOD(Phalcon_Http_Response, setDI) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1095,7 +1095,7 @@ PHP_METHOD(Phalcon_Http_Response, setEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1159,16 +1159,16 @@ 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, 358, &filePath); + ZEPHIR_CALL_METHOD(&basePath, this_ptr, "getbasename", NULL, 352, &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, 359); + ZEPHIR_CALL_FUNCTION(&_0$$6, "mb_detect_order", NULL, 353); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&basePathEncoding, "mb_detect_encoding", NULL, 327, &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); @@ -1184,7 +1184,7 @@ 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, 331, &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); @@ -1196,7 +1196,7 @@ 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, 214, &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); @@ -1269,7 +1269,7 @@ PHP_METHOD(Phalcon_Http_Response, setHeaders) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(headers, phalcon_http_response_headersinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(headers, zephir_get_internal_ce(SL("phalcon\\http\\response\\headersinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1376,7 +1376,7 @@ 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, 360, content, &_2, &_3); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "encode", NULL, 354, content, &_2, &_3); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "setcontent", NULL, 0, &_1); zephir_check_call_status(); @@ -1546,7 +1546,7 @@ PHP_METHOD(Phalcon_Http_Response, setStatusCode) if (_6$$3) { ZEPHIR_INIT_NVAR(&_7$$3); ZVAL_STRING(&_7$$3, "HTTP/"); - ZEPHIR_CALL_FUNCTION(&_8$$3, "strstr", &_9, 356, &key, &_7$$3); + ZEPHIR_CALL_FUNCTION(&_8$$3, "strstr", &_9, 350, &key, &_7$$3); zephir_check_call_status(); _6$$3 = zephir_is_true(&_8$$3); } @@ -1573,7 +1573,7 @@ PHP_METHOD(Phalcon_Http_Response, setStatusCode) if (_11$$5) { ZEPHIR_INIT_NVAR(&_12$$5); ZVAL_STRING(&_12$$5, "HTTP/"); - ZEPHIR_CALL_FUNCTION(&_13$$5, "strstr", &_9, 356, &key, &_12$$5); + ZEPHIR_CALL_FUNCTION(&_13$$5, "strstr", &_9, 350, &key, &_12$$5); zephir_check_call_status(); _11$$5 = zephir_is_true(&_13$$5); } @@ -1590,7 +1590,7 @@ PHP_METHOD(Phalcon_Http_Response, setStatusCode) ZEPHIR_INIT_NVAR(&key); if (ZEPHIR_IS_NULL(&message)) { ZEPHIR_INIT_VAR(&statusCodes); - zephir_create_array(&statusCodes, 89, 0); + zephir_create_array(&statusCodes, 88, 0); add_index_stringl(&statusCodes, 100, SL("Continue")); add_index_stringl(&statusCodes, 101, SL("Switching Protocols")); add_index_stringl(&statusCodes, 102, SL("Processing")); @@ -1804,7 +1804,7 @@ PHP_METHOD(Phalcon_Http_Response, getBasename) ZVAL_STRING(&_2, "/"); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "@"); - ZEPHIR_CALL_FUNCTION(&_4, "preg_quote", NULL, 361, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "preg_quote", NULL, 355, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5); ZEPHIR_CONCAT_SVS(&_5, "@[^", &_4, "]+$@"); @@ -1820,7 +1820,7 @@ PHP_METHOD(Phalcon_Http_Response, getBasename) if (zephir_is_true(suffix)) { ZEPHIR_INIT_VAR(&_6$$3); ZVAL_STRING(&_6$$3, "@"); - ZEPHIR_CALL_FUNCTION(&_7$$3, "preg_quote", NULL, 361, suffix, &_6$$3); + ZEPHIR_CALL_FUNCTION(&_7$$3, "preg_quote", NULL, 355, suffix, &_6$$3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_8$$3); ZEPHIR_CONCAT_SVS(&_8$$3, "@", &_7$$3, "$@"); @@ -1880,16 +1880,16 @@ PHP_METHOD(Phalcon_Http_Response, 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, 193); + 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, 194); + 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, 195, &_5$$3); + ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 189, &_5$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$3, "phalcon/Http/Response.zep", 885); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/http/response/cookies.zep.c b/ext/phalcon/http/response/cookies.zep.c index e7c7d08419..fadb77843c 100644 --- a/ext/phalcon/http/response/cookies.zep.c +++ b/ext/phalcon/http/response/cookies.zep.c @@ -403,7 +403,7 @@ PHP_METHOD(Phalcon_Http_Response_Cookies, send) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_FUNCTION(&_0, "headers_sent", NULL, 362); + ZEPHIR_CALL_FUNCTION(&_0, "headers_sent", NULL, 356); zephir_check_call_status(); _1 = ZEPHIR_IS_TRUE_IDENTICAL(&_0); if (!(_1)) { diff --git a/ext/phalcon/http/response/headers.zep.c b/ext/phalcon/http/response/headers.zep.c index 02d6d4f3e6..d6a184ebc6 100644 --- a/ext/phalcon/http/response/headers.zep.c +++ b/ext/phalcon/http/response/headers.zep.c @@ -217,7 +217,7 @@ PHP_METHOD(Phalcon_Http_Response_Headers, send) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_FUNCTION(&_0, "headers_sent", NULL, 362); + ZEPHIR_CALL_FUNCTION(&_0, "headers_sent", NULL, 356); zephir_check_call_status(); _1 = ZEPHIR_IS_TRUE_IDENTICAL(&_0); if (!(_1)) { @@ -243,7 +243,7 @@ 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, 363, &_8$$5, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 357, &_8$$5, &__$true); zephir_check_call_status(); } else { _10$$6 = zephir_memnstr_str(&header, SL(":"), "phalcon/Http/Response/Headers.zep", 99); @@ -255,12 +255,12 @@ PHP_METHOD(Phalcon_Http_Response_Headers, send) _10$$6 = ZEPHIR_IS_STRING(&_13$$6, "HTTP/"); } if (_10$$6) { - ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 363, &header, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 357, &header, &__$true); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&_14$$8); ZEPHIR_CONCAT_VS(&_14$$8, &header, ": "); - ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 363, &_14$$8, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 357, &_14$$8, &__$true); zephir_check_call_status(); } } @@ -281,7 +281,7 @@ 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, 363, &_15$$10, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 357, &_15$$10, &__$true); zephir_check_call_status(); } else { _16$$11 = zephir_memnstr_str(&header, SL(":"), "phalcon/Http/Response/Headers.zep", 99); @@ -293,12 +293,12 @@ PHP_METHOD(Phalcon_Http_Response_Headers, send) _16$$11 = ZEPHIR_IS_STRING(&_19$$11, "HTTP/"); } if (_16$$11) { - ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 363, &header, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 357, &header, &__$true); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&_20$$13); ZEPHIR_CONCAT_VS(&_20$$13, &header, ": "); - ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 363, &_20$$13, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 357, &_20$$13, &__$true); zephir_check_call_status(); } } diff --git a/ext/phalcon/image/adapter/abstractadapter.zep.c b/ext/phalcon/image/adapter/abstractadapter.zep.c index d77288b7a1..b3265ad2dc 100644 --- a/ext/phalcon/image/adapter/abstractadapter.zep.c +++ b/ext/phalcon/image/adapter/abstractadapter.zep.c @@ -476,7 +476,7 @@ PHP_METHOD(Phalcon_Image_Adapter_AbstractAdapter, mask) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(mask, phalcon_image_adapter_adapterinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(mask, zephir_get_internal_ce(SL("phalcon\\image\\adapter\\adapterinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1189,7 +1189,7 @@ PHP_METHOD(Phalcon_Image_Adapter_AbstractAdapter, watermark) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 4) - Z_PARAM_OBJECT_OF_CLASS(watermark, phalcon_image_adapter_adapterinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(watermark, zephir_get_internal_ce(SL("phalcon\\image\\adapter\\adapterinterface"))) Z_PARAM_OPTIONAL Z_PARAM_LONG(offsetX) Z_PARAM_LONG(offsetY) diff --git a/ext/phalcon/image/adapter/gd.zep.c b/ext/phalcon/image/adapter/gd.zep.c index c2cab0736a..8127cd1896 100644 --- a/ext/phalcon/image/adapter/gd.zep.c +++ b/ext/phalcon/image/adapter/gd.zep.c @@ -119,7 +119,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "check", NULL, 364); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "check", NULL, 358); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("file"), &file); ZEPHIR_INIT_ZVAL_NREF(_0); @@ -132,7 +132,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("realpath"), &_2$$3); zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&imageInfo, "getimagesize", NULL, 315, &_3$$3); + ZEPHIR_CALL_FUNCTION(&imageInfo, "getimagesize", NULL, 309, &_3$$3); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&imageInfo)) { zephir_array_fetch_long(&_4$$4, &imageInfo, 0, PH_NOISY | PH_READONLY, "phalcon/Image/Adapter/Gd.zep", 42); @@ -149,42 +149,42 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) do { if (ZEPHIR_IS_LONG(&_8$$3, 1)) { zephir_read_property(&_9$$5, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_10$$5, "imagecreatefromgif", NULL, 365, &_9$$5); + ZEPHIR_CALL_FUNCTION(&_10$$5, "imagecreatefromgif", NULL, 359, &_9$$5); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_10$$5); break; } if (ZEPHIR_IS_LONG(&_8$$3, 2) || ZEPHIR_IS_LONG(&_8$$3, 9)) { zephir_read_property(&_11$$6, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_12$$6, "imagecreatefromjpeg", NULL, 366, &_11$$6); + ZEPHIR_CALL_FUNCTION(&_12$$6, "imagecreatefromjpeg", NULL, 360, &_11$$6); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_12$$6); break; } if (ZEPHIR_IS_LONG(&_8$$3, 3)) { zephir_read_property(&_13$$7, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_14$$7, "imagecreatefrompng", NULL, 367, &_13$$7); + ZEPHIR_CALL_FUNCTION(&_14$$7, "imagecreatefrompng", NULL, 361, &_13$$7); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_14$$7); break; } if (ZEPHIR_IS_LONG(&_8$$3, 18)) { zephir_read_property(&_15$$8, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_16$$8, "imagecreatefromwebp", NULL, 368, &_15$$8); + ZEPHIR_CALL_FUNCTION(&_16$$8, "imagecreatefromwebp", NULL, 362, &_15$$8); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_16$$8); break; } if (ZEPHIR_IS_LONG(&_8$$3, 15)) { zephir_read_property(&_17$$9, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_18$$9, "imagecreatefromwbmp", NULL, 369, &_17$$9); + ZEPHIR_CALL_FUNCTION(&_18$$9, "imagecreatefromwbmp", NULL, 363, &_17$$9); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_18$$9); break; } if (ZEPHIR_IS_LONG(&_8$$3, 16)) { zephir_read_property(&_19$$10, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_20$$10, "imagecreatefromxbm", NULL, 370, &_19$$10); + ZEPHIR_CALL_FUNCTION(&_20$$10, "imagecreatefromxbm", NULL, 364, &_19$$10); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_20$$10); break; @@ -207,7 +207,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) } while(0); zephir_read_property(&_25$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 371, &_25$$3, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 365, &_25$$3, &__$true); zephir_check_call_status(); } else { _26$$13 = 0 == width; @@ -228,14 +228,14 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) } ZVAL_LONG(&_30$$13, width); ZVAL_LONG(&_31$$13, height); - ZEPHIR_CALL_FUNCTION(&_32$$13, "imagecreatetruecolor", NULL, 372, &_30$$13, &_31$$13); + ZEPHIR_CALL_FUNCTION(&_32$$13, "imagecreatetruecolor", NULL, 366, &_30$$13, &_31$$13); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_32$$13); zephir_read_property(&_30$$13, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 373, &_30$$13, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 367, &_30$$13, &__$true); zephir_check_call_status(); zephir_read_property(&_31$$13, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 371, &_31$$13, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 365, &_31$$13, &__$true); zephir_check_call_status(); zephir_read_property(&_33$$13, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); zephir_update_property_zval(this_ptr, ZEND_STRL("realpath"), &_33$$13); @@ -276,7 +276,7 @@ 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_NULL) { - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 374, &image); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 368, &image); zephir_check_call_status(); } zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &__$null); @@ -315,13 +315,13 @@ 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, 114, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "defined", NULL, 108, &_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, 375); + ZEPHIR_CALL_FUNCTION(&info, "gd_info", NULL, 369); zephir_check_call_status(); ZEPHIR_INIT_VAR(&matches); ZVAL_NULL(&matches); @@ -391,7 +391,7 @@ 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, 285, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 279, &_1); zephir_check_call_status(); zephir_round(&_0, &_2, NULL, NULL); opacity = zephir_get_intval(&_0); @@ -405,9 +405,9 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processBackground) ZVAL_LONG(&_5, green); ZVAL_LONG(&_6, blue); ZVAL_LONG(&_7, opacity); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 376, &background, &_4, &_5, &_6, &_7); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 370, &background, &_4, &_5, &_6, &_7); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 373, &background, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 367, &background, &__$true); zephir_check_call_status(); zephir_read_property(&_4, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_5, this_ptr, ZEND_STRL("height"), PH_NOISY_CC | PH_READONLY); @@ -415,10 +415,10 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processBackground) ZVAL_LONG(&_7, 0); ZVAL_LONG(&_8, 0); ZVAL_LONG(&_9, 0); - ZEPHIR_CALL_FUNCTION(©, "imagecopy", NULL, 377, &background, &image, &_6, &_7, &_8, &_9, &_4, &_5); + ZEPHIR_CALL_FUNCTION(©, "imagecopy", NULL, 371, &background, &image, &_6, &_7, &_8, &_9, &_4, &_5); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(©)) { - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 374, &image); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 368, &image); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &background); } @@ -460,7 +460,7 @@ 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, 378, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_2, 372, &_0$$3, &_1$$3); zephir_check_call_status(); counter++; } @@ -502,11 +502,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processCreate) ZVAL_LONG(&_0, width); ZVAL_LONG(&_1, height); - ZEPHIR_CALL_FUNCTION(&image, "imagecreatetruecolor", NULL, 372, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&image, "imagecreatetruecolor", NULL, 366, &_0, &_1); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 373, &image, &__$false); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 367, &image, &__$false); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 371, &image, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 365, &image, &__$true); zephir_check_call_status(); RETURN_CCTOR(&image); } @@ -568,16 +568,16 @@ 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, 379, &_1, &rect); + ZEPHIR_CALL_FUNCTION(&image, "imagecrop", NULL, 373, &_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, 374, &_2); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 368, &_2); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &image); - ZEPHIR_CALL_FUNCTION(&_3, "imagesx", NULL, 380, &image); + ZEPHIR_CALL_FUNCTION(&_3, "imagesx", NULL, 374, &image); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("width"), &_3); - ZEPHIR_CALL_FUNCTION(&_4, "imagesy", NULL, 381, &image); + ZEPHIR_CALL_FUNCTION(&_4, "imagesy", NULL, 375, &image); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("height"), &_4); ZEPHIR_MM_RESTORE(); @@ -615,12 +615,12 @@ 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, 382, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imageflip", NULL, 376, &_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, 382, &_2$$4, &_3$$4); + ZEPHIR_CALL_FUNCTION(NULL, "imageflip", NULL, 376, &_2$$4, &_3$$4); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -679,7 +679,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processMask) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(mask, phalcon_image_adapter_adapterinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(mask, zephir_get_internal_ce(SL("phalcon\\image\\adapter\\adapterinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -690,32 +690,32 @@ 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, 383, &_0); + ZEPHIR_CALL_FUNCTION(&maskImage, "imagecreatefromstring", NULL, 377, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 380, &maskImage); + ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 374, &maskImage); zephir_check_call_status(); maskWidth = zephir_get_intval(&_1); - ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 381, &maskImage); + ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 375, &maskImage); zephir_check_call_status(); maskHeight = zephir_get_intval(&_2); alpha = 127; - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 371, &maskImage, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 365, &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, 371, &newImage, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 365, &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, 376, &newImage, &_5, &_6, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 370, &newImage, &_5, &_6, &_7, &_8); zephir_check_call_status(); ZVAL_LONG(&_5, 0); ZVAL_LONG(&_6, 0); - ZEPHIR_CALL_FUNCTION(NULL, "imagefill", NULL, 384, &newImage, &_5, &_6, &color); + ZEPHIR_CALL_FUNCTION(NULL, "imagefill", NULL, 378, &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_IDENTICAL(&_5, maskWidth); @@ -726,7 +726,7 @@ 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, 372, &_10$$3, &_11$$3); + ZEPHIR_CALL_FUNCTION(&tempImage, "imagecreatetruecolor", NULL, 366, &_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); @@ -736,9 +736,9 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processMask) ZVAL_LONG(&_17$$3, 0); ZVAL_LONG(&_18$$3, maskWidth); ZVAL_LONG(&_19$$3, maskHeight); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopyresampled", NULL, 385, &tempImage, &maskImage, &_14$$3, &_15$$3, &_16$$3, &_17$$3, &_12$$3, &_13$$3, &_18$$3, &_19$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopyresampled", NULL, 379, &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, 374, &maskImage); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 368, &maskImage); zephir_check_call_status(); ZEPHIR_CPY_WRT(&maskImage, &tempImage); } @@ -756,9 +756,9 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processMask) } ZVAL_LONG(&_21$$5, x); ZVAL_LONG(&_22$$5, y); - ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_23, 386, &maskImage, &_21$$5, &_22$$5); + ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_23, 380, &maskImage, &_21$$5, &_22$$5); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_24, 387, &maskImage, &index); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_24, 381, &maskImage, &index); zephir_check_call_status(); if (1 == 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", 348); @@ -768,10 +768,10 @@ 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, 386, &_21$$5, &_22$$5, &_27$$5); + ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_23, 380, &_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, 387, &_22$$5, &index); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_24, 381, &_22$$5, &index); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&red); zephir_array_fetch_string(&red, &color, SL("red"), PH_NOISY, "phalcon/Image/Adapter/Gd.zep", 353); @@ -780,20 +780,20 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processMask) ZEPHIR_OBS_NVAR(&blue); zephir_array_fetch_string(&blue, &color, SL("blue"), PH_NOISY, "phalcon/Image/Adapter/Gd.zep", 355); ZVAL_LONG(&_27$$5, alpha); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 376, &newImage, &red, &green, &blue, &_27$$5); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 370, &newImage, &red, &green, &blue, &_27$$5); zephir_check_call_status(); ZVAL_LONG(&_27$$5, x); ZVAL_LONG(&_28$$5, y); - ZEPHIR_CALL_FUNCTION(NULL, "imagesetpixel", &_29, 388, &newImage, &_27$$5, &_28$$5, &color); + ZEPHIR_CALL_FUNCTION(NULL, "imagesetpixel", &_29, 382, &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, 374, &_8); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 368, &_8); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 374, &maskImage); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 368, &maskImage); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &newImage); ZEPHIR_MM_RESTORE(); @@ -863,7 +863,7 @@ 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, 386, &_5$$4, &_6$$4, &_7$$4); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorat", &_8, 380, &_5$$4, &_6$$4, &_7$$4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&x2); ZVAL_LONG(&x2, (x + amount)); @@ -872,7 +872,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processPixelate) zephir_read_property(&_6$$4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_7$$4, x); ZVAL_LONG(&_9$$4, y); - ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", &_10, 389, &_6$$4, &_7$$4, &_9$$4, &x2, &y2, &color); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", &_10, 383, &_6$$4, &_7$$4, &_9$$4, &x2, &y2, &color); zephir_check_call_status(); y += amount; } @@ -946,7 +946,7 @@ 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, 285, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 279, &_1); zephir_check_call_status(); zephir_round(&_0, &_2, NULL, NULL); opacity = zephir_get_intval(&_0); @@ -967,7 +967,7 @@ 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, 377, &reflection, &_4, &_7, &_8, &_9, &_10, &_5, &_6); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", NULL, 371, &reflection, &_4, &_7, &_8, &_9, &_10, &_5, &_6); zephir_check_call_status(); offset = 0; while (1) { @@ -1000,14 +1000,14 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processReflection) ZVAL_LONG(&_22$$5, 0); ZVAL_LONG(&_23$$5, sourceY); ZVAL_LONG(&_24$$5, 1); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", NULL, 377, &line, &_18$$5, &_20$$5, &_21$$5, &_22$$5, &_23$$5, &_19$$5, &_24$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", NULL, 371, &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, destinationOpacity); - ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_25, 378, &line, &_20$$5, &_21$$5, &_22$$5, &_23$$5, &_24$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_25, 372, &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); @@ -1015,18 +1015,18 @@ 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, 377, &reflection, &line, &_21$$5, &_22$$5, &_23$$5, &_24$$5, &_20$$5, &_26$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", NULL, 371, &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, 374, &_7); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 368, &_7); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &reflection); - ZEPHIR_CALL_FUNCTION(&_27, "imagesx", NULL, 380, &reflection); + ZEPHIR_CALL_FUNCTION(&_27, "imagesx", NULL, 374, &reflection); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("width"), &_27); - ZEPHIR_CALL_FUNCTION(&_28, "imagesy", NULL, 381, &reflection); + ZEPHIR_CALL_FUNCTION(&_28, "imagesy", NULL, 375, &reflection); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("height"), &_28); ZEPHIR_MM_RESTORE(); @@ -1077,43 +1077,43 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processRender) ZEPHIR_INIT_VAR(&_0); zephir_fast_strtolower(&_0, &extension); zephir_get_strval(&extension, &_0); - ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 390); + ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 384); zephir_check_call_status(); do { if (ZEPHIR_IS_STRING(&extension, "gif")) { zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 391, &_1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 385, &_1$$3); zephir_check_call_status(); break; } if (ZEPHIR_IS_STRING(&extension, "jpg") || ZEPHIR_IS_STRING(&extension, "jpeg")) { zephir_read_property(&_2$$4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_3$$4, quality); - ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 392, &_2$$4, &__$null, &_3$$4); + ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 386, &_2$$4, &__$null, &_3$$4); zephir_check_call_status(); break; } if (ZEPHIR_IS_STRING(&extension, "png")) { zephir_read_property(&_4$$5, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 393, &_4$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 387, &_4$$5); zephir_check_call_status(); break; } if (ZEPHIR_IS_STRING(&extension, "wbmp")) { zephir_read_property(&_5$$6, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 394, &_5$$6); + ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 388, &_5$$6); zephir_check_call_status(); break; } if (ZEPHIR_IS_STRING(&extension, "webp")) { zephir_read_property(&_6$$7, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagewebp", NULL, 395, &_6$$7); + ZEPHIR_CALL_FUNCTION(NULL, "imagewebp", NULL, 389, &_6$$7); zephir_check_call_status(); break; } if (ZEPHIR_IS_STRING(&extension, "xbm")) { zephir_read_property(&_7$$8, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 396, &_7$$8, &__$null); + ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 390, &_7$$8, &__$null); zephir_check_call_status(); break; } @@ -1128,7 +1128,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processRender) return; } while(0); - ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", NULL, 397); + ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", NULL, 391); zephir_check_call_status(); RETURN_MM(); } @@ -1170,16 +1170,16 @@ 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, 398, &_0, &_1, &_2); + ZEPHIR_CALL_FUNCTION(&image, "imagescale", NULL, 392, &_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, 374, &_1); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 368, &_1); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &image); - ZEPHIR_CALL_FUNCTION(&_3, "imagesx", NULL, 380, &image); + ZEPHIR_CALL_FUNCTION(&_3, "imagesx", NULL, 374, &image); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("width"), &_3); - ZEPHIR_CALL_FUNCTION(&_4, "imagesy", NULL, 381, &image); + ZEPHIR_CALL_FUNCTION(&_4, "imagesy", NULL, 375, &image); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("height"), &_4); ZEPHIR_MM_RESTORE(); @@ -1230,17 +1230,17 @@ 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, 376, &_0, &_1, &_2, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&transparent, "imagecolorallocatealpha", NULL, 370, &_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)); - ZEPHIR_CALL_FUNCTION(&image, "imagerotate", NULL, 399, &_1, &_2, &transparent); + ZEPHIR_CALL_FUNCTION(&image, "imagerotate", NULL, 393, &_1, &_2, &transparent); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 371, &image, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 365, &image, &__$true); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&width, "imagesx", NULL, 380, &image); + ZEPHIR_CALL_FUNCTION(&width, "imagesx", NULL, 374, &image); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&height, "imagesy", NULL, 381, &image); + ZEPHIR_CALL_FUNCTION(&height, "imagesy", NULL, 375, &image); zephir_check_call_status(); zephir_read_property(&_2, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_3, 0); @@ -1248,11 +1248,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processRotate) ZVAL_LONG(&_5, 0); ZVAL_LONG(&_6, 0); ZVAL_LONG(&_7, 100); - ZEPHIR_CALL_FUNCTION(©, "imagecopymerge", NULL, 400, &_2, &image, &_3, &_4, &_5, &_6, &width, &height, &_7); + ZEPHIR_CALL_FUNCTION(©, "imagecopymerge", NULL, 394, &_2, &image, &_3, &_4, &_5, &_6, &width, &height, &_7); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(©)) { zephir_read_property(&_8$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 374, &_8$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 368, &_8$$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); @@ -1315,7 +1315,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processSave) zephir_check_call_status(); if (1 == ZEPHIR_IS_EMPTY(&extension)) { zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("type"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&extension, "image_type_to_extension", NULL, 401, &_1$$3, &__$false); + ZEPHIR_CALL_FUNCTION(&extension, "image_type_to_extension", NULL, 395, &_1$$3, &__$false); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_2); @@ -1327,7 +1327,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processSave) ZVAL_LONG(&_3$$4, 1); zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_3$$4); zephir_read_property(&_3$$4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 391, &_3$$4, &file); + ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 385, &_3$$4, &file); zephir_check_call_status(); break; } @@ -1343,11 +1343,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processSave) quality = zephir_get_numberval(&_5$$6); zephir_read_property(&_6$$6, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_7$$6, quality); - ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 392, &_6$$6, &file, &_7$$6); + ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 386, &_6$$6, &file, &_7$$6); zephir_check_call_status(); } else { zephir_read_property(&_8$$7, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 392, &_8$$7, &file); + ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 386, &_8$$7, &file); zephir_check_call_status(); } break; @@ -1357,7 +1357,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processSave) ZVAL_LONG(&_9$$8, 3); zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_9$$8); zephir_read_property(&_9$$8, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 393, &_9$$8, &file); + ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 387, &_9$$8, &file); zephir_check_call_status(); break; } @@ -1366,7 +1366,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processSave) ZVAL_LONG(&_10$$9, 15); zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_10$$9); zephir_read_property(&_10$$9, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 394, &_10$$9, &file); + ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 388, &_10$$9, &file); zephir_check_call_status(); break; } @@ -1375,7 +1375,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processSave) ZVAL_LONG(&_11$$10, 18); zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_11$$10); zephir_read_property(&_11$$10, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagewebp", NULL, 395, &_11$$10, &file); + ZEPHIR_CALL_FUNCTION(NULL, "imagewebp", NULL, 389, &_11$$10, &file); zephir_check_call_status(); break; } @@ -1384,7 +1384,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processSave) ZVAL_LONG(&_12$$11, 16); zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_12$$11); zephir_read_property(&_12$$11, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 396, &_12$$11, &file); + ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 390, &_12$$11, &file); zephir_check_call_status(); break; } @@ -1400,7 +1400,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processSave) } while(0); zephir_read_property(&_0, this_ptr, ZEND_STRL("type"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_15, "image_type_to_mime_type", NULL, 402, &_0); + ZEPHIR_CALL_FUNCTION(&_15, "image_type_to_mime_type", NULL, 396, &_0); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("mime"), &_15); RETURN_MM_BOOL(1); @@ -1448,7 +1448,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processSharpen) ZEPHIR_INIT_VAR(&_0); ZVAL_LONG(&_1, (-18 + ((amount * 0.08)))); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 285, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 279, &_1); zephir_check_call_status(); ZVAL_LONG(&_1, 2); zephir_round(&_0, &_2, &_1, NULL); @@ -1494,15 +1494,15 @@ 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(&result, "imageconvolution", NULL, 403, &_5, &matrix, &_6, &_7); + ZEPHIR_CALL_FUNCTION(&result, "imageconvolution", NULL, 397, &_5, &matrix, &_6, &_7); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&result)) { zephir_read_property(&_8$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_9$$3, "imagesx", NULL, 380, &_8$$3); + ZEPHIR_CALL_FUNCTION(&_9$$3, "imagesx", NULL, 374, &_8$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("width"), &_9$$3); zephir_read_property(&_10$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_11$$3, "imagesy", NULL, 381, &_10$$3); + ZEPHIR_CALL_FUNCTION(&_11$$3, "imagesy", NULL, 375, &_10$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("height"), &_11$$3); } @@ -1617,7 +1617,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processText) ZVAL_LONG(offsetY, _1); ZEPHIR_INIT_VAR(&_2); ZVAL_DOUBLE(&_3, ((zephir_safe_div_long_long((opacity * 127), 100)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_4, "abs", NULL, 285, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "abs", NULL, 279, &_3); zephir_check_call_status(); zephir_round(&_2, &_4, NULL, NULL); opacity = zephir_get_intval(&_2); @@ -1625,7 +1625,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processText) if (1 != ZEPHIR_IS_EMPTY(&fontFile)) { ZVAL_LONG(&_5$$3, size); ZVAL_LONG(&_6$$3, 0); - ZEPHIR_CALL_FUNCTION(&space, "imagettfbbox", NULL, 404, &_5$$3, &_6$$3, &fontFile, &text); + ZEPHIR_CALL_FUNCTION(&space, "imagettfbbox", NULL, 398, &_5$$3, &_6$$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", 758); @@ -1646,11 +1646,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processText) topRightY = zephir_get_intval(&_10$$5); } ZVAL_LONG(&_5$$3, (topRightX - bottomLeftX)); - ZEPHIR_CALL_FUNCTION(&_11$$3, "abs", NULL, 285, &_5$$3); + ZEPHIR_CALL_FUNCTION(&_11$$3, "abs", NULL, 279, &_5$$3); zephir_check_call_status(); ZVAL_LONG(&width, (zephir_get_numberval(&_11$$3) + 10)); ZVAL_LONG(&_5$$3, (topRightY - bottomLeftY)); - ZEPHIR_CALL_FUNCTION(&_12$$3, "abs", NULL, 285, &_5$$3); + ZEPHIR_CALL_FUNCTION(&_12$$3, "abs", NULL, 279, &_5$$3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&height); ZVAL_LONG(&height, (zephir_get_numberval(&_12$$3) + 10)); @@ -1675,21 +1675,21 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processText) ZVAL_LONG(&_19$$3, green); ZVAL_LONG(&_20$$3, blue); ZVAL_LONG(&_21$$3, opacity); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 376, &_5$$3, &_6$$3, &_19$$3, &_20$$3, &_21$$3); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 370, &_5$$3, &_6$$3, &_19$$3, &_20$$3, &_21$$3); zephir_check_call_status(); angle = 0; zephir_read_property(&_6$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_19$$3, size); ZVAL_LONG(&_20$$3, angle); - ZEPHIR_CALL_FUNCTION(NULL, "imagettftext", NULL, 405, &_6$$3, &_19$$3, &_20$$3, offsetX, offsetY, &color, &fontFile, &text); + ZEPHIR_CALL_FUNCTION(NULL, "imagettftext", NULL, 399, &_6$$3, &_19$$3, &_20$$3, offsetX, offsetY, &color, &fontFile, &text); zephir_check_call_status(); } else { ZVAL_LONG(&_22$$8, size); - ZEPHIR_CALL_FUNCTION(&_23$$8, "imagefontwidth", NULL, 406, &_22$$8); + ZEPHIR_CALL_FUNCTION(&_23$$8, "imagefontwidth", NULL, 400, &_22$$8); zephir_check_call_status(); ZVAL_LONG(&width, (zephir_get_numberval(&_23$$8) * zephir_fast_strlen_ev(&text))); ZVAL_LONG(&_22$$8, size); - ZEPHIR_CALL_FUNCTION(&height, "imagefontheight", NULL, 407, &_22$$8); + ZEPHIR_CALL_FUNCTION(&height, "imagefontheight", NULL, 401, &_22$$8); zephir_check_call_status(); if (ZEPHIR_LT_LONG(offsetX, 0)) { zephir_read_property(&_24$$9, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY); @@ -1712,11 +1712,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processText) ZVAL_LONG(&_31$$8, green); ZVAL_LONG(&_32$$8, blue); ZVAL_LONG(&_33$$8, opacity); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 376, &_22$$8, &_30$$8, &_31$$8, &_32$$8, &_33$$8); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 370, &_22$$8, &_30$$8, &_31$$8, &_32$$8, &_33$$8); zephir_check_call_status(); zephir_read_property(&_30$$8, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_31$$8, size); - ZEPHIR_CALL_FUNCTION(NULL, "imagestring", NULL, 408, &_30$$8, &_31$$8, offsetX, offsetY, &text, &color); + ZEPHIR_CALL_FUNCTION(NULL, "imagestring", NULL, 402, &_30$$8, &_31$$8, offsetX, offsetY, &text, &color); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -1754,7 +1754,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processWatermark) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(4, 4) - Z_PARAM_OBJECT_OF_CLASS(watermark, phalcon_image_adapter_adapterinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(watermark, zephir_get_internal_ce(SL("phalcon\\image\\adapter\\adapterinterface"))) Z_PARAM_LONG(offsetX) Z_PARAM_LONG(offsetY) Z_PARAM_LONG(opacity) @@ -1771,20 +1771,20 @@ 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, 383, &_0); + ZEPHIR_CALL_FUNCTION(&overlay, "imagecreatefromstring", NULL, 377, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 371, &overlay, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 365, &overlay, &__$true); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 380, &overlay); + ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 374, &overlay); zephir_check_call_status(); width = zephir_get_intval(&_1); - ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 381, &overlay); + ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 375, &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, 285, &_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); @@ -1792,20 +1792,20 @@ 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, 376, &overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 370, &overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3); zephir_check_call_status(); ZVAL_LONG(&_4$$3, 3); - ZEPHIR_CALL_FUNCTION(NULL, "imagelayereffect", NULL, 409, &overlay, &_4$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagelayereffect", NULL, 403, &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, 389, &overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3, &color); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", NULL, 383, &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, 373, &_9, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 367, &_9, &__$true); zephir_check_call_status(); zephir_read_property(&_10, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_11, offsetX); @@ -1814,10 +1814,10 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processWatermark) ZVAL_LONG(&_14, 0); ZVAL_LONG(&_15, width); ZVAL_LONG(&_16, height); - ZEPHIR_CALL_FUNCTION(©, "imagecopy", NULL, 377, &_10, &overlay, &_11, &_12, &_13, &_14, &_15, &_16); + ZEPHIR_CALL_FUNCTION(©, "imagecopy", NULL, 371, &_10, &overlay, &_11, &_12, &_13, &_14, &_15, &_16); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(©)) { - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 374, &overlay); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 368, &overlay); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -1852,7 +1852,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, check) ZVAL_STRING(&_0, "2.0.1"); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, ">="); - ZEPHIR_CALL_FUNCTION(&_2, "version_compare", NULL, 130, &version, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "version_compare", NULL, 124, &version, &_0, &_1); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(&_2)) { ZEPHIR_INIT_VAR(&_3$$3); diff --git a/ext/phalcon/image/adapter/imagick.zep.c b/ext/phalcon/image/adapter/imagick.zep.c index 35751b1225..2e174edbdd 100644 --- a/ext/phalcon/image/adapter/imagick.zep.c +++ b/ext/phalcon/image/adapter/imagick.zep.c @@ -143,13 +143,16 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, __construct) } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "check", NULL, 410); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "check", NULL, 404); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("file"), &file); ZEPHIR_INIT_VAR(&_0); object_init_ex(&_0, zephir_get_internal_ce(SL("imagick"))); - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(&_0)) { + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 0); + zephir_check_call_status(); + } + zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_0); zephir_read_property(&_1, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); if (1 == (zephir_file_exists(&_1) == SUCCESS)) { @@ -180,7 +183,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, __construct) zephir_read_property(&_12$$5, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_13$$5); ZVAL_STRING(&_13$$5, "Imagick::ALPHACHANNEL_SET"); - ZEPHIR_CALL_FUNCTION(&_14$$5, "constant", NULL, 115, &_13$$5); + ZEPHIR_CALL_FUNCTION(&_14$$5, "constant", NULL, 109, &_13$$5); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_12$$5, "setimagealphachannel", NULL, 0, &_14$$5); zephir_check_call_status(); @@ -224,10 +227,13 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, __construct) zephir_read_property(&_26$$7, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_27$$7); object_init_ex(&_27$$7, zephir_get_internal_ce(SL("imagickpixel"))); - ZEPHIR_INIT_VAR(&_28$$7); - ZVAL_STRING(&_28$$7, "transparent"); - ZEPHIR_CALL_METHOD(NULL, &_27$$7, "__construct", NULL, 0, &_28$$7); - zephir_check_call_status(); + if (zephir_has_constructor(&_27$$7)) { + ZEPHIR_INIT_VAR(&_28$$7); + ZVAL_STRING(&_28$$7, "transparent"); + ZEPHIR_CALL_METHOD(NULL, &_27$$7, "__construct", NULL, 0, &_28$$7); + zephir_check_call_status(); + } + ZVAL_LONG(&_29$$7, width); ZVAL_LONG(&_30$$7, height); ZEPHIR_CALL_METHOD(NULL, &_26$$7, "newimage", NULL, 0, &_29$$7, &_30$$7, &_27$$7); @@ -516,22 +522,31 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processBackground) ZVAL_LONG(&_1, red); ZVAL_LONG(&_2, green); ZVAL_LONG(&_3, blue); - ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 113, &_0, &_1, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 107, &_0, &_1, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&pixel1); object_init_ex(&pixel1, zephir_get_internal_ce(SL("imagickpixel"))); - ZEPHIR_CALL_METHOD(NULL, &pixel1, "__construct", NULL, 0, &color); - zephir_check_call_status(); + if (zephir_has_constructor(&pixel1)) { + ZEPHIR_CALL_METHOD(NULL, &pixel1, "__construct", NULL, 0, &color); + zephir_check_call_status(); + } + ZEPHIR_INIT_VAR(&pixel2); object_init_ex(&pixel2, zephir_get_internal_ce(SL("imagickpixel"))); - ZEPHIR_INIT_NVAR(&_0); - ZVAL_STRING(&_0, "transparent"); - ZEPHIR_CALL_METHOD(NULL, &pixel2, "__construct", NULL, 0, &_0); - zephir_check_call_status(); + if (zephir_has_constructor(&pixel2)) { + ZEPHIR_INIT_NVAR(&_0); + ZVAL_STRING(&_0, "transparent"); + ZEPHIR_CALL_METHOD(NULL, &pixel2, "__construct", NULL, 0, &_0); + zephir_check_call_status(); + } + ZEPHIR_INIT_VAR(&background); object_init_ex(&background, zephir_get_internal_ce(SL("imagick"))); - ZEPHIR_CALL_METHOD(NULL, &background, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(&background)) { + ZEPHIR_CALL_METHOD(NULL, &background, "__construct", NULL, 0); + zephir_check_call_status(); + } + zephir_read_property(&_1, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_2, 0); ZEPHIR_CALL_METHOD(NULL, &_1, "setiteratorindex", NULL, 0, &_2); @@ -549,7 +564,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processBackground) if (!ZEPHIR_IS_TRUE_IDENTICAL(&_7$$3)) { ZEPHIR_INIT_NVAR(&_9$$4); ZVAL_STRING(&_9$$4, "Imagick::ALPHACHANNEL_SET"); - ZEPHIR_CALL_FUNCTION(&_10$$4, "constant", &_11, 115, &_9$$4); + ZEPHIR_CALL_FUNCTION(&_10$$4, "constant", &_11, 109, &_9$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &background, "setimagealphachannel", &_12, 0, &_10$$4); zephir_check_call_status(); @@ -558,11 +573,11 @@ 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, 115, &_14$$3); + ZEPHIR_CALL_FUNCTION(&_15$$3, "constant", &_11, 109, &_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, 115, &_14$$3); + ZEPHIR_CALL_FUNCTION(&_16$$3, "constant", &_11, 109, &_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); @@ -575,7 +590,7 @@ 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, 115, &_14$$3); + ZEPHIR_CALL_FUNCTION(&_22$$3, "constant", &_11, 109, &_14$$3); zephir_check_call_status(); ZVAL_LONG(&_23$$3, 0); ZVAL_LONG(&_24$$3, 0); @@ -837,7 +852,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processMask) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(image, phalcon_image_adapter_adapterinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(image, zephir_get_internal_ce(SL("phalcon\\image\\adapter\\adapterinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -848,8 +863,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processMask) ZEPHIR_INIT_VAR(&mask); object_init_ex(&mask, zephir_get_internal_ce(SL("imagick"))); - ZEPHIR_CALL_METHOD(NULL, &mask, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(&mask)) { + ZEPHIR_CALL_METHOD(NULL, &mask, "__construct", NULL, 0); + zephir_check_call_status(); + } + ZEPHIR_CALL_METHOD(&_0, image, "render", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &mask, "readimageblob", NULL, 0, &_0); @@ -869,7 +887,7 @@ 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, 115, &_5$$3); + ZEPHIR_CALL_FUNCTION(&_6$$3, "constant", &_7, 109, &_5$$3); zephir_check_call_status(); ZVAL_LONG(&_8$$3, 0); ZVAL_LONG(&_9$$3, 0); @@ -1107,8 +1125,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) } ZEPHIR_INIT_VAR(&fade); object_init_ex(&fade, zephir_get_internal_ce(SL("imagick"))); - ZEPHIR_CALL_METHOD(NULL, &fade, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(&fade)) { + ZEPHIR_CALL_METHOD(NULL, &fade, "__construct", NULL, 0); + zephir_check_call_status(); + } + ZEPHIR_CALL_METHOD(&_16, &reflection, "getimagewidth", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_17, &reflection, "getimageheight", NULL, 0); @@ -1125,7 +1146,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) } ZEPHIR_INIT_NVAR(&_18$$7); ZVAL_STRING(&_18$$7, "Imagick::COMPOSITE_DSTOUT"); - ZEPHIR_CALL_FUNCTION(&_19$$7, "constant", &_20, 115, &_18$$7); + ZEPHIR_CALL_FUNCTION(&_19$$7, "constant", &_20, 109, &_18$$7); zephir_check_call_status(); ZVAL_LONG(&_21$$7, 0); ZVAL_LONG(&_22$$7, 0); @@ -1137,11 +1158,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) } ZEPHIR_INIT_NVAR(&_18$$7); ZVAL_STRING(&_18$$7, "Imagick::EVALUATE_MULTIPLY"); - ZEPHIR_CALL_FUNCTION(&_24$$7, "constant", &_20, 115, &_18$$7); + ZEPHIR_CALL_FUNCTION(&_24$$7, "constant", &_20, 109, &_18$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_18$$7); ZVAL_STRING(&_18$$7, "Imagick::CHANNEL_ALPHA"); - ZEPHIR_CALL_FUNCTION(&_25$$7, "constant", &_20, 115, &_18$$7); + ZEPHIR_CALL_FUNCTION(&_25$$7, "constant", &_20, 109, &_18$$7); zephir_check_call_status(); ZVAL_LONG(&_21$$7, opacity); ZEPHIR_CALL_METHOD(NULL, &reflection, "evaluateimage", &_26, 0, &_24$$7, &_21$$7, &_25$$7); @@ -1157,12 +1178,18 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) zephir_check_call_status(); ZEPHIR_INIT_VAR(&image); object_init_ex(&image, zephir_get_internal_ce(SL("imagick"))); - ZEPHIR_CALL_METHOD(NULL, &image, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(&image)) { + ZEPHIR_CALL_METHOD(NULL, &image, "__construct", NULL, 0); + zephir_check_call_status(); + } + ZEPHIR_INIT_VAR(&pixel); object_init_ex(&pixel, zephir_get_internal_ce(SL("imagickpixel"))); - ZEPHIR_CALL_METHOD(NULL, &pixel, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(&pixel)) { + ZEPHIR_CALL_METHOD(NULL, &pixel, "__construct", NULL, 0); + zephir_check_call_status(); + } + zephir_read_property(&_4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&_28, &_4, "getimageheight", NULL, 0); zephir_check_call_status(); @@ -1181,7 +1208,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_34$$10); ZVAL_STRING(&_34$$10, "Imagick::ALPHACHANNEL_SET"); - ZEPHIR_CALL_FUNCTION(&_35$$10, "constant", &_20, 115, &_34$$10); + ZEPHIR_CALL_FUNCTION(&_35$$10, "constant", &_20, 109, &_34$$10); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &image, "setimagealphachannel", &_36, 0, &_35$$10); zephir_check_call_status(); @@ -1198,7 +1225,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) zephir_read_property(&_42$$10, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_34$$10); ZVAL_STRING(&_34$$10, "Imagick::COMPOSITE_SRC"); - ZEPHIR_CALL_FUNCTION(&_43$$10, "constant", &_20, 115, &_34$$10); + ZEPHIR_CALL_FUNCTION(&_43$$10, "constant", &_20, 109, &_34$$10); zephir_check_call_status(); ZVAL_LONG(&_44$$10, 0); ZVAL_LONG(&_45$$10, 0); @@ -1227,7 +1254,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) } ZEPHIR_INIT_NVAR(&_48$$13); ZVAL_STRING(&_48$$13, "Imagick::COMPOSITE_OVER"); - ZEPHIR_CALL_FUNCTION(&_49$$13, "constant", &_20, 115, &_48$$13); + ZEPHIR_CALL_FUNCTION(&_49$$13, "constant", &_20, 109, &_48$$13); zephir_check_call_status(); zephir_read_property(&_50$$13, this_ptr, ZEND_STRL("height"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_51$$13, 0); @@ -1339,7 +1366,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processRender) if (ZEPHIR_IS_STRING(&extension, "jpg") || ZEPHIR_IS_STRING(&extension, "jpeg")) { ZEPHIR_INIT_VAR(&_5$$4); ZVAL_STRING(&_5$$4, "Imagick::COMPRESSION_JPEG"); - ZEPHIR_CALL_FUNCTION(&_6$$4, "constant", NULL, 115, &_5$$4); + ZEPHIR_CALL_FUNCTION(&_6$$4, "constant", NULL, 109, &_5$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &image, "setimagecompression", NULL, 0, &_6$$4); zephir_check_call_status(); @@ -1468,8 +1495,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processRotate) zephir_check_call_status(); ZEPHIR_INIT_VAR(&pixel); object_init_ex(&pixel, zephir_get_internal_ce(SL("imagickpixel"))); - ZEPHIR_CALL_METHOD(NULL, &pixel, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(&pixel)) { + ZEPHIR_CALL_METHOD(NULL, &pixel, "__construct", NULL, 0); + zephir_check_call_status(); + } + while (1) { if (!(1)) { break; @@ -1585,7 +1615,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processSave) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_9$$3); ZVAL_STRING(&_9$$3, "w"); - ZEPHIR_CALL_FUNCTION(&fp, "fopen", NULL, 136, &file, &_9$$3); + ZEPHIR_CALL_FUNCTION(&fp, "fopen", NULL, 130, &file, &_9$$3); zephir_check_call_status(); zephir_read_property(&_10$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(NULL, &_10$$3, "writeimagesfile", NULL, 0, &fp); @@ -1597,7 +1627,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processSave) zephir_read_property(&_11$$4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_12$$4); ZVAL_STRING(&_12$$4, "Imagick::COMPRESSION_JPEG"); - ZEPHIR_CALL_FUNCTION(&_13$$4, "constant", NULL, 115, &_12$$4); + ZEPHIR_CALL_FUNCTION(&_13$$4, "constant", NULL, 109, &_12$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_11$$4, "setimagecompression", NULL, 0, &_13$$4); zephir_check_call_status(); @@ -1775,19 +1805,25 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) opacity = (long) (zephir_safe_div_long_long(opacity, 100)); ZEPHIR_INIT_VAR(&draw); object_init_ex(&draw, zephir_get_internal_ce(SL("imagickdraw"))); - ZEPHIR_CALL_METHOD(NULL, &draw, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(&draw)) { + ZEPHIR_CALL_METHOD(NULL, &draw, "__construct", NULL, 0); + zephir_check_call_status(); + } + ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "rgb(%d, %d, %d)"); ZVAL_LONG(&_1, red); ZVAL_LONG(&_2, green); ZVAL_LONG(&_3, blue); - ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 113, &_0, &_1, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 107, &_0, &_1, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_0); object_init_ex(&_0, zephir_get_internal_ce(SL("imagickpixel"))); - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 0, &color); - zephir_check_call_status(); + if (zephir_has_constructor(&_0)) { + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 0, &color); + zephir_check_call_status(); + } + ZEPHIR_CALL_METHOD(NULL, &draw, "setfillcolor", NULL, 0, &_0); zephir_check_call_status(); if (Z_TYPE_P(&fontFile) != IS_NULL) { @@ -1814,7 +1850,7 @@ 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, 115, &_6$$7); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 109, &_6$$7); zephir_check_call_status(); } else if (Z_TYPE_P(offsetY) == IS_LONG) { ZEPHIR_INIT_VAR(&y); @@ -1826,7 +1862,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_7$$8) { ZEPHIR_INIT_VAR(&_8$$8); ZVAL_STRING(&_8$$8, "Imagick::GRAVITY_SOUTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 115, &_8$$8); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 109, &_8$$8); zephir_check_call_status(); } else { } @@ -1837,7 +1873,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_9$$8) { ZEPHIR_INIT_NVAR(&_8$$8); ZVAL_STRING(&_8$$8, "Imagick::GRAVITY_NORTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 115, &_8$$8); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 109, &_8$$8); zephir_check_call_status(); } else { } @@ -1848,7 +1884,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_10$$8) { ZEPHIR_INIT_NVAR(&_8$$8); ZVAL_STRING(&_8$$8, "Imagick::GRAVITY_SOUTH"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 115, &_8$$8); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 109, &_8$$8); zephir_check_call_status(); } else { } @@ -1859,7 +1895,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_11$$8) { ZEPHIR_INIT_NVAR(&_8$$8); ZVAL_STRING(&_8$$8, "Imagick::GRAVITY_NORTH"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 115, &_8$$8); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 109, &_8$$8); zephir_check_call_status(); } else { } @@ -1883,7 +1919,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_12$$11) { ZEPHIR_INIT_VAR(&_13$$11); ZVAL_STRING(&_13$$11, "Imagick::GRAVITY_SOUTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 115, &_13$$11); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 109, &_13$$11); zephir_check_call_status(); } else { } @@ -1894,7 +1930,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_14$$11) { ZEPHIR_INIT_NVAR(&_13$$11); ZVAL_STRING(&_13$$11, "Imagick::GRAVITY_SOUTH"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 115, &_13$$11); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 109, &_13$$11); zephir_check_call_status(); } else { } @@ -1905,7 +1941,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_15$$11) { ZEPHIR_INIT_NVAR(&_13$$11); ZVAL_STRING(&_13$$11, "Imagick::GRAVITY_EAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 115, &_13$$11); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 109, &_13$$11); zephir_check_call_status(); } else { } @@ -1916,7 +1952,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_16$$11) { ZEPHIR_INIT_NVAR(&_13$$11); ZVAL_STRING(&_13$$11, "Imagick::GRAVITY_WEST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 115, &_13$$11); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 109, &_13$$11); zephir_check_call_status(); } else { } @@ -1945,14 +1981,14 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (ZEPHIR_LT_LONG(&y, 0)) { ZEPHIR_INIT_VAR(&_17$$12); ZVAL_STRING(&_17$$12, "Imagick::GRAVITY_SOUTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 115, &_17$$12); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 109, &_17$$12); zephir_check_call_status(); } else { } if (ZEPHIR_GE_LONG(&y, 0)) { ZEPHIR_INIT_NVAR(&_17$$12); ZVAL_STRING(&_17$$12, "Imagick::GRAVITY_NORTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 115, &_17$$12); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 109, &_17$$12); zephir_check_call_status(); } else { } @@ -2024,7 +2060,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processWatermark) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(4, 4) - Z_PARAM_OBJECT_OF_CLASS(image, phalcon_image_adapter_adapterinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(image, zephir_get_internal_ce(SL("phalcon\\image\\adapter\\adapterinterface"))) Z_PARAM_LONG(offsetX) Z_PARAM_LONG(offsetY) Z_PARAM_LONG(opacity) @@ -2042,19 +2078,22 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processWatermark) opacity = (long) (zephir_safe_div_long_long(opacity, 100)); ZEPHIR_INIT_VAR(&watermark); object_init_ex(&watermark, zephir_get_internal_ce(SL("imagick"))); - ZEPHIR_CALL_METHOD(NULL, &watermark, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(&watermark)) { + ZEPHIR_CALL_METHOD(NULL, &watermark, "__construct", NULL, 0); + zephir_check_call_status(); + } + ZEPHIR_CALL_METHOD(&_0, image, "render", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &watermark, "readimageblob", NULL, 0, &_0); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "Imagick::EVALUATE_MULTIPLY"); - ZEPHIR_CALL_FUNCTION(&_2, "constant", NULL, 115, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "constant", NULL, 109, &_1); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "Imagick::CHANNEL_ALPHA"); - ZEPHIR_CALL_FUNCTION(&_3, "constant", NULL, 115, &_1); + ZEPHIR_CALL_FUNCTION(&_3, "constant", NULL, 109, &_1); zephir_check_call_status(); ZVAL_LONG(&_4, opacity); ZEPHIR_CALL_METHOD(NULL, &watermark, "evaluateimage", NULL, 0, &_2, &_4, &_3); @@ -2070,7 +2109,7 @@ 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, 115, &_7$$3); + ZEPHIR_CALL_FUNCTION(&_8$$3, "constant", NULL, 109, &_7$$3); zephir_check_call_status(); ZVAL_LONG(&_9$$3, offsetX); ZVAL_LONG(&_10$$3, offsetY); @@ -2124,12 +2163,12 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, check) } ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "Imagick::IMAGICK_EXTNUM"); - ZEPHIR_CALL_FUNCTION(&_2, "defined", NULL, 114, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "defined", NULL, 108, &_1); zephir_check_call_status(); if (zephir_is_true(&_2)) { ZEPHIR_INIT_VAR(&_3$$4); ZVAL_STRING(&_3$$4, "Imagick::IMAGICK_EXTNUM"); - ZEPHIR_CALL_FUNCTION(&_4$$4, "constant", NULL, 115, &_3$$4); + ZEPHIR_CALL_FUNCTION(&_4$$4, "constant", NULL, 109, &_3$$4); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("version"), &_4$$4); } diff --git a/ext/phalcon/image/imagefactory.zep.c b/ext/phalcon/image/imagefactory.zep.c index a04b1d528a..77ba58abf9 100644 --- a/ext/phalcon/image/imagefactory.zep.c +++ b/ext/phalcon/image/imagefactory.zep.c @@ -128,17 +128,17 @@ 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, 411, config, &_1); + ZEPHIR_CALL_METHOD(&file, this_ptr, "getarrval", NULL, 405, 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, 411, config, &_1, &_2); + ZEPHIR_CALL_METHOD(&height, this_ptr, "getarrval", NULL, 405, 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, 411, config, &_1, &_2); + ZEPHIR_CALL_METHOD(&width, this_ptr, "getarrval", NULL, 405, config, &_1, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "newinstance", NULL, 0, &name, &file, &width, &height); zephir_check_call_status(); diff --git a/ext/phalcon/logger/abstractlogger.zep.c b/ext/phalcon/logger/abstractlogger.zep.c index 786da644fc..07e2cebffe 100644 --- a/ext/phalcon/logger/abstractlogger.zep.c +++ b/ext/phalcon/logger/abstractlogger.zep.c @@ -188,7 +188,7 @@ PHP_METHOD(Phalcon_Logger_AbstractLogger, addAdapter) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(name) - Z_PARAM_OBJECT_OF_CLASS(adapter, phalcon_logger_adapter_adapterinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(adapter, zephir_get_internal_ce(SL("phalcon\\logger\\adapter\\adapterinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/logger/adapter/abstractadapter.zep.c b/ext/phalcon/logger/adapter/abstractadapter.zep.c index ee386b360f..c516f3ceb5 100644 --- a/ext/phalcon/logger/adapter/abstractadapter.zep.c +++ b/ext/phalcon/logger/adapter/abstractadapter.zep.c @@ -153,7 +153,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, add) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(item, phalcon_logger_item_ce) + Z_PARAM_OBJECT_OF_CLASS(item, zephir_get_internal_ce(SL("phalcon\\logger\\item"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -333,7 +333,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, setFormatter) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(formatter, phalcon_logger_formatter_formatterinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(formatter, zephir_get_internal_ce(SL("phalcon\\logger\\formatter\\formatterinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -360,7 +360,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, getFormattedItem) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(item, phalcon_logger_item_ce) + Z_PARAM_OBJECT_OF_CLASS(item, zephir_get_internal_ce(SL("phalcon\\logger\\item"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/logger/adapter/noop.zep.c b/ext/phalcon/logger/adapter/noop.zep.c index a431439e89..1610eaa641 100644 --- a/ext/phalcon/logger/adapter/noop.zep.c +++ b/ext/phalcon/logger/adapter/noop.zep.c @@ -62,7 +62,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_Noop, process) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(item, phalcon_logger_item_ce) + Z_PARAM_OBJECT_OF_CLASS(item, zephir_get_internal_ce(SL("phalcon\\logger\\item"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/logger/adapter/stream.zep.c b/ext/phalcon/logger/adapter/stream.zep.c index 3c180004aa..dcf63ec9f4 100644 --- a/ext/phalcon/logger/adapter/stream.zep.c +++ b/ext/phalcon/logger/adapter/stream.zep.c @@ -191,7 +191,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_Stream, process) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(item, phalcon_logger_item_ce) + Z_PARAM_OBJECT_OF_CLASS(item, zephir_get_internal_ce(SL("phalcon\\logger\\item"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -211,14 +211,14 @@ PHP_METHOD(Phalcon_Logger_Adapter_Stream, process) zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("mode"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_5$$3); ZEPHIR_CONCAT_SVSVS(&_5$$3, "The file '", &_3$$3, "' cannot be opened with mode '", &_4$$3, "'"); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 412, &_5$$3); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 406, &_5$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_2$$3, "phalcon/Logger/Adapter/Stream.zep", 119); ZEPHIR_MM_RESTORE(); return; } ZVAL_LONG(&_6, 2); - ZEPHIR_CALL_FUNCTION(NULL, "flock", NULL, 128, &handler, &_6); + ZEPHIR_CALL_FUNCTION(NULL, "flock", NULL, 122, &handler, &_6); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_7, this_ptr, "getformatteditem", NULL, 0, item); zephir_check_call_status(); @@ -259,7 +259,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_Stream, phpFopen) zephir_get_strval(&mode, mode_param); - ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 136, &filename, &mode); + ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 130, &filename, &mode); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/logger/adapter/syslog.zep.c b/ext/phalcon/logger/adapter/syslog.zep.c index b45e17e323..940248ecd5 100644 --- a/ext/phalcon/logger/adapter/syslog.zep.c +++ b/ext/phalcon/logger/adapter/syslog.zep.c @@ -143,7 +143,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_Syslog, close) if (!(zephir_is_true(&_0))) { RETURN_MM_BOOL(1); } - ZEPHIR_RETURN_CALL_FUNCTION("closelog", NULL, 413); + ZEPHIR_RETURN_CALL_FUNCTION("closelog", NULL, 407); zephir_check_call_status(); RETURN_MM(); } @@ -182,7 +182,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_Syslog, process) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(item, phalcon_logger_item_ce) + Z_PARAM_OBJECT_OF_CLASS(item, zephir_get_internal_ce(SL("phalcon\\logger\\item"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -207,9 +207,9 @@ 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, 113, &_7$$3, &_4$$3, &_6$$3); + ZEPHIR_CALL_FUNCTION(&_8$$3, "sprintf", NULL, 107, &_7$$3, &_4$$3, &_6$$3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 412, &_8$$3); + ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 406, &_8$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$3, "phalcon/Logger/Adapter/Syslog.zep", 106); ZEPHIR_MM_RESTORE(); @@ -222,9 +222,9 @@ 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, 414, &_9); + ZEPHIR_CALL_METHOD(&level, this_ptr, "logleveltosyslog", NULL, 408, &_9); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "syslog", NULL, 415, &level, &message); + ZEPHIR_CALL_FUNCTION(NULL, "syslog", NULL, 409, &level, &message); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -270,7 +270,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_Syslog, openlog) ZVAL_LONG(&_0, option); ZVAL_LONG(&_1, facility); - ZEPHIR_RETURN_CALL_FUNCTION("openlog", NULL, 416, &ident, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("openlog", NULL, 410, &ident, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/logger/formatter/abstractformatter.zep.c b/ext/phalcon/logger/formatter/abstractformatter.zep.c index aa84d5986d..9cb6863af5 100644 --- a/ext/phalcon/logger/formatter/abstractformatter.zep.c +++ b/ext/phalcon/logger/formatter/abstractformatter.zep.c @@ -77,7 +77,7 @@ PHP_METHOD(Phalcon_Logger_Formatter_AbstractFormatter, getFormattedDate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(item, phalcon_logger_item_ce) + Z_PARAM_OBJECT_OF_CLASS(item, zephir_get_internal_ce(SL("phalcon\\logger\\item"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/logger/formatter/json.zep.c b/ext/phalcon/logger/formatter/json.zep.c index 2aa358fdcb..27079e31b4 100644 --- a/ext/phalcon/logger/formatter/json.zep.c +++ b/ext/phalcon/logger/formatter/json.zep.c @@ -100,7 +100,7 @@ PHP_METHOD(Phalcon_Logger_Formatter_Json, format) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(item, phalcon_logger_item_ce) + Z_PARAM_OBJECT_OF_CLASS(item, zephir_get_internal_ce(SL("phalcon\\logger\\item"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/logger/formatter/line.zep.c b/ext/phalcon/logger/formatter/line.zep.c index 4e43602237..28cd744d0b 100644 --- a/ext/phalcon/logger/formatter/line.zep.c +++ b/ext/phalcon/logger/formatter/line.zep.c @@ -113,7 +113,7 @@ PHP_METHOD(Phalcon_Logger_Formatter_Line, format) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(item, phalcon_logger_item_ce) + Z_PARAM_OBJECT_OF_CLASS(item, zephir_get_internal_ce(SL("phalcon\\logger\\item"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/logger/loggerfactory.zep.c b/ext/phalcon/logger/loggerfactory.zep.c index 91f2776c75..c0f798a99e 100644 --- a/ext/phalcon/logger/loggerfactory.zep.c +++ b/ext/phalcon/logger/loggerfactory.zep.c @@ -56,7 +56,7 @@ PHP_METHOD(Phalcon_Logger_LoggerFactory, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_logger_adapterfactory_ce) + Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\logger\\adapterfactory"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -282,7 +282,7 @@ PHP_METHOD(Phalcon_Logger_LoggerFactory, newInstance) object_init_ex(return_value, phalcon_logger_logger_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 417, &name, &adapters, timezone); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 411, &name, &adapters, timezone); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/messages/messages.zep.c b/ext/phalcon/messages/messages.zep.c index 62f63a0c80..9ee9ee5a2a 100644 --- a/ext/phalcon/messages/messages.zep.c +++ b/ext/phalcon/messages/messages.zep.c @@ -104,7 +104,7 @@ PHP_METHOD(Phalcon_Messages_Messages, appendMessage) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(message, phalcon_messages_messageinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(message, zephir_get_internal_ce(SL("phalcon\\messages\\messageinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -569,7 +569,7 @@ 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, 418, &_1$$3, index, &_2$$3); + ZEPHIR_CALL_FUNCTION(NULL, "array_splice", NULL, 412, &_1$$3, index, &_2$$3); ZEPHIR_UNREF(&_1$$3); zephir_check_call_status(); } diff --git a/ext/phalcon/mvc/micro.zep.c b/ext/phalcon/mvc/micro.zep.c index 294808548e..9ae284ea7e 100644 --- a/ext/phalcon/mvc/micro.zep.c +++ b/ext/phalcon/mvc/micro.zep.c @@ -139,7 +139,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, __construct) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 1) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -455,7 +455,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, setEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -584,7 +584,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, getService) 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, 419); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 413); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &_1$$3); } @@ -636,7 +636,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, getSharedService) 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, 419); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 413); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &_1$$3); } @@ -1466,7 +1466,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, hasService) 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, 419); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 413); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &_1$$3); } @@ -1607,7 +1607,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, mount) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(collection, phalcon_mvc_micro_collectioninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(collection, zephir_get_internal_ce(SL("phalcon\\mvc\\micro\\collectioninterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1633,7 +1633,7 @@ 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, 420, &mainHandler); + ZEPHIR_CALL_METHOD(NULL, &lazyHandler, "__construct", NULL, 414, &mainHandler); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&lazyHandler, &mainHandler); @@ -1920,7 +1920,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, offsetUnset) 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, 419); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 413); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &_1$$3); } @@ -2172,7 +2172,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, setDI) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2221,7 +2221,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, setModelBinder) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(modelBinder, phalcon_mvc_model_binderinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(modelBinder, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\binderinterface"))) Z_PARAM_OPTIONAL Z_PARAM_ZVAL_OR_NULL(cache) ZEND_PARSE_PARAMETERS_END(); @@ -2329,7 +2329,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, setService) 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, 419); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 413); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &_1$$3); } diff --git a/ext/phalcon/mvc/micro/lazyloader.zep.c b/ext/phalcon/mvc/micro/lazyloader.zep.c index ee68620acf..6b13a97cc3 100644 --- a/ext/phalcon/mvc/micro/lazyloader.zep.c +++ b/ext/phalcon/mvc/micro/lazyloader.zep.c @@ -119,7 +119,7 @@ PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, callMethod) Z_PARAM_STR(method) Z_PARAM_ZVAL(arguments) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(modelBinder, phalcon_mvc_model_binderinterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(modelBinder, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\binderinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model.zep.c b/ext/phalcon/mvc/model.zep.c index ecdb5c0961..bfba20edfe 100644 --- a/ext/phalcon/mvc/model.zep.c +++ b/ext/phalcon/mvc/model.zep.c @@ -177,8 +177,8 @@ PHP_METHOD(Phalcon_Mvc_Model, __construct) ZEND_PARSE_PARAMETERS_START(0, 3) Z_PARAM_OPTIONAL Z_PARAM_ZVAL_OR_NULL(data) - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, phalcon_di_diinterface_ce) - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(modelsManager, phalcon_mvc_model_managerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(modelsManager, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\managerinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -276,7 +276,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __call) zephir_get_arrval(&arguments, arguments_param); - ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 421, &method, &arguments); + ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 415, &method, &arguments); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&records)) { RETURN_CCTOR(&records); @@ -342,7 +342,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __callStatic) zephir_get_arrval(&arguments, arguments_param); - ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 421, &method, &arguments); + ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 415, &method, &arguments); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&records)) { RETURN_CCTOR(&records); @@ -739,13 +739,13 @@ PHP_METHOD(Phalcon_Mvc_Model, __set) } } - ZEPHIR_CALL_METHOD(&_14, this_ptr, "possiblesetter", NULL, 422, &property, value); + ZEPHIR_CALL_METHOD(&_14, this_ptr, "possiblesetter", NULL, 416, &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, 291, this_ptr, &property); + ZEPHIR_CALL_FUNCTION(&_15, "property_exists", NULL, 285, this_ptr, &property); zephir_check_call_status(); if (zephir_is_true(&_15)) { ZEPHIR_CALL_METHOD(&manager, this_ptr, "getmodelsmanager", NULL, 0); @@ -937,7 +937,7 @@ PHP_METHOD(Phalcon_Mvc_Model, addBehavior) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(behavior, phalcon_mvc_model_behaviorinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(behavior, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\behaviorinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -983,7 +983,7 @@ PHP_METHOD(Phalcon_Mvc_Model, appendMessage) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(message, phalcon_messages_messageinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(message, zephir_get_internal_ce(SL("phalcon\\messages\\messageinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1178,7 +1178,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, 423, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_8$$13, "caseinsensitivecolumnmap", &_9, 417, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_8$$13); } @@ -1210,7 +1210,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, 422, &attributeField, &value); + ZEPHIR_CALL_METHOD(&_14$$18, this_ptr, "possiblesetter", &_15, 416, &attributeField, &value); zephir_check_call_status(); _13$$18 = !zephir_is_true(&_14$$18); } @@ -1235,7 +1235,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, 423, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_17$$23, "caseinsensitivecolumnmap", &_9, 417, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_17$$23); } @@ -1267,7 +1267,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, 422, &attributeField, &value); + ZEPHIR_CALL_METHOD(&_21$$28, this_ptr, "possiblesetter", &_15, 416, &attributeField, &value); zephir_check_call_status(); _20$$28 = !zephir_is_true(&_21$$28); } @@ -1393,7 +1393,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResult) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 3) - Z_PARAM_OBJECT_OF_CLASS(base, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(base, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_ARRAY(data) Z_PARAM_OPTIONAL Z_PARAM_LONG(dirtyState) @@ -1881,7 +1881,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, 423, columnMap, &key); + ZEPHIR_CALL_SELF(&_5$$8, "caseinsensitivecolumnmap", &_6, 417, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_5$$8); } @@ -1933,7 +1933,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, 423, columnMap, &key); + ZEPHIR_CALL_SELF(&_11$$17, "caseinsensitivecolumnmap", &_6, 417, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_11$$17); } @@ -2185,7 +2185,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, 424); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getwriteconnection", NULL, 418); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, this_ptr, "has", NULL, 0, &metaData, &_1); zephir_check_call_status(); @@ -2284,7 +2284,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, 424); + ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 418); zephir_check_call_status(); ZEPHIR_INIT_ZVAL_NREF(_0); ZVAL_LONG(&_0, 3); @@ -2293,7 +2293,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, 425); + ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "checkforeignkeysreverserestrict", NULL, 419); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&_2$$3)) { RETURN_MM_BOOL(0); @@ -2455,9 +2455,9 @@ PHP_METHOD(Phalcon_Mvc_Model, delete) RETURN_MM_BOOL(1); } } - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 426); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 420); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 427); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 421); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); @@ -2472,7 +2472,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, 428); + ZEPHIR_CALL_METHOD(&_28$$25, this_ptr, "checkforeignkeysreversecascade", NULL, 422); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&_28$$25)) { RETURN_MM_BOOL(0); @@ -2512,7 +2512,7 @@ PHP_METHOD(Phalcon_Mvc_Model, dump) ZEPHIR_MM_GROW(); - ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 429, this_ptr); + ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 423, this_ptr); zephir_check_call_status(); RETURN_MM(); } @@ -2734,7 +2734,7 @@ PHP_METHOD(Phalcon_Mvc_Model, find) } else { ZEPHIR_CPY_WRT(¶ms, parameters); } - ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_0, 430, ¶ms); + ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_0, 424, ¶ms); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&resultset, &query, "execute", NULL, 0); zephir_check_call_status(); @@ -2885,7 +2885,7 @@ PHP_METHOD(Phalcon_Mvc_Model, findFirst) return; } ZVAL_LONG(&_3, 1); - ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_2, 430, ¶ms, &_3); + ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_2, 424, ¶ms, &_3); zephir_check_call_status(); ZVAL_BOOL(&_3, 1); ZEPHIR_CALL_METHOD(NULL, &query, "setuniquerow", NULL, 0, &_3); @@ -3780,7 +3780,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, 431, fieldName, &changedFields); + ZEPHIR_CALL_FUNCTION(&intersect, "array_intersect", NULL, 425, fieldName, &changedFields); zephir_check_call_status(); if (allFields) { RETURN_MM_BOOL(ZEPHIR_IS_EQUAL(&intersect, fieldName)); @@ -3853,7 +3853,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, 431, fieldName, &updatedFields); + ZEPHIR_CALL_FUNCTION(&intersect, "array_intersect", NULL, 425, fieldName, &updatedFields); zephir_check_call_status(); if (allFields) { RETURN_MM_BOOL(ZEPHIR_IS_EQUAL(&intersect, fieldName)); @@ -4035,7 +4035,7 @@ PHP_METHOD(Phalcon_Mvc_Model, query) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 1) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -4068,12 +4068,12 @@ PHP_METHOD(Phalcon_Mvc_Model, query) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 432, container); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 426, container); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_3); zephir_get_called_class(&_3); - ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 433, &_3); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 427, &_3); zephir_check_call_status(); RETURN_CCTOR(&criteria); } @@ -4173,13 +4173,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, 434); + ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 428); 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, 426); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 420); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 427); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 421); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); @@ -4338,7 +4338,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, 424); + ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 418); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "prepareSave"); @@ -4354,9 +4354,9 @@ PHP_METHOD(Phalcon_Mvc_Model, save) RETURN_MM_BOOL(0); } } - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 426); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 420); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 427); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 421); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); @@ -4366,7 +4366,7 @@ PHP_METHOD(Phalcon_Mvc_Model, save) } else { ZEPHIR_CPY_WRT(&table, &source); } - ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 434); + ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 428); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&exists, this_ptr, "has", NULL, 0, &metaData, &readConnection); zephir_check_call_status(); @@ -4397,7 +4397,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, 435, this_ptr, &_7$$11); + ZEPHIR_CALL_METHOD(NULL, &_6$$11, "__construct", NULL, 429, this_ptr, &_7$$11); zephir_check_call_status(); zephir_throw_exception_debug(&_6$$11, "phalcon/Mvc/Model.zep", 2657); ZEPHIR_MM_RESTORE(); @@ -4716,7 +4716,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -5018,7 +5018,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, 423, columnMap, &key); + ZEPHIR_CALL_SELF(&_5$$6, "caseinsensitivecolumnmap", &_6, 417, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_5$$6); } @@ -5077,7 +5077,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, 423, columnMap, &key); + ZEPHIR_CALL_SELF(&_13$$14, "caseinsensitivecolumnmap", &_6, 417, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_13$$14); } @@ -5175,7 +5175,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setTransaction) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(transaction, phalcon_mvc_model_transactioninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(transaction, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\transactioninterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -5507,7 +5507,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, 423, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_4$$5, "caseinsensitivecolumnmap", &_5, 417, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_4$$5); } @@ -5558,7 +5558,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, 423, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_10$$15, "caseinsensitivecolumnmap", &_5, 417, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_10$$15); } @@ -5638,7 +5638,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, 434); + ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getreadconnection", NULL, 428); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "has", NULL, 0, &metaData, &_2$$3); zephir_check_call_status(); @@ -6460,8 +6460,8 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(4, 4) - Z_PARAM_OBJECT_OF_CLASS(metaData, phalcon_mvc_model_metadatainterface_ce) - Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_db_adapter_adapterinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(metaData, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\metadatainterface"))) + Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\db\\adapter\\adapterinterface"))) Z_PARAM_ZVAL(table) Z_PARAM_ZVAL(identityField) ZEND_PARSE_PARAMETERS_END(); @@ -6764,9 +6764,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, 427); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 421); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 426); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 420); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&sequenceName); if (ZEPHIR_IS_EMPTY(&schema)) { @@ -6919,8 +6919,8 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(3, 3) - Z_PARAM_OBJECT_OF_CLASS(metaData, phalcon_mvc_model_metadatainterface_ce) - Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_db_adapter_adapterinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(metaData, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\metadatainterface"))) + Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\db\\adapter\\adapterinterface"))) Z_PARAM_ZVAL(table) ZEND_PARSE_PARAMETERS_END(); #endif @@ -7417,8 +7417,8 @@ PHP_METHOD(Phalcon_Mvc_Model, has) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(metaData, phalcon_mvc_model_metadatainterface_ce) - Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_db_adapter_adapterinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(metaData, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\metadatainterface"))) + Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\db\\adapter\\adapterinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -7605,9 +7605,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, 426); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 420); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 427); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 421); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); @@ -8180,7 +8180,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSave) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(3, 3) - Z_PARAM_OBJECT_OF_CLASS(metaData, phalcon_mvc_model_metadatainterface_ce) + Z_PARAM_OBJECT_OF_CLASS(metaData, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\metadatainterface"))) Z_PARAM_BOOL(exists) Z_PARAM_ZVAL(identityField) ZEND_PARSE_PARAMETERS_END(); @@ -8214,7 +8214,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSave) } } if (ZEPHIR_GLOBAL(orm).virtual_foreign_keys) { - ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "checkforeignkeysrestrict", NULL, 436); + ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "checkforeignkeysrestrict", NULL, 430); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&_3$$8)) { RETURN_MM_BOOL(0); @@ -8555,7 +8555,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_db_adapter_adapterinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\db\\adapter\\adapterinterface"))) Z_PARAM_ZVAL(related) ZEND_PARSE_PARAMETERS_END(); #endif @@ -8988,7 +8988,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_db_adapter_adapterinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\db\\adapter\\adapterinterface"))) Z_PARAM_ZVAL(related) ZEND_PARSE_PARAMETERS_END(); #endif @@ -11003,7 +11003,7 @@ PHP_METHOD(Phalcon_Mvc_Model, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(validator, phalcon_filter_validation_validationinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(validator, zephir_get_internal_ce(SL("phalcon\\filter\\validation\\validationinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model/behavior.zep.c b/ext/phalcon/mvc/model/behavior.zep.c index bbe42d548a..686355e4da 100644 --- a/ext/phalcon/mvc/model/behavior.zep.c +++ b/ext/phalcon/mvc/model/behavior.zep.c @@ -149,7 +149,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Behavior, missingMethod) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 3) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_STR(method) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(arguments) @@ -224,7 +224,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Behavior, notify) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(type) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model/behavior/softdelete.zep.c b/ext/phalcon/mvc/model/behavior/softdelete.zep.c index 9a030939c6..4117f4aaf9 100644 --- a/ext/phalcon/mvc/model/behavior/softdelete.zep.c +++ b/ext/phalcon/mvc/model/behavior/softdelete.zep.c @@ -76,7 +76,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Behavior_SoftDelete, notify) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(type) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model/behavior/timestampable.zep.c b/ext/phalcon/mvc/model/behavior/timestampable.zep.c index 2772ffc26d..9826f2cd66 100644 --- a/ext/phalcon/mvc/model/behavior/timestampable.zep.c +++ b/ext/phalcon/mvc/model/behavior/timestampable.zep.c @@ -68,7 +68,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Behavior_Timestampable, notify) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(type) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -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, 437, &options); + ZEPHIR_CALL_METHOD(×tamp, this_ptr, "gettimestamp", NULL, 431, &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, 438, &format); + ZEPHIR_RETURN_CALL_FUNCTION("date", NULL, 432, &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 96f12d48e6..9cfc14ab19 100644 --- a/ext/phalcon/mvc/model/binder.zep.c +++ b/ext/phalcon/mvc/model/binder.zep.c @@ -84,7 +84,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, __construct) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 1) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(cache, phalcon_cache_adapter_adapterinterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(cache, zephir_get_internal_ce(SL("phalcon\\cache\\adapter\\adapterinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -435,16 +435,16 @@ 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, 439, handler, &methodName); + ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 433, handler, &methodName); zephir_check_call_status(); } else { object_init_ex(&reflection, zephir_get_internal_ce(SL("reflectionfunction"))); - ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 147, handler); + ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 141, 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, 148); + ZEPHIR_CALL_METHOD(&methodParams, &reflection, "getparameters", NULL, 142); zephir_check_call_status(); ZEPHIR_INIT_VAR(¶msKeys); zephir_array_keys(¶msKeys, ¶ms); @@ -477,7 +477,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection) zephir_array_fetch(¶mValue, ¶ms, ¶mKey, PH_NOISY, "phalcon/Mvc/Model/Binder.zep", 199); ZEPHIR_INIT_NVAR(&_6$$5); ZVAL_STRING(&_6$$5, "Phalcon\\Mvc\\Model"); - ZEPHIR_CALL_FUNCTION(&_7$$5, "is_subclass_of", &_8, 440, &className, &_6$$5); + ZEPHIR_CALL_FUNCTION(&_7$$5, "is_subclass_of", &_8, 434, &className, &_6$$5); zephir_check_call_status(); if (ZEPHIR_IS_STRING(&className, "Phalcon\\Mvc\\Model")) { if (Z_TYPE_P(&realClasses) == IS_NULL) { @@ -559,7 +559,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection) zephir_array_fetch(¶mValue, ¶ms, ¶mKey, PH_NOISY, "phalcon/Mvc/Model/Binder.zep", 199); ZEPHIR_INIT_NVAR(&_15$$19); ZVAL_STRING(&_15$$19, "Phalcon\\Mvc\\Model"); - ZEPHIR_CALL_FUNCTION(&_16$$19, "is_subclass_of", &_8, 440, &className, &_15$$19); + ZEPHIR_CALL_FUNCTION(&_16$$19, "is_subclass_of", &_8, 434, &className, &_15$$19); zephir_check_call_status(); if (ZEPHIR_IS_STRING(&className, "Phalcon\\Mvc\\Model")) { if (Z_TYPE_P(&realClasses) == IS_NULL) { @@ -636,7 +636,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, setCache) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(cache, phalcon_cache_adapter_adapterinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(cache, zephir_get_internal_ce(SL("phalcon\\cache\\adapter\\adapterinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model/criteria.zep.c b/ext/phalcon/mvc/model/criteria.zep.c index 2f89292a96..7fc69cfe26 100644 --- a/ext/phalcon/mvc/model/criteria.zep.c +++ b/ext/phalcon/mvc/model/criteria.zep.c @@ -622,7 +622,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, fromInput) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(3, 4) - Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) Z_PARAM_STR(modelName) Z_PARAM_ARRAY(data) Z_PARAM_OPTIONAL @@ -783,19 +783,19 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, fromInput) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 432, container); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 426, 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, 441, &_16$$16); + ZEPHIR_CALL_METHOD(NULL, &criteria, "where", NULL, 435, &_16$$16); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &criteria, "bind", NULL, 442, &bind); + ZEPHIR_CALL_METHOD(NULL, &criteria, "bind", NULL, 436, &bind); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 433, &modelName); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 427, &modelName); zephir_check_call_status(); RETURN_CCTOR(&criteria); } @@ -1459,11 +1459,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, limit) ZVAL_LONG(&_0, limit); - ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 285, &_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, 285, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 279, &_0); zephir_check_call_status(); offset = zephir_get_numberval(&_2); if (UNEXPECTED(limit == 0)) { @@ -1853,7 +1853,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, setDI) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model/manager.zep.c b/ext/phalcon/mvc/model/manager.zep.c index a4cb6da198..40387efde2 100644 --- a/ext/phalcon/mvc/model/manager.zep.c +++ b/ext/phalcon/mvc/model/manager.zep.c @@ -253,8 +253,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, addBehavior) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) - Z_PARAM_OBJECT_OF_CLASS(behavior, phalcon_mvc_model_behaviorinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(behavior, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\behaviorinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -315,7 +315,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, addBelongsTo) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(4, 5) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_ZVAL(fields) Z_PARAM_STR(referencedModel) Z_PARAM_ZVAL(referencedFields) @@ -366,7 +366,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, 443, &_2, &referencedModel, fields, referencedFields, &options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 437, &_2, &referencedModel, fields, referencedFields, &options); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, &options, SL("alias"), 0)) { @@ -435,7 +435,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasMany) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(4, 5) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_ZVAL(fields) Z_PARAM_STR(referencedModel) Z_PARAM_ZVAL(referencedFields) @@ -487,7 +487,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, 443, &_1, &referencedModel, fields, referencedFields, &options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 437, &_1, &referencedModel, fields, referencedFields, &options); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, &options, SL("alias"), 0)) { @@ -563,7 +563,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasManyToMany) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(7, 8) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_ZVAL(fields) Z_PARAM_STR(intermediateModel) Z_PARAM_ZVAL(intermediateFields) @@ -635,9 +635,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, 443, &_1, &referencedModel, fields, referencedFields, &options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 437, &_1, &referencedModel, fields, referencedFields, &options); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 444, intermediateFields, &intermediateModel, intermediateReferencedFields); + ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 438, intermediateFields, &intermediateModel, intermediateReferencedFields); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, &options, SL("alias"), 0)) { @@ -706,7 +706,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasOne) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(4, 5) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_ZVAL(fields) Z_PARAM_STR(referencedModel) Z_PARAM_ZVAL(referencedFields) @@ -757,7 +757,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, 443, &_2, &referencedModel, fields, referencedFields, &options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 437, &_2, &referencedModel, fields, referencedFields, &options); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, &options, SL("alias"), 0)) { @@ -833,7 +833,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasOneThrough) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(7, 8) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_ZVAL(fields) Z_PARAM_STR(intermediateModel) Z_PARAM_ZVAL(intermediateFields) @@ -905,9 +905,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, 443, &_1, &referencedModel, fields, referencedFields, &options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 437, &_1, &referencedModel, fields, referencedFields, &options); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 444, intermediateFields, &intermediateModel, intermediateReferencedFields); + ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 438, intermediateFields, &intermediateModel, intermediateReferencedFields); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, &options, SL("alias"), 0)) { @@ -1439,7 +1439,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getBelongsTo) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1495,7 +1495,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getBelongsToRecords) ZEND_PARSE_PARAMETERS_START(3, 5) Z_PARAM_STR(modelName) Z_PARAM_STR(modelRelation) - Z_PARAM_OBJECT_OF_CLASS(record, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(record, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_OPTIONAL Z_PARAM_ZVAL_OR_NULL(parameters) Z_PARAM_STR_OR_NULL(method) @@ -1589,7 +1589,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getConnectionService) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_ARRAY(connectionServices) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1629,7 +1629,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getCustomEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1687,7 +1687,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getHasMany) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1735,7 +1735,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getHasManyRecords) ZEND_PARSE_PARAMETERS_START(3, 5) Z_PARAM_STR(modelName) Z_PARAM_STR(modelRelation) - Z_PARAM_OBJECT_OF_CLASS(record, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(record, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_OPTIONAL Z_PARAM_ZVAL_OR_NULL(parameters) Z_PARAM_STR_OR_NULL(method) @@ -1808,7 +1808,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getHasManyToMany) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1843,7 +1843,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getHasOne) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1878,7 +1878,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getHasOneAndHasMany) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1924,7 +1924,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getHasOneRecords) ZEND_PARSE_PARAMETERS_START(3, 5) Z_PARAM_STR(modelName) Z_PARAM_STR(modelRelation) - Z_PARAM_OBJECT_OF_CLASS(record, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(record, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_OPTIONAL Z_PARAM_ZVAL_OR_NULL(parameters) Z_PARAM_STR_OR_NULL(method) @@ -1997,7 +1997,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getHasOneThrough) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2068,7 +2068,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getModelSchema) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2107,7 +2107,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getModelSource) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2149,7 +2149,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getReadConnection) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2179,7 +2179,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getReadConnectionService) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2340,8 +2340,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getRelationRecords) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 4) - Z_PARAM_OBJECT_OF_CLASS(relation, phalcon_mvc_model_relationinterface_ce) - Z_PARAM_OBJECT_OF_CLASS(record, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(relation, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\relationinterface"))) + Z_PARAM_OBJECT_OF_CLASS(record, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_OPTIONAL Z_PARAM_ZVAL_OR_NULL(parameters) Z_PARAM_STR_OR_NULL(method) @@ -2402,7 +2402,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", 1401); - ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "mergefindparameters", NULL, 445, &extraParameters, parameters); + ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "mergefindparameters", NULL, 439, &extraParameters, parameters); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&builder, this_ptr, "createbuilder", NULL, 0, &_5$$3); zephir_check_call_status(); @@ -2533,10 +2533,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, 445, &findParams, parameters); + ZEPHIR_CALL_METHOD(&findArguments, this_ptr, "mergefindparameters", NULL, 439, &findParams, parameters); zephir_check_call_status(); if (Z_TYPE_P(&extraParameters) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&findParams, this_ptr, "mergefindparameters", NULL, 445, &extraParameters, &findArguments); + ZEPHIR_CALL_METHOD(&findParams, this_ptr, "mergefindparameters", NULL, 439, &extraParameters, &findArguments); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&findParams, &findArguments); @@ -2972,7 +2972,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getWriteConnection) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -3006,7 +3006,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getWriteConnectionService) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -3073,7 +3073,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, hasBelongsTo) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "belongsTo"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 446, &_0, &modelName, &modelRelation); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 440, &_0, &modelName, &modelRelation); zephir_check_call_status(); RETURN_MM(); } @@ -3130,7 +3130,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, hasHasMany) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "hasMany"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 446, &_0, &modelName, &modelRelation); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 440, &_0, &modelName, &modelRelation); zephir_check_call_status(); RETURN_MM(); } @@ -3187,7 +3187,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, hasHasManyToMany) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "hasManyToMany"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 446, &_0, &modelName, &modelRelation); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 440, &_0, &modelName, &modelRelation); zephir_check_call_status(); RETURN_MM(); } @@ -3244,7 +3244,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, hasHasOne) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "hasOne"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 446, &_0, &modelName, &modelRelation); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 440, &_0, &modelName, &modelRelation); zephir_check_call_status(); RETURN_MM(); } @@ -3301,7 +3301,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, hasHasOneThrough) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "hasOneThrough"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 446, &_0, &modelName, &modelRelation); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 440, &_0, &modelName, &modelRelation); zephir_check_call_status(); RETURN_MM(); } @@ -3330,7 +3330,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, initialize) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -3426,7 +3426,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, isKeepingSnapshots) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -3464,7 +3464,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, isUsingDynamicUpdate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -3523,7 +3523,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, isVisibleModelProperty) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_STR(property) ZEND_PARSE_PARAMETERS_END(); #endif @@ -3542,10 +3542,10 @@ 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, 150, &className); + ZEPHIR_CALL_METHOD(NULL, &classReflection, "__construct", NULL, 144, &className); zephir_check_call_status(); ZVAL_LONG(&_1$$3, 1); - ZEPHIR_CALL_METHOD(&reflectionProperties, &classReflection, "getproperties", NULL, 161, &_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", 1905); if (Z_TYPE_P(&reflectionProperties) == IS_ARRAY) { @@ -3605,7 +3605,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, keepSnapshots) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_BOOL(keepSnapshots) ZEND_PARSE_PARAMETERS_END(); #endif @@ -3726,7 +3726,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, notifyEvent) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(eventName) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -3844,7 +3844,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, missingMethod) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(3, 3) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_STR(eventName) Z_PARAM_ZVAL(data) ZEND_PARSE_PARAMETERS_END(); @@ -3936,7 +3936,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, setConnectionService) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_STR(connectionService) ZEND_PARSE_PARAMETERS_END(); #endif @@ -3982,8 +3982,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, setCustomEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -4014,7 +4014,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, setDI) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -4041,7 +4041,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, setEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -4132,7 +4132,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, setModelSchema) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_STR(schema) ZEND_PARSE_PARAMETERS_END(); #endif @@ -4178,7 +4178,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, setModelSource) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_STR(source) ZEND_PARSE_PARAMETERS_END(); #endif @@ -4224,7 +4224,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, setReadConnectionService) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_STR(connectionService) ZEND_PARSE_PARAMETERS_END(); #endif @@ -4325,7 +4325,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, setWriteConnectionService) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_STR(connectionService) ZEND_PARSE_PARAMETERS_END(); #endif @@ -4372,7 +4372,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, useDynamicUpdate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_BOOL(dynamicUpdate) ZEND_PARSE_PARAMETERS_END(); #endif @@ -4421,7 +4421,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getConnection) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_ARRAY(connectionServices) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model/metadata.zep.c b/ext/phalcon/mvc/model/metadata.zep.c index 7402841f85..5e56c77dd4 100644 --- a/ext/phalcon/mvc/model/metadata.zep.c +++ b/ext/phalcon/mvc/model/metadata.zep.c @@ -12,10 +12,10 @@ #include #include "kernel/main.h" +#include "kernel/object.h" #include "kernel/fcall.h" #include "kernel/exception.h" #include "kernel/memory.h" -#include "kernel/object.h" #include "kernel/operators.h" #include "kernel/array.h" #include "ext/spl/spl_exceptions.h" @@ -113,6 +113,18 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Model_MetaData) return SUCCESS; } +/** + * Return the internal cache adapter + */ +PHP_METHOD(Phalcon_Mvc_Model_MetaData, getAdapter) +{ + zval *this_ptr = getThis(); + + + + RETURN_MEMBER(getThis(), "adapter"); +} + /** * Returns table attributes names (fields) * @@ -137,7 +149,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getAttributes) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -150,7 +162,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getAttributes) 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); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The meta-data is invalid or is corrupt", "phalcon/Mvc/Model/MetaData.zep", 110); return; } RETURN_CCTOR(&data); @@ -180,7 +192,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getAutomaticCreateAttributes) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -193,7 +205,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getAutomaticCreateAttributes) 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); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The meta-data is invalid or is corrupt", "phalcon/Mvc/Model/MetaData.zep", 137); return; } RETURN_CCTOR(&data); @@ -223,7 +235,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getAutomaticUpdateAttributes) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -236,7 +248,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getAutomaticUpdateAttributes) 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); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The meta-data is invalid or is corrupt", "phalcon/Mvc/Model/MetaData.zep", 164); return; } RETURN_CCTOR(&data); @@ -266,7 +278,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getBindTypes) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -279,7 +291,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getBindTypes) 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); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The meta-data is invalid or is corrupt", "phalcon/Mvc/Model/MetaData.zep", 191); return; } RETURN_CCTOR(&data); @@ -310,7 +322,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getColumnMap) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -327,7 +339,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getColumnMap) _1 = Z_TYPE_P(&data) != IS_ARRAY; } if (UNEXPECTED(_1)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The meta-data is invalid or is corrupt", "phalcon/Mvc/Model/MetaData.zep", 207); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The meta-data is invalid or is corrupt", "phalcon/Mvc/Model/MetaData.zep", 215); return; } RETURN_CCTOR(&data); @@ -357,7 +369,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getDefaultValues) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -370,7 +382,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getDefaultValues) 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); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The meta-data is invalid or is corrupt", "phalcon/Mvc/Model/MetaData.zep", 239); return; } RETURN_CCTOR(&data); @@ -400,7 +412,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getDataTypes) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -413,7 +425,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getDataTypes) 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); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The meta-data is invalid or is corrupt", "phalcon/Mvc/Model/MetaData.zep", 263); return; } RETURN_CCTOR(&data); @@ -443,7 +455,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getDataTypesNumeric) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -456,7 +468,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getDataTypesNumeric) 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); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The meta-data is invalid or is corrupt", "phalcon/Mvc/Model/MetaData.zep", 290); return; } RETURN_CCTOR(&data); @@ -480,7 +492,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getDI) 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_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injection container is required to access internal services", "phalcon/Mvc/Model/MetaData.zep", 300); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injection container is required to access internal services", "phalcon/Mvc/Model/MetaData.zep", 308); return; } RETURN_CCTOR(&container); @@ -510,7 +522,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getEmptyStringAttributes) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -523,7 +535,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getEmptyStringAttributes) 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); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The meta-data is invalid or is corrupt", "phalcon/Mvc/Model/MetaData.zep", 335); return; } RETURN_CCTOR(&data); @@ -552,7 +564,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getIdentityField) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -591,7 +603,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getNonPrimaryKeyAttributes) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -604,7 +616,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getNonPrimaryKeyAttributes) 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); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The meta-data is invalid or is corrupt", "phalcon/Mvc/Model/MetaData.zep", 375); return; } RETURN_CCTOR(&data); @@ -634,7 +646,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getNotNullAttributes) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -647,7 +659,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getNotNullAttributes) 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); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The meta-data is invalid or is corrupt", "phalcon/Mvc/Model/MetaData.zep", 399); return; } RETURN_CCTOR(&data); @@ -677,7 +689,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getPrimaryKeyAttributes) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -690,7 +702,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getPrimaryKeyAttributes) 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); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The meta-data is invalid or is corrupt", "phalcon/Mvc/Model/MetaData.zep", 423); return; } RETURN_CCTOR(&data); @@ -721,7 +733,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getReverseColumnMap) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -738,7 +750,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getReverseColumnMap) _1 = Z_TYPE_P(&data) != IS_ARRAY; } if (UNEXPECTED(_1)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The meta-data is invalid or is corrupt", "phalcon/Mvc/Model/MetaData.zep", 442); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The meta-data is invalid or is corrupt", "phalcon/Mvc/Model/MetaData.zep", 450); return; } RETURN_CCTOR(&data); @@ -802,7 +814,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, hasAttribute) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_STR(attribute) ZEND_PARSE_PARAMETERS_END(); #endif @@ -820,7 +832,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, hasAttribute) } 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); + zephir_array_fetch_long(&_1, &_0, 4, PH_READONLY, "phalcon/Mvc/Model/MetaData.zep", 490); RETURN_MM_BOOL(zephir_array_isset(&_1, &attribute)); } @@ -914,7 +926,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, readColumnMap) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -938,7 +950,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, readColumnMap) zephir_check_call_status(); zephir_read_property(&_1$$4, this_ptr, ZEND_STRL("columnMap"), PH_NOISY_CC | PH_READONLY); ZEPHIR_OBS_NVAR(&data); - zephir_array_fetch(&data, &_1$$4, &keyName, PH_NOISY, "phalcon/Mvc/Model/MetaData.zep", 531); + zephir_array_fetch(&data, &_1$$4, &keyName, PH_NOISY, "phalcon/Mvc/Model/MetaData.zep", 539); } RETURN_CCTOR(&data); } @@ -973,7 +985,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, readColumnMapIndex) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_LONG(index) ZEND_PARSE_PARAMETERS_END(); #endif @@ -999,7 +1011,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, readColumnMapIndex) zephir_check_call_status(); zephir_read_property(&_1$$4, this_ptr, ZEND_STRL("columnMap"), PH_NOISY_CC | PH_READONLY); ZEPHIR_OBS_NVAR(&columnMapModel); - zephir_array_fetch(&columnMapModel, &_1$$4, &keyName, PH_NOISY, "phalcon/Mvc/Model/MetaData.zep", 562); + zephir_array_fetch(&columnMapModel, &_1$$4, &keyName, PH_NOISY, "phalcon/Mvc/Model/MetaData.zep", 570); } zephir_array_isset_long_fetch(&map, &columnMapModel, index, 1); RETURN_CTOR(&map); @@ -1036,7 +1048,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, readMetaData) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1060,7 +1072,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, readMetaData) zephir_check_call_status(); } zephir_read_property(&_3, this_ptr, ZEND_STRL("metaData"), PH_NOISY_CC | PH_READONLY); - zephir_array_fetch(&_4, &_3, &key, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/MetaData.zep", 598); + zephir_array_fetch(&_4, &_3, &key, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/MetaData.zep", 606); RETURN_CTOR(&_4); } @@ -1098,7 +1110,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, readMetaDataIndex) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_LONG(index) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1119,14 +1131,14 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, readMetaDataIndex) ZEPHIR_CONCAT_VSVV(&_1, &_0, "-", &schema, &source); zephir_get_strval(&key, &_1); 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); + zephir_array_fetch(&_3, &_2, &key, PH_READONLY, "phalcon/Mvc/Model/MetaData.zep", 634); if (!(zephir_array_isset_long(&_3, index))) { 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); - zephir_array_fetch(&_5, &_4, &key, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/MetaData.zep", 630); - zephir_array_fetch_long(&_6, &_5, index, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/MetaData.zep", 630); + zephir_array_fetch(&_5, &_4, &key, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/MetaData.zep", 638); + zephir_array_fetch_long(&_6, &_5, index, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/MetaData.zep", 638); RETURN_CTOR(&_6); } @@ -1184,7 +1196,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, setAutomaticCreateAttributes) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_ARRAY(attributes) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1227,7 +1239,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, setAutomaticUpdateAttributes) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_ARRAY(attributes) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1270,7 +1282,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, setEmptyStringAttributes) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_ARRAY(attributes) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1299,7 +1311,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, setDI) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1322,7 +1334,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, setStrategy) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(strategy, phalcon_mvc_model_metadata_strategy_strategyinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(strategy, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\metadata\\strategy\\strategyinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1440,7 +1452,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, writeMetaDataIndex) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(3, 3) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_LONG(index) Z_PARAM_ZVAL(data) ZEND_PARSE_PARAMETERS_END(); @@ -1461,7 +1473,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, writeMetaDataIndex) _1 = ((Z_TYPE_P(data) == IS_TRUE || Z_TYPE_P(data) == IS_FALSE) != 1); } if (UNEXPECTED(_1)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid data for index", "phalcon/Mvc/Model/MetaData.zep", 765); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid data for index", "phalcon/Mvc/Model/MetaData.zep", 773); return; } ZEPHIR_CALL_METHOD(&source, model, "getsource", NULL, 0); @@ -1515,7 +1527,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, initialize) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(4, 4) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_ZVAL(key) Z_PARAM_ZVAL(table) Z_PARAM_ZVAL(schema) @@ -1553,7 +1565,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, initialize) ZEPHIR_CONCAT_SV(&_3$$8, "Invalid meta-data for model ", &className); 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_throw_exception_debug(&_2$$8, "phalcon/Mvc/Model/MetaData.zep", 825); ZEPHIR_MM_RESTORE(); return; } @@ -1636,7 +1648,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, throwWriteException) object_init_ex(&_0$$3, phalcon_mvc_model_exception_ce); 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_throw_exception_debug(&_0$$3, "phalcon/Mvc/Model/MetaData.zep", 909); ZEPHIR_MM_RESTORE(); return; } else { diff --git a/ext/phalcon/mvc/model/metadata.zep.h b/ext/phalcon/mvc/model/metadata.zep.h index 902dabd316..deb68b7c12 100644 --- a/ext/phalcon/mvc/model/metadata.zep.h +++ b/ext/phalcon/mvc/model/metadata.zep.h @@ -3,6 +3,7 @@ extern zend_class_entry *phalcon_mvc_model_metadata_ce; ZEPHIR_INIT_CLASS(Phalcon_Mvc_Model_MetaData); +PHP_METHOD(Phalcon_Mvc_Model_MetaData, getAdapter); PHP_METHOD(Phalcon_Mvc_Model_MetaData, getAttributes); PHP_METHOD(Phalcon_Mvc_Model_MetaData, getAutomaticCreateAttributes); PHP_METHOD(Phalcon_Mvc_Model_MetaData, getAutomaticUpdateAttributes); @@ -39,6 +40,9 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, throwWriteException); PHP_METHOD(Phalcon_Mvc_Model_MetaData, getArrVal); zend_object *zephir_init_properties_Phalcon_Mvc_Model_MetaData(zend_class_entry *class_type); +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_model_metadata_getadapter, 0, 0, Phalcon\\Cache\\Adapter\\AdapterInterface, 1) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_metadata_getattributes, 0, 1, IS_ARRAY, 0) ZEND_ARG_OBJ_INFO(0, model, Phalcon\\Mvc\\ModelInterface, 0) ZEND_END_ARG_INFO() @@ -197,6 +201,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_metadata_zephir_init_properties ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_mvc_model_metadata_method_entry) { + PHP_ME(Phalcon_Mvc_Model_MetaData, getAdapter, arginfo_phalcon_mvc_model_metadata_getadapter, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model_MetaData, getAttributes, arginfo_phalcon_mvc_model_metadata_getattributes, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model_MetaData, getAutomaticCreateAttributes, arginfo_phalcon_mvc_model_metadata_getautomaticcreateattributes, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model_MetaData, getAutomaticUpdateAttributes, arginfo_phalcon_mvc_model_metadata_getautomaticupdateattributes, ZEND_ACC_PUBLIC) diff --git a/ext/phalcon/mvc/model/metadata/apcu.zep.c b/ext/phalcon/mvc/model/metadata/apcu.zep.c index 90609a0c7b..5dbd2edf30 100644 --- a/ext/phalcon/mvc/model/metadata/apcu.zep.c +++ b/ext/phalcon/mvc/model/metadata/apcu.zep.c @@ -77,7 +77,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData_Apcu, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_cache_adapterfactory_ce) + Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\cache\\adapterfactory"))) Z_PARAM_OPTIONAL Z_PARAM_ARRAY_OR_NULL(options) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/phalcon/mvc/model/metadata/libmemcached.zep.c b/ext/phalcon/mvc/model/metadata/libmemcached.zep.c index a8352afaf1..463ce1702a 100644 --- a/ext/phalcon/mvc/model/metadata/libmemcached.zep.c +++ b/ext/phalcon/mvc/model/metadata/libmemcached.zep.c @@ -67,7 +67,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData_Libmemcached, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_cache_adapterfactory_ce) + Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\cache\\adapterfactory"))) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/phalcon/mvc/model/metadata/redis.zep.c b/ext/phalcon/mvc/model/metadata/redis.zep.c index 1815760db0..8e1b8592b1 100644 --- a/ext/phalcon/mvc/model/metadata/redis.zep.c +++ b/ext/phalcon/mvc/model/metadata/redis.zep.c @@ -80,7 +80,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData_Redis, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_cache_adapterfactory_ce) + Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\cache\\adapterfactory"))) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/phalcon/mvc/model/metadata/strategy/annotations.zep.c b/ext/phalcon/mvc/model/metadata/strategy/annotations.zep.c index d5a21d567a..9b4492aa3f 100644 --- a/ext/phalcon/mvc/model/metadata/strategy/annotations.zep.c +++ b/ext/phalcon/mvc/model/metadata/strategy/annotations.zep.c @@ -77,8 +77,8 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData_Strategy_Annotations, getColumnMaps) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) - Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -399,8 +399,8 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData_Strategy_Annotations, getMetaData) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) - Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model/metadata/strategy/introspection.zep.c b/ext/phalcon/mvc/model/metadata/strategy/introspection.zep.c index 2c56a0c12d..8ec496772e 100644 --- a/ext/phalcon/mvc/model/metadata/strategy/introspection.zep.c +++ b/ext/phalcon/mvc/model/metadata/strategy/introspection.zep.c @@ -65,8 +65,8 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData_Strategy_Introspection, getColumnMaps) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) - Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -193,8 +193,8 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData_Strategy_Introspection, getMetaData) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) - Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model/metadata/stream.zep.c b/ext/phalcon/mvc/model/metadata/stream.zep.c index e8eec8646d..19f049a739 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 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1048,7 +1048,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, setTransaction) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(transaction, phalcon_mvc_model_transactioninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(transaction, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\transactioninterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1181,12 +1181,12 @@ 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, 456, &model, &intermediate, &bindParams, &bindTypes); + ZEPHIR_CALL_METHOD(&records, this_ptr, "getrelatedrecords", NULL, 450, &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, 457, &_2$$5); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 451, &_2$$5); zephir_check_call_status(); RETURN_MM(); } @@ -1211,7 +1211,7 @@ 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, 457, &_7$$7, &record); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 451, &_7$$7, &record); zephir_check_call_status(); RETURN_MM(); } @@ -1222,7 +1222,7 @@ 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, 457, &_9); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 451, &_9); zephir_check_call_status(); RETURN_MM(); } @@ -1520,7 +1520,7 @@ 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, 457, &_34, &insertModel); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 451, &_34, &insertModel); zephir_check_call_status(); RETURN_MM(); } @@ -2404,7 +2404,7 @@ 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, 440, &resultsetClassName, &_93$$97); + ZEPHIR_CALL_FUNCTION(&_94$$97, "is_subclass_of", NULL, 434, &resultsetClassName, &_93$$97); zephir_check_call_status(); if (UNEXPECTED(!zephir_is_true(&_94$$97))) { ZEPHIR_INIT_VAR(&_95$$99); @@ -2437,12 +2437,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) } else { ZVAL_BOOL(&_98$$83, 0); } - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 458, &simpleColumnMap, &resultObject, &resultData, &cache, &_98$$83); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 452, &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, 459, &columns1, &resultData, &cache); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 453, &columns1, &resultData, &cache); zephir_check_call_status(); RETURN_MM(); } @@ -2706,12 +2706,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) } ZEPHIR_INIT_NVAR(&field); ZEPHIR_INIT_NVAR(&number); - ZEPHIR_CALL_METHOD(&records, this_ptr, "getrelatedrecords", NULL, 456, &model, &intermediate, &selectBindParams, &selectBindTypes); + ZEPHIR_CALL_METHOD(&records, this_ptr, "getrelatedrecords", NULL, 450, &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, 457, &_28$$23); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 451, &_28$$23); zephir_check_call_status(); RETURN_MM(); } @@ -2738,7 +2738,7 @@ 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, 457, &_33$$25, &record); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 451, &_33$$25, &record); zephir_check_call_status(); RETURN_MM(); } @@ -2749,7 +2749,7 @@ 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, 457, &_35); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 451, &_35); zephir_check_call_status(); RETURN_MM(); } @@ -2786,7 +2786,7 @@ 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, 460, &argument); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getexpression", NULL, 454, &argument); zephir_check_call_status(); RETURN_MM(); } @@ -2851,11 +2851,11 @@ 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", 1545); - ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 460, &_5$$4); + ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 454, &_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", 1546); - ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 460, &_7$$4); + ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 454, &_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", 1547); @@ -2864,7 +2864,7 @@ 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", 1551); - ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "getexpression", &_6, 460, &_10$$5); + ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "getexpression", &_6, 454, &_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", 1552); @@ -2886,11 +2886,11 @@ 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", 1545); - ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 460, &_13$$7); + ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 454, &_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", 1546); - ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 460, &_14$$7); + ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 454, &_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", 1547); @@ -2899,7 +2899,7 @@ 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", 1551); - ZEPHIR_CALL_METHOD(&_16$$8, this_ptr, "getexpression", &_6, 460, &_17$$8); + ZEPHIR_CALL_METHOD(&_16$$8, this_ptr, "getexpression", &_6, 454, &_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", 1552); @@ -2912,7 +2912,7 @@ 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", 1558); - ZEPHIR_CALL_METHOD(&_18, this_ptr, "getexpression", &_6, 460, &_19); + ZEPHIR_CALL_METHOD(&_18, this_ptr, "getexpression", &_6, 454, &_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); @@ -3071,7 +3071,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) } else { ZVAL_BOOL(&_0$$5, 0); } - ZEPHIR_CALL_METHOD(&left, this_ptr, "getexpression", NULL, 460, &exprLeft, &_0$$5); + ZEPHIR_CALL_METHOD(&left, this_ptr, "getexpression", NULL, 454, &exprLeft, &_0$$5); zephir_check_call_status(); } ZEPHIR_OBS_VAR(&exprRight); @@ -3081,7 +3081,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) } else { ZVAL_BOOL(&_1$$6, 0); } - ZEPHIR_CALL_METHOD(&right, this_ptr, "getexpression", NULL, 460, &exprRight, &_1$$6); + ZEPHIR_CALL_METHOD(&right, this_ptr, "getexpression", NULL, 454, &exprRight, &_1$$6); zephir_check_call_status(); } } @@ -3166,7 +3166,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) break; } if (ZEPHIR_IS_LONG(&exprType, 355)) { - ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "getqualified", NULL, 461, &expr); + ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "getqualified", NULL, 455, &expr); zephir_check_call_status(); break; } @@ -3661,12 +3661,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) break; } if (ZEPHIR_IS_LONG(&exprType, 350)) { - ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "getfunctioncall", NULL, 462, &expr); + ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "getfunctioncall", NULL, 456, &expr); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(&exprType, 409)) { - ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "getcaseexpression", NULL, 463, &expr); + ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "getcaseexpression", NULL, 457, &expr); zephir_check_call_status(); break; } @@ -3675,7 +3675,7 @@ 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, 452, &expr, &_83$$69); + ZEPHIR_CALL_METHOD(&_82$$69, this_ptr, "_prepareselect", NULL, 446, &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); @@ -3695,7 +3695,7 @@ 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, 461, &expr); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualified", NULL, 455, &expr); zephir_check_call_status(); RETURN_MM(); } @@ -3708,7 +3708,7 @@ 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, 460, &exprListItem); + ZEPHIR_CALL_METHOD(&_88$$73, this_ptr, "getexpression", NULL, 454, &exprListItem); zephir_check_call_status(); zephir_array_append(&listItems, &_88$$73, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2158); } ZEND_HASH_FOREACH_END(); @@ -3723,7 +3723,7 @@ 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, 460, &exprListItem); + ZEPHIR_CALL_METHOD(&_89$$74, this_ptr, "getexpression", NULL, 454, &exprListItem); zephir_check_call_status(); zephir_array_append(&listItems, &_89$$74, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2158); ZEPHIR_CALL_METHOD(NULL, &expr, "next", NULL, 0); @@ -3794,7 +3794,7 @@ 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, 464, &argument); + ZEPHIR_CALL_METHOD(&_2$$7, this_ptr, "getcallargument", &_3, 458, &argument); zephir_check_call_status(); zephir_array_append(&functionArgs, &_2$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2191); } ZEND_HASH_FOREACH_END(); @@ -3809,7 +3809,7 @@ 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, 464, &argument); + ZEPHIR_CALL_METHOD(&_4$$8, this_ptr, "getcallargument", &_3, 458, &argument); zephir_check_call_status(); zephir_array_append(&functionArgs, &_4$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2191); ZEPHIR_CALL_METHOD(NULL, &arguments, "next", NULL, 0); @@ -3820,7 +3820,7 @@ 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, 464, &arguments); + ZEPHIR_CALL_METHOD(&_6$$9, this_ptr, "getcallargument", &_3, 458, &arguments); zephir_check_call_status(); zephir_array_fast_append(&_5$$9, &_6$$9); ZEPHIR_CPY_WRT(&functionArgs, &_5$$9); @@ -3896,7 +3896,7 @@ 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, 460, &groupItem); + ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "getexpression", &_3, 454, &groupItem); zephir_check_call_status(); zephir_array_append(&groupParts, &_2$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2237); } ZEND_HASH_FOREACH_END(); @@ -3911,7 +3911,7 @@ 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, 460, &groupItem); + ZEPHIR_CALL_METHOD(&_4$$5, this_ptr, "getexpression", &_3, 454, &groupItem); zephir_check_call_status(); zephir_array_append(&groupParts, &_4$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2237); ZEPHIR_CALL_METHOD(NULL, &group, "next", NULL, 0); @@ -3922,7 +3922,7 @@ 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, 460, &group); + ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "getexpression", &_3, 454, &group); zephir_check_call_status(); zephir_array_fast_append(&_5$$6, &_6$$6); ZEPHIR_CPY_WRT(&groupParts, &_5$$6); @@ -3964,13 +3964,13 @@ 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, 460, &number); + ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "getexpression", NULL, 454, &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, 460, &offset); + ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "getexpression", NULL, 454, &offset); zephir_check_call_status(); zephir_array_update_string(&limit, SL("offset"), &_1$$4, PH_COPY | PH_SEPARATE); } @@ -3999,7 +3999,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoin) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(manager, phalcon_mvc_model_managerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(manager, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\managerinterface"))) Z_PARAM_ARRAY(join) ZEND_PARSE_PARAMETERS_END(); #endif @@ -4290,7 +4290,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) { ZEPHIR_INIT_NVAR(&joinItem); ZVAL_COPY(&joinItem, _1); - ZEPHIR_CALL_METHOD(&joinData, this_ptr, "getjoin", &_3, 465, &manager, &joinItem); + ZEPHIR_CALL_METHOD(&joinData, this_ptr, "getjoin", &_3, 459, &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", 2382); @@ -4304,7 +4304,7 @@ 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, 466, &joinItem); + ZEPHIR_CALL_METHOD(&joinType, this_ptr, "getjointype", &_4, 460, &joinItem); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&aliasExpr); if (zephir_array_isset_string_fetch(&aliasExpr, &joinItem, SL("alias"), 0)) { @@ -4368,7 +4368,7 @@ 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, 465, &manager, &joinItem); + ZEPHIR_CALL_METHOD(&joinData, this_ptr, "getjoin", &_3, 459, &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", 2382); @@ -4383,7 +4383,7 @@ 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, 466, &joinItem); + ZEPHIR_CALL_METHOD(&joinType, this_ptr, "getjointype", &_4, 460, &joinItem); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&aliasExpr); if (zephir_array_isset_string_fetch(&aliasExpr, &joinItem, SL("alias"), 0)) { @@ -4460,7 +4460,7 @@ 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, 460, &joinExpr); + ZEPHIR_CALL_METHOD(&_23$$18, this_ptr, "getexpression", &_24, 454, &joinExpr); zephir_check_call_status(); zephir_array_update_zval(&joinPreCondition, &joinAliasName, &_23$$18, PH_COPY | PH_SEPARATE); } @@ -4480,7 +4480,7 @@ 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, 460, &joinExpr); + ZEPHIR_CALL_METHOD(&_25$$20, this_ptr, "getexpression", &_24, 454, &joinExpr); zephir_check_call_status(); zephir_array_update_zval(&joinPreCondition, &joinAliasName, &_25$$20, PH_COPY | PH_SEPARATE); } @@ -4651,10 +4651,10 @@ 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, 467, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); + ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 461, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); zephir_check_call_status(); } else { - ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 468, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); + ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 462, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { @@ -4757,10 +4757,10 @@ 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, 467, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); + ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 461, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); zephir_check_call_status(); } else { - ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 468, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); + ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 462, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { @@ -4881,10 +4881,10 @@ 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, 467, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); + ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 461, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); zephir_check_call_status(); } else { - ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 468, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); + ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 462, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { @@ -4987,10 +4987,10 @@ 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, 467, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); + ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 461, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); zephir_check_call_status(); } else { - ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 468, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); + ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 462, &joinType, &joinSource, &modelAlias, &joinAlias, &relation); zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { @@ -5126,7 +5126,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin) Z_PARAM_ZVAL(joinSource) Z_PARAM_STR(modelAlias) Z_PARAM_STR(joinAlias) - Z_PARAM_OBJECT_OF_CLASS(relation, phalcon_mvc_model_relationinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(relation, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\relationinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -5206,7 +5206,7 @@ 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, 461, &_10$$4); + ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "getqualified", &_11, 455, &_10$$4); zephir_check_call_status(); zephir_array_update_string(&sqlEqualsJoinCondition, SL("left"), &_9$$4, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_12$$4); @@ -5214,7 +5214,7 @@ 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, 461, &_12$$4); + ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "getqualified", &_11, 455, &_12$$4); zephir_check_call_status(); zephir_array_update_string(&sqlEqualsJoinCondition, SL("right"), &_9$$4, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -5254,7 +5254,7 @@ 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, 461, &_18$$6); + ZEPHIR_CALL_METHOD(&_17$$6, this_ptr, "getqualified", &_11, 455, &_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); @@ -5262,7 +5262,7 @@ 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, 461, &_19$$6); + ZEPHIR_CALL_METHOD(&_17$$6, this_ptr, "getqualified", &_11, 455, &_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); @@ -5294,7 +5294,7 @@ 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, 461, &_25$$8); + ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 455, &_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); @@ -5302,7 +5302,7 @@ 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, 461, &_26$$8); + ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 455, &_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); @@ -5323,7 +5323,7 @@ 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, 461, &_27$$8); + ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 455, &_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); @@ -5331,7 +5331,7 @@ 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, 461, &_28$$8); + ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 455, &_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); @@ -5403,7 +5403,7 @@ 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", 2894); - ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 460, &_2$$5); + ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 454, &_2$$5); zephir_check_call_status(); if (zephir_array_isset_string_fetch(&orderSort, &orderItem, SL("sort"), 1)) { if (ZEPHIR_IS_LONG(&orderSort, 327)) { @@ -5442,7 +5442,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", 2894); - ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 460, &_8$$10); + ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 454, &_8$$10); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&orderSort); if (zephir_array_isset_string_fetch(&orderSort, &orderItem, SL("sort"), 0)) { @@ -5795,7 +5795,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getReadConnection) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 4) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_OPTIONAL Z_PARAM_ARRAY_OR_NULL(intermediate) Z_PARAM_ARRAY(bindParams) @@ -5883,7 +5883,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getRelatedRecords) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(4, 4) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_ARRAY(intermediate) Z_PARAM_ARRAY(bindParams) Z_PARAM_ARRAY(bindTypes) @@ -5929,17 +5929,17 @@ 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, 469); + ZEPHIR_CALL_METHOD(NULL, &query, "__construct", NULL, 463); 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, 470, &_5); + ZEPHIR_CALL_METHOD(NULL, &query, "setdi", NULL, 464, &_5); zephir_check_call_status(); ZVAL_LONG(&_6, 309); - ZEPHIR_CALL_METHOD(NULL, &query, "settype", NULL, 471, &_6); + ZEPHIR_CALL_METHOD(NULL, &query, "settype", NULL, 465, &_6); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &query, "setintermediate", NULL, 472, &selectIr); + ZEPHIR_CALL_METHOD(NULL, &query, "setintermediate", NULL, 466, &selectIr); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(&query, "execute", NULL, 473, &bindParams, &bindTypes); + ZEPHIR_RETURN_CALL_METHOD(&query, "execute", NULL, 467, &bindParams, &bindTypes); zephir_check_call_status(); RETURN_MM(); } @@ -6137,7 +6137,7 @@ 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", 3294); - ZEPHIR_CALL_METHOD(&sqlExprColumn, this_ptr, "getexpression", NULL, 460, &columnData); + ZEPHIR_CALL_METHOD(&sqlExprColumn, this_ptr, "getexpression", NULL, 454, &columnData); zephir_check_call_status(); ZEPHIR_OBS_VAR(&balias); if (zephir_array_isset_string_fetch(&balias, &sqlExprColumn, SL("balias"), 0)) { @@ -6220,7 +6220,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) Z_PARAM_ZVAL(joinSource) Z_PARAM_STR(modelAlias) Z_PARAM_STR(joinAlias) - Z_PARAM_OBJECT_OF_CLASS(relation, phalcon_mvc_model_relationinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(relation, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\relationinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -6258,7 +6258,7 @@ 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, 461, &_3$$3); + ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getqualified", NULL, 455, &_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); @@ -6266,7 +6266,7 @@ 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, 461, &_4$$3); + ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getqualified", NULL, 455, &_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); @@ -6308,7 +6308,7 @@ 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, 461, &_15$$5); + ZEPHIR_CALL_METHOD(&_14$$5, this_ptr, "getqualified", NULL, 455, &_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); @@ -6316,7 +6316,7 @@ 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, 461, &_16$$5); + ZEPHIR_CALL_METHOD(&_14$$5, this_ptr, "getqualified", NULL, 455, &_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", 3403); @@ -6356,7 +6356,7 @@ 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, 461, &_22$$7); + ZEPHIR_CALL_METHOD(&_21$$7, this_ptr, "getqualified", NULL, 455, &_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); @@ -6364,7 +6364,7 @@ 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, 461, &_23$$7); + ZEPHIR_CALL_METHOD(&_21$$7, this_ptr, "getqualified", NULL, 455, &_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", 3403); @@ -6404,7 +6404,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getTable) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(manager, phalcon_mvc_model_managerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(manager, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\managerinterface"))) Z_PARAM_ARRAY(qualifiedName) ZEND_PARSE_PARAMETERS_END(); #endif @@ -6458,7 +6458,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getWriteConnection) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 4) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_OPTIONAL Z_PARAM_ARRAY_OR_NULL(intermediate) Z_PARAM_ARRAY(bindParams) @@ -6707,13 +6707,13 @@ 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, 460, &where, &_10$$17); + ZEPHIR_CALL_METHOD(&_9$$17, this_ptr, "getexpression", NULL, 454, &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, 474, &limit); + ZEPHIR_CALL_METHOD(&_11$$18, this_ptr, "getlimitclause", NULL, 468, &limit); zephir_check_call_status(); zephir_array_update_string(&sqlDelete, SL("limit"), &_11$$18, PH_COPY | PH_SEPARATE); } @@ -6827,7 +6827,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) } else { ZVAL_BOOL(&_8$$7, 0); } - ZEPHIR_CALL_METHOD(&_7$$7, this_ptr, "getexpression", &_9, 460, &exprValue, &_8$$7); + ZEPHIR_CALL_METHOD(&_7$$7, this_ptr, "getexpression", &_9, 454, &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", 3619); @@ -6853,7 +6853,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) } else { ZVAL_BOOL(&_13$$8, 0); } - ZEPHIR_CALL_METHOD(&_12$$8, this_ptr, "getexpression", &_9, 460, &exprValue, &_13$$8); + ZEPHIR_CALL_METHOD(&_12$$8, this_ptr, "getexpression", &_9, 454, &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", 3619); @@ -7710,12 +7710,12 @@ 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, 475, &select); + ZEPHIR_CALL_METHOD(&sqlJoins, this_ptr, "getjoins", NULL, 469, &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, 475, &select); + ZEPHIR_CALL_METHOD(&sqlJoins, this_ptr, "getjoins", NULL, 469, &select); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&sqlJoins); @@ -7731,7 +7731,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) { ZEPHIR_INIT_NVAR(&column); ZVAL_COPY(&column, _82); - ZEPHIR_CALL_METHOD(&_84$$60, this_ptr, "getselectcolumn", &_85, 476, &column); + ZEPHIR_CALL_METHOD(&_84$$60, this_ptr, "getselectcolumn", &_85, 470, &column); zephir_check_call_status(); zephir_is_iterable(&_84$$60, 0, "phalcon/Mvc/Model/Query.zep", 3969); if (Z_TYPE_P(&_84$$60) == IS_ARRAY) { @@ -7816,7 +7816,7 @@ 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, 476, &column); + ZEPHIR_CALL_METHOD(&_94$$75, this_ptr, "getselectcolumn", &_85, 470, &column); zephir_check_call_status(); zephir_is_iterable(&_94$$75, 0, "phalcon/Mvc/Model/Query.zep", 3969); if (Z_TYPE_P(&_94$$75) == IS_ARRAY) { @@ -7911,31 +7911,31 @@ 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, 460, &where); + ZEPHIR_CALL_METHOD(&_104$$92, this_ptr, "getexpression", NULL, 454, &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, 477, &groupBy); + ZEPHIR_CALL_METHOD(&_105$$93, this_ptr, "getgroupclause", NULL, 471, &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, 460, &having); + ZEPHIR_CALL_METHOD(&_106$$94, this_ptr, "getexpression", NULL, 454, &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, 478, &order); + ZEPHIR_CALL_METHOD(&_107$$95, this_ptr, "getorderclause", NULL, 472, &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, 474, &limit); + ZEPHIR_CALL_METHOD(&_108$$96, this_ptr, "getlimitclause", NULL, 468, &limit); zephir_check_call_status(); zephir_array_update_string(&sqlSelect, SL("limit"), &_108$$96, PH_COPY | PH_SEPARATE); } @@ -8191,7 +8191,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } else { ZVAL_BOOL(&_13$$20, 0); } - ZEPHIR_CALL_METHOD(&_11$$20, this_ptr, "getexpression", &_14, 460, &_12$$20, &_13$$20); + ZEPHIR_CALL_METHOD(&_11$$20, this_ptr, "getexpression", &_14, 454, &_12$$20, &_13$$20); zephir_check_call_status(); zephir_array_append(&sqlFields, &_11$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4138); ZEPHIR_OBS_NVAR(&exprColumn); @@ -8206,7 +8206,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } else { ZVAL_BOOL(&_18$$20, 0); } - ZEPHIR_CALL_METHOD(&_17$$20, this_ptr, "getexpression", &_14, 460, &exprColumn, &_18$$20); + ZEPHIR_CALL_METHOD(&_17$$20, this_ptr, "getexpression", &_14, 454, &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", 4143); @@ -8228,7 +8228,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } else { ZVAL_BOOL(&_21$$21, 0); } - ZEPHIR_CALL_METHOD(&_19$$21, this_ptr, "getexpression", &_14, 460, &_20$$21, &_21$$21); + ZEPHIR_CALL_METHOD(&_19$$21, this_ptr, "getexpression", &_14, 454, &_20$$21, &_21$$21); zephir_check_call_status(); zephir_array_append(&sqlFields, &_19$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4138); ZEPHIR_OBS_NVAR(&exprColumn); @@ -8243,7 +8243,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } else { ZVAL_BOOL(&_25$$21, 0); } - ZEPHIR_CALL_METHOD(&_24$$21, this_ptr, "getexpression", &_14, 460, &exprColumn, &_25$$21); + ZEPHIR_CALL_METHOD(&_24$$21, this_ptr, "getexpression", &_14, 454, &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", 4143); @@ -8261,13 +8261,13 @@ 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, 460, &where, &_27$$22); + ZEPHIR_CALL_METHOD(&_26$$22, this_ptr, "getexpression", &_14, 454, &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, 474, &limit); + ZEPHIR_CALL_METHOD(&_28$$23, this_ptr, "getlimitclause", NULL, 468, &limit); zephir_check_call_status(); zephir_array_update_string(&sqlUpdate, SL("limit"), &_28$$23, PH_COPY | PH_SEPARATE); } diff --git a/ext/phalcon/mvc/model/query/builder.zep.c b/ext/phalcon/mvc/model/query/builder.zep.c index 7a843b3cd2..f8965cf78b 100644 --- a/ext/phalcon/mvc/model/query/builder.zep.c +++ b/ext/phalcon/mvc/model/query/builder.zep.c @@ -194,7 +194,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, __construct) ZEND_PARSE_PARAMETERS_START(0, 2) Z_PARAM_OPTIONAL Z_PARAM_ZVAL_OR_NULL(params) - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1082,7 +1082,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getModels) } if (_1) { ZEPHIR_MAKE_REF(&models); - ZEPHIR_RETURN_CALL_FUNCTION("reset", NULL, 479, &models); + ZEPHIR_RETURN_CALL_FUNCTION("reset", NULL, 473, &models); ZEPHIR_UNREF(&models); zephir_check_call_status(); RETURN_MM(); @@ -1333,9 +1333,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql) ZEPHIR_CONCAT_SVS(&_6$$19, "'", &conditions, "'"); ZEPHIR_CPY_WRT(&conditions, &_6$$19); } - ZEPHIR_CALL_METHOD(&_7$$13, this_ptr, "autoescape", NULL, 480, &model); + ZEPHIR_CALL_METHOD(&_7$$13, this_ptr, "autoescape", NULL, 474, &model); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_8$$13, this_ptr, "autoescape", NULL, 480, &attributeField); + ZEPHIR_CALL_METHOD(&_8$$13, this_ptr, "autoescape", NULL, 474, &attributeField); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_9$$13); ZEPHIR_CONCAT_VSVSV(&_9$$13, &_7$$13, ".", &_8$$13, " = ", &conditions); @@ -1382,7 +1382,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql) if (Z_TYPE_P(&columnAlias) == IS_LONG) { zephir_array_append(&selectedColumns, &column, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 793); } else { - ZEPHIR_CALL_METHOD(&_14$$29, this_ptr, "autoescape", NULL, 480, &columnAlias); + ZEPHIR_CALL_METHOD(&_14$$29, this_ptr, "autoescape", NULL, 474, &columnAlias); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_15$$29); ZEPHIR_CONCAT_VSV(&_15$$29, &column, " AS ", &_14$$29); @@ -1405,7 +1405,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql) if (Z_TYPE_P(&columnAlias) == IS_LONG) { zephir_array_append(&selectedColumns, &column, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 793); } else { - ZEPHIR_CALL_METHOD(&_16$$32, this_ptr, "autoescape", NULL, 480, &columnAlias); + ZEPHIR_CALL_METHOD(&_16$$32, this_ptr, "autoescape", NULL, 474, &columnAlias); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_17$$32); ZEPHIR_CONCAT_VSV(&_17$$32, &column, " AS ", &_16$$32); @@ -1441,11 +1441,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql) ZVAL_COPY(&model, _19$$35); ZEPHIR_INIT_NVAR(&selectedColumn); if (Z_TYPE_P(&modelColumnAlias) == IS_LONG) { - ZEPHIR_CALL_METHOD(&_23$$37, this_ptr, "autoescape", NULL, 480, &model); + ZEPHIR_CALL_METHOD(&_23$$37, this_ptr, "autoescape", NULL, 474, &model); zephir_check_call_status(); ZEPHIR_CONCAT_VS(&selectedColumn, &_23$$37, ".*"); } else { - ZEPHIR_CALL_METHOD(&_24$$38, this_ptr, "autoescape", NULL, 480, &modelColumnAlias); + ZEPHIR_CALL_METHOD(&_24$$38, this_ptr, "autoescape", NULL, 474, &modelColumnAlias); zephir_check_call_status(); ZEPHIR_CONCAT_VS(&selectedColumn, &_24$$38, ".*"); } @@ -1466,11 +1466,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&selectedColumn); if (Z_TYPE_P(&modelColumnAlias) == IS_LONG) { - ZEPHIR_CALL_METHOD(&_25$$40, this_ptr, "autoescape", NULL, 480, &model); + ZEPHIR_CALL_METHOD(&_25$$40, this_ptr, "autoescape", NULL, 474, &model); zephir_check_call_status(); ZEPHIR_CONCAT_VS(&selectedColumn, &_25$$40, ".*"); } else { - ZEPHIR_CALL_METHOD(&_26$$41, this_ptr, "autoescape", NULL, 480, &modelColumnAlias); + ZEPHIR_CALL_METHOD(&_26$$41, this_ptr, "autoescape", NULL, 474, &modelColumnAlias); zephir_check_call_status(); ZEPHIR_CONCAT_VS(&selectedColumn, &_26$$41, ".*"); } @@ -1485,7 +1485,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql) zephir_fast_join_str(&_27$$35, SL(", "), &selectedColumns); zephir_concat_self(&phql, &_27$$35); } else { - ZEPHIR_CALL_METHOD(&_28$$42, this_ptr, "autoescape", NULL, 480, &models); + ZEPHIR_CALL_METHOD(&_28$$42, this_ptr, "autoescape", NULL, 474, &models); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_29$$42); ZEPHIR_CONCAT_VS(&_29$$42, &_28$$42, ".*"); @@ -1508,14 +1508,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql) ZEPHIR_INIT_NVAR(&model); ZVAL_COPY(&model, _30$$43); if (Z_TYPE_P(&modelAlias) == IS_STRING) { - ZEPHIR_CALL_METHOD(&_34$$45, this_ptr, "autoescape", NULL, 480, &model); + ZEPHIR_CALL_METHOD(&_34$$45, this_ptr, "autoescape", NULL, 474, &model); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_35$$45, this_ptr, "autoescape", NULL, 480, &modelAlias); + ZEPHIR_CALL_METHOD(&_35$$45, this_ptr, "autoescape", NULL, 474, &modelAlias); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&selectedModel); ZEPHIR_CONCAT_VSV(&selectedModel, &_34$$45, " AS ", &_35$$45); } else { - ZEPHIR_CALL_METHOD(&selectedModel, this_ptr, "autoescape", NULL, 480, &model); + ZEPHIR_CALL_METHOD(&selectedModel, this_ptr, "autoescape", NULL, 474, &model); zephir_check_call_status(); } zephir_array_append(&selectedModels, &selectedModel, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 839); @@ -1534,14 +1534,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql) ZEPHIR_CALL_METHOD(&model, &models, "current", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&modelAlias) == IS_STRING) { - ZEPHIR_CALL_METHOD(&_36$$48, this_ptr, "autoescape", NULL, 480, &model); + ZEPHIR_CALL_METHOD(&_36$$48, this_ptr, "autoescape", NULL, 474, &model); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_37$$48, this_ptr, "autoescape", NULL, 480, &modelAlias); + ZEPHIR_CALL_METHOD(&_37$$48, this_ptr, "autoescape", NULL, 474, &modelAlias); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&selectedModel); ZEPHIR_CONCAT_VSV(&selectedModel, &_36$$48, " AS ", &_37$$48); } else { - ZEPHIR_CALL_METHOD(&selectedModel, this_ptr, "autoescape", NULL, 480, &model); + ZEPHIR_CALL_METHOD(&selectedModel, this_ptr, "autoescape", NULL, 474, &model); zephir_check_call_status(); } zephir_array_append(&selectedModels, &selectedModel, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 839); @@ -1557,7 +1557,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql) ZEPHIR_CONCAT_SV(&_39$$43, " FROM ", &_38$$43); zephir_concat_self(&phql, &_39$$43); } else { - ZEPHIR_CALL_METHOD(&_40$$50, this_ptr, "autoescape", NULL, 480, &models); + ZEPHIR_CALL_METHOD(&_40$$50, this_ptr, "autoescape", NULL, 474, &models); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_41$$50); ZEPHIR_CONCAT_SV(&_41$$50, " FROM ", &_40$$50); @@ -1581,20 +1581,20 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql) ZEPHIR_OBS_NVAR(&joinType); zephir_array_fetch_long(&joinType, &join, 3, PH_NOISY, "phalcon/Mvc/Model/Query/Builder.zep", 872); if (zephir_is_true(&joinType)) { - ZEPHIR_CALL_METHOD(&_44$$53, this_ptr, "autoescape", NULL, 480, &joinModel); + ZEPHIR_CALL_METHOD(&_44$$53, this_ptr, "autoescape", NULL, 474, &joinModel); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_45$$53); ZEPHIR_CONCAT_SVSV(&_45$$53, " ", &joinType, " JOIN ", &_44$$53); zephir_concat_self(&phql, &_45$$53); } else { - ZEPHIR_CALL_METHOD(&_46$$54, this_ptr, "autoescape", NULL, 480, &joinModel); + ZEPHIR_CALL_METHOD(&_46$$54, this_ptr, "autoescape", NULL, 474, &joinModel); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_47$$54); ZEPHIR_CONCAT_SV(&_47$$54, " JOIN ", &_46$$54); zephir_concat_self(&phql, &_47$$54); } if (zephir_is_true(&joinAlias)) { - ZEPHIR_CALL_METHOD(&_48$$55, this_ptr, "autoescape", NULL, 480, &joinAlias); + ZEPHIR_CALL_METHOD(&_48$$55, this_ptr, "autoescape", NULL, 474, &joinAlias); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_49$$55); ZEPHIR_CONCAT_SV(&_49$$55, " AS ", &_48$$55); @@ -1626,20 +1626,20 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql) ZEPHIR_OBS_NVAR(&joinType); zephir_array_fetch_long(&joinType, &join, 3, PH_NOISY, "phalcon/Mvc/Model/Query/Builder.zep", 872); if (zephir_is_true(&joinType)) { - ZEPHIR_CALL_METHOD(&_51$$58, this_ptr, "autoescape", NULL, 480, &joinModel); + ZEPHIR_CALL_METHOD(&_51$$58, this_ptr, "autoescape", NULL, 474, &joinModel); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_52$$58); ZEPHIR_CONCAT_SVSV(&_52$$58, " ", &joinType, " JOIN ", &_51$$58); zephir_concat_self(&phql, &_52$$58); } else { - ZEPHIR_CALL_METHOD(&_53$$59, this_ptr, "autoescape", NULL, 480, &joinModel); + ZEPHIR_CALL_METHOD(&_53$$59, this_ptr, "autoescape", NULL, 474, &joinModel); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_54$$59); ZEPHIR_CONCAT_SV(&_54$$59, " JOIN ", &_53$$59); zephir_concat_self(&phql, &_54$$59); } if (zephir_is_true(&joinAlias)) { - ZEPHIR_CALL_METHOD(&_55$$60, this_ptr, "autoescape", NULL, 480, &joinAlias); + ZEPHIR_CALL_METHOD(&_55$$60, this_ptr, "autoescape", NULL, 474, &joinAlias); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_56$$60); ZEPHIR_CONCAT_SV(&_56$$60, " AS ", &_55$$60); @@ -1674,7 +1674,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql) { ZEPHIR_INIT_NVAR(&groupItem); ZVAL_COPY(&groupItem, _59$$64); - ZEPHIR_CALL_METHOD(&_61$$65, this_ptr, "autoescape", NULL, 480, &groupItem); + ZEPHIR_CALL_METHOD(&_61$$65, this_ptr, "autoescape", NULL, 474, &groupItem); zephir_check_call_status(); zephir_array_append(&groupItems, &_61$$65, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 914); } ZEND_HASH_FOREACH_END(); @@ -1689,7 +1689,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql) } ZEPHIR_CALL_METHOD(&groupItem, &group, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_62$$66, this_ptr, "autoescape", NULL, 480, &groupItem); + ZEPHIR_CALL_METHOD(&_62$$66, this_ptr, "autoescape", NULL, 474, &groupItem); zephir_check_call_status(); zephir_array_append(&groupItems, &_62$$66, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 914); ZEPHIR_CALL_METHOD(NULL, &group, "next", NULL, 0); @@ -1732,7 +1732,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql) ZEPHIR_INIT_NVAR(&itemExplode$$73); zephir_fast_explode_str(&itemExplode$$73, SL(" "), &orderItem, LONG_MAX); zephir_array_fetch_long(&_69$$73, &itemExplode$$73, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query/Builder.zep", 953); - ZEPHIR_CALL_METHOD(&_68$$73, this_ptr, "autoescape", NULL, 480, &_69$$73); + ZEPHIR_CALL_METHOD(&_68$$73, this_ptr, "autoescape", NULL, 474, &_69$$73); zephir_check_call_status(); zephir_array_fetch_long(&_70$$73, &itemExplode$$73, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query/Builder.zep", 953); ZEPHIR_INIT_NVAR(&_71$$73); @@ -1740,7 +1740,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql) zephir_array_append(&orderItems, &_71$$73, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 953); continue; } - ZEPHIR_CALL_METHOD(&_72$$71, this_ptr, "autoescape", NULL, 480, &orderItem); + ZEPHIR_CALL_METHOD(&_72$$71, this_ptr, "autoescape", NULL, 474, &orderItem); zephir_check_call_status(); zephir_array_append(&orderItems, &_72$$71, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 958); } ZEND_HASH_FOREACH_END(); @@ -1763,7 +1763,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql) ZEPHIR_INIT_NVAR(&itemExplode$$76); zephir_fast_explode_str(&itemExplode$$76, SL(" "), &orderItem, LONG_MAX); zephir_array_fetch_long(&_74$$76, &itemExplode$$76, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query/Builder.zep", 953); - ZEPHIR_CALL_METHOD(&_73$$76, this_ptr, "autoescape", NULL, 480, &_74$$76); + ZEPHIR_CALL_METHOD(&_73$$76, this_ptr, "autoescape", NULL, 474, &_74$$76); zephir_check_call_status(); zephir_array_fetch_long(&_75$$76, &itemExplode$$76, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query/Builder.zep", 953); ZEPHIR_INIT_NVAR(&_76$$76); @@ -1771,7 +1771,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql) zephir_array_append(&orderItems, &_76$$76, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 953); continue; } - ZEPHIR_CALL_METHOD(&_77$$74, this_ptr, "autoescape", NULL, 480, &orderItem); + ZEPHIR_CALL_METHOD(&_77$$74, this_ptr, "autoescape", NULL, 474, &orderItem); zephir_check_call_status(); zephir_array_append(&orderItems, &_77$$74, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 958); ZEPHIR_CALL_METHOD(NULL, &order, "next", NULL, 0); @@ -1887,7 +1887,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getQuery) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&phql, this_ptr, "getphql", NULL, 481); + ZEPHIR_CALL_METHOD(&phql, this_ptr, "getphql", NULL, 475); zephir_check_call_status(); zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&container, &_0); @@ -2495,7 +2495,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, limit) ZVAL_LONG(&_0, limit); - ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 285, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 279, &_0); zephir_check_call_status(); limit = zephir_get_numberval(&_1); if (UNEXPECTED(limit == 0)) { @@ -2506,7 +2506,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, limit) zephir_update_property_zval(this_ptr, ZEND_STRL("limit"), &_0); if (zephir_is_numeric(offset)) { ZVAL_LONG(&_2$$4, zephir_get_intval(offset)); - ZEPHIR_CALL_FUNCTION(&_3$$4, "abs", NULL, 285, &_2$$4); + ZEPHIR_CALL_FUNCTION(&_3$$4, "abs", NULL, 279, &_2$$4); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("offset"), &_3$$4); } @@ -3174,7 +3174,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, setDI) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -3351,7 +3351,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, conditionBetween) object_init_ex(&_1$$3, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "Operator % is not available."); - ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 113, &_2$$3, &operator); + ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 107, &_2$$3, &operator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_3$$3); zephir_check_call_status(); @@ -3473,7 +3473,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, conditionIn) object_init_ex(&_1$$3, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "Operator % is not available."); - ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 113, &_2$$3, &operator); + ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 107, &_2$$3, &operator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_3$$3); zephir_check_call_status(); @@ -3634,7 +3634,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, conditionNotBetween) object_init_ex(&_1$$3, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "Operator % is not available."); - ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 113, &_2$$3, &operator); + ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 107, &_2$$3, &operator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_3$$3); zephir_check_call_status(); @@ -3756,7 +3756,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, conditionNotIn) object_init_ex(&_1$$3, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "Operator % is not available."); - ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 113, &_2$$3, &operator); + ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 107, &_2$$3, &operator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_3$$3); zephir_check_call_status(); diff --git a/ext/phalcon/mvc/model/query/status.zep.c b/ext/phalcon/mvc/model/query/status.zep.c index 1d3e076975..d50f9c5374 100644 --- a/ext/phalcon/mvc/model/query/status.zep.c +++ b/ext/phalcon/mvc/model/query/status.zep.c @@ -87,7 +87,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Status, __construct) ZEND_PARSE_PARAMETERS_START(1, 2) Z_PARAM_BOOL(success) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model/resultset/complex.zep.c b/ext/phalcon/mvc/model/resultset/complex.zep.c index ebb1fa36bb..3407356e28 100644 --- a/ext/phalcon/mvc/model/resultset/complex.zep.c +++ b/ext/phalcon/mvc/model/resultset/complex.zep.c @@ -79,7 +79,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, __construct) ZEND_PARSE_PARAMETERS_START(1, 3) 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(result, zephir_get_internal_ce(SL("phalcon\\db\\resultinterface"))) Z_PARAM_ZVAL_OR_NULL(cache) ZEND_PARSE_PARAMETERS_END(); #endif @@ -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, 482); + ZEPHIR_CALL_METHOD(¤t, this_ptr, "current", &_2, 476); zephir_check_call_status(); zephir_array_append(&records, ¤t, PH_SEPARATE, "phalcon/Mvc/Model/Resultset/Complex.zep", 279); ZEPHIR_CALL_METHOD(NULL, this_ptr, "next", &_3, 0); diff --git a/ext/phalcon/mvc/model/row.zep.c b/ext/phalcon/mvc/model/row.zep.c index e701180d13..3b57068989 100644 --- a/ext/phalcon/mvc/model/row.zep.c +++ b/ext/phalcon/mvc/model/row.zep.c @@ -36,7 +36,7 @@ */ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Model_Row) { - ZEPHIR_REGISTER_CLASS(Phalcon\\Mvc\\Model, Row, phalcon, mvc_model_row, phalcon_mvc_model_row_method_entry, 0); + ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Mvc\\Model, Row, phalcon, mvc_model_row, zend_standard_class_def, phalcon_mvc_model_row_method_entry, 0); zend_class_implements(phalcon_mvc_model_row_ce, 1, phalcon_mvc_entityinterface_ce); zend_class_implements(phalcon_mvc_model_row_ce, 1, phalcon_mvc_model_resultinterface_ce); @@ -270,7 +270,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Row, toArray) ZEPHIR_MM_GROW(); - ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 429, this_ptr); + ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 423, 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 5020316ae6..317deccb3a 100644 --- a/ext/phalcon/mvc/model/transaction.zep.c +++ b/ext/phalcon/mvc/model/transaction.zep.c @@ -136,7 +136,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 3) - Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) Z_PARAM_OPTIONAL Z_PARAM_BOOL(autoBegin) Z_PARAM_STR(service) @@ -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, 483); + ZEPHIR_CALL_FUNCTION(&_1$$3, "connection_aborted", NULL, 477); zephir_check_call_status(); if (zephir_is_true(&_1$$3)) { ZEPHIR_INIT_VAR(&_2$$4); @@ -330,7 +330,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction, rollback) ZEND_PARSE_PARAMETERS_START(0, 2) Z_PARAM_OPTIONAL Z_PARAM_STR_OR_NULL(rollbackMessage) - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(rollbackRecord, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(rollbackRecord, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -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, 484, &rollbackMessage, &_4$$7); + ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", NULL, 478, &rollbackMessage, &_4$$7); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model/Transaction.zep", 215); ZEPHIR_MM_RESTORE(); @@ -453,7 +453,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction, setRollbackedRecord) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(record, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(record, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -476,7 +476,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction, setTransactionManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(manager, phalcon_mvc_model_transaction_managerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(manager, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\transaction\\managerinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model/transaction/failed.zep.c b/ext/phalcon/mvc/model/transaction/failed.zep.c index b7f31d9745..a6f8ff23fb 100644 --- a/ext/phalcon/mvc/model/transaction/failed.zep.c +++ b/ext/phalcon/mvc/model/transaction/failed.zep.c @@ -66,7 +66,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction_Failed, __construct) ZEND_PARSE_PARAMETERS_START(1, 2) Z_PARAM_STR(message) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(record, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(record, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model/transaction/manager.zep.c b/ext/phalcon/mvc/model/transaction/manager.zep.c index 1529f44ade..0db97f489d 100644 --- a/ext/phalcon/mvc/model/transaction/manager.zep.c +++ b/ext/phalcon/mvc/model/transaction/manager.zep.c @@ -130,7 +130,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction_Manager, __construct) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 1) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -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, 485, &_2$$4); + ZEPHIR_CALL_FUNCTION(NULL, "register_shutdown_function", NULL, 479, &_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, 486, &container, &_7, &_6); + ZEPHIR_CALL_METHOD(NULL, &transaction, "__construct", NULL, 480, &container, &_7, &_6); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &transaction, "settransactionmanager", NULL, 487, this_ptr); + ZEPHIR_CALL_METHOD(NULL, &transaction, "settransactionmanager", NULL, 481, 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"))); @@ -521,7 +521,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction_Manager, notifyCommit) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(transaction, phalcon_mvc_model_transactioninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(transaction, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\transactioninterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -551,7 +551,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction_Manager, notifyRollback) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(transaction, phalcon_mvc_model_transactioninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(transaction, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\transactioninterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -731,7 +731,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction_Manager, setDI) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -797,7 +797,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction_Manager, collectTransaction) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(transaction, phalcon_mvc_model_transactioninterface_ce) + Z_PARAM_OBJECT_OF_CLASS(transaction, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\transactioninterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model/validationfailed.zep.c b/ext/phalcon/mvc/model/validationfailed.zep.c index c0fb793cb5..2865c2259f 100644 --- a/ext/phalcon/mvc/model/validationfailed.zep.c +++ b/ext/phalcon/mvc/model/validationfailed.zep.c @@ -73,7 +73,7 @@ PHP_METHOD(Phalcon_Mvc_Model_ValidationFailed, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) Z_PARAM_ARRAY(validationMessages) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/router.zep.c b/ext/phalcon/mvc/router.zep.c index 855a484c12..b8969683f3 100644 --- a/ext/phalcon/mvc/router.zep.c +++ b/ext/phalcon/mvc/router.zep.c @@ -1037,7 +1037,7 @@ PHP_METHOD(Phalcon_Mvc_Router, attach) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(route, phalcon_mvc_router_routeinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(route, zephir_get_internal_ce(SL("phalcon\\mvc\\router\\routeinterface"))) Z_PARAM_OPTIONAL Z_PARAM_LONG(position) ZEND_PARSE_PARAMETERS_END(); @@ -2335,7 +2335,7 @@ PHP_METHOD(Phalcon_Mvc_Router, mount) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(group, phalcon_mvc_router_groupinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(group, zephir_get_internal_ce(SL("phalcon\\mvc\\router\\groupinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2746,7 +2746,7 @@ PHP_METHOD(Phalcon_Mvc_Router, setEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/router/annotations.zep.c b/ext/phalcon/mvc/router/annotations.zep.c index 3ae36fb8a4..1de30496a3 100644 --- a/ext/phalcon/mvc/router/annotations.zep.c +++ b/ext/phalcon/mvc/router/annotations.zep.c @@ -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, 97, &prefix); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_5$$6, &route, "getcompiledpattern", &_6, 488); + ZEPHIR_CALL_METHOD(&_5$$6, &route, "getcompiledpattern", &_6, 482); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_7$$6); ZVAL_STRING(&_7$$6, "$#"); @@ -556,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, 97, &prefix); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_28$$29, &route, "getcompiledpattern", &_6, 488); + ZEPHIR_CALL_METHOD(&_28$$29, &route, "getcompiledpattern", &_6, 482); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_29$$29); ZVAL_STRING(&_29$$29, "$#"); @@ -810,7 +810,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, processActionAnnotation) Z_PARAM_STR(namespaceName) Z_PARAM_STR(controller) Z_PARAM_STR(action) - Z_PARAM_OBJECT_OF_CLASS(annotation, phalcon_annotations_annotation_ce) + Z_PARAM_OBJECT_OF_CLASS(annotation, zephir_get_internal_ce(SL("phalcon\\annotations\\annotation"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -886,7 +886,7 @@ 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, 184, &_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); } @@ -1069,7 +1069,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, processControllerAnnotation) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(handler) - Z_PARAM_OBJECT_OF_CLASS(annotation, phalcon_annotations_annotation_ce) + Z_PARAM_OBJECT_OF_CLASS(annotation, zephir_get_internal_ce(SL("phalcon\\annotations\\annotation"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/router/group.zep.c b/ext/phalcon/mvc/router/group.zep.c index a137696a87..bd904df734 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, 97, &_2, &mergedPaths, httpMethods); zephir_check_call_status(); zephir_update_property_array_append(this_ptr, SL("routes"), &route); - ZEPHIR_CALL_METHOD(NULL, &route, "setgroup", NULL, 489, this_ptr); + ZEPHIR_CALL_METHOD(NULL, &route, "setgroup", NULL, 483, this_ptr); zephir_check_call_status(); RETURN_CCTOR(&route); } diff --git a/ext/phalcon/mvc/router/route.zep.c b/ext/phalcon/mvc/router/route.zep.c index e039745abf..44b0cc2cc5 100644 --- a/ext/phalcon/mvc/router/route.zep.c +++ b/ext/phalcon/mvc/router/route.zep.c @@ -1021,7 +1021,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Route, setGroup) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(group, phalcon_mvc_router_groupinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(group, zephir_get_internal_ce(SL("phalcon\\mvc\\router\\groupinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/url.zep.c b/ext/phalcon/mvc/url.zep.c index 760a2f157d..f0ff53ab71 100644 --- a/ext/phalcon/mvc/url.zep.c +++ b/ext/phalcon/mvc/url.zep.c @@ -84,7 +84,7 @@ PHP_METHOD(Phalcon_Mvc_Url, __construct) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 1) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(router, phalcon_mvc_routerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(router, zephir_get_internal_ce(SL("phalcon\\mvc\\routerinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -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, 490, args); + ZEPHIR_CALL_FUNCTION(&queryString, "http_build_query", NULL, 484, 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 f89f7472e0..0fd3817998 100644 --- a/ext/phalcon/mvc/view.zep.c +++ b/ext/phalcon/mvc/view.zep.c @@ -522,7 +522,7 @@ PHP_METHOD(Phalcon_Mvc_View, finish) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 491); + ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 485); zephir_check_call_status(); RETURN_THIS(); } @@ -767,11 +767,11 @@ PHP_METHOD(Phalcon_Mvc_View, getPartial) } - ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 390); + ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 384); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "partial", NULL, 0, &partialPath, params); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", NULL, 397); + ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", NULL, 391); zephir_check_call_status(); RETURN_MM(); } @@ -1539,7 +1539,7 @@ PHP_METHOD(Phalcon_Mvc_View, setEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1970,7 +1970,7 @@ PHP_METHOD(Phalcon_Mvc_View, setViewsDir) return; } if (Z_TYPE_P(viewsDir) == IS_STRING) { - ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "getdirseparator", NULL, 492, viewsDir); + ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "getdirseparator", NULL, 486, viewsDir); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("viewsDirs"), &_1$$4); } else { @@ -1992,7 +1992,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", 992); return; } - ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "getdirseparator", NULL, 492, &directory); + ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "getdirseparator", NULL, 486, &directory); zephir_check_call_status(); zephir_array_update_zval(&newViewsDir, &position, &_6$$6, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -2013,7 +2013,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", 992); return; } - ZEPHIR_CALL_METHOD(&_7$$8, this_ptr, "getdirseparator", NULL, 492, &directory); + ZEPHIR_CALL_METHOD(&_7$$8, this_ptr, "getdirseparator", NULL, 486, &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); @@ -2042,7 +2042,7 @@ PHP_METHOD(Phalcon_Mvc_View, start) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 390); + ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 384); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("content"), &__$null); RETURN_THIS(); @@ -2216,7 +2216,7 @@ PHP_METHOD(Phalcon_Mvc_View, engineRender) { ZEPHIR_INIT_NVAR(&viewsDir); ZVAL_COPY(&viewsDir, _2); - ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "isabsolutepath", &_5, 493, &viewPath); + ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "isabsolutepath", &_5, 487, &viewPath); zephir_check_call_status(); if (!(zephir_is_true(&_4$$3))) { ZEPHIR_INIT_NVAR(&viewsDirPath); @@ -2332,7 +2332,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, 493, &viewPath); + ZEPHIR_CALL_METHOD(&_24$$16, this_ptr, "isabsolutepath", &_5, 487, &viewPath); zephir_check_call_status(); if (!(zephir_is_true(&_24$$16))) { ZEPHIR_INIT_NVAR(&viewsDirPath); @@ -2563,7 +2563,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, 494, this_ptr, &di); + ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 488, this_ptr, &di); zephir_check_call_status(); zephir_array_update_string(&engines, SL(".phtml"), &_2$$4, PH_COPY | PH_SEPARATE); } else { @@ -2589,7 +2589,7 @@ PHP_METHOD(Phalcon_Mvc_View, 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(&_7$$9, "call_user_func", &_10, 184, &engineService, this_ptr); + ZEPHIR_CALL_FUNCTION(&_7$$9, "call_user_func", &_10, 178, &engineService, this_ptr); zephir_check_call_status(); zephir_array_update_zval(&engines, &extension, &_7$$9, PH_COPY | PH_SEPARATE); } else { @@ -2634,7 +2634,7 @@ PHP_METHOD(Phalcon_Mvc_View, loadTemplateEngines) ZEPHIR_CALL_CE_STATIC(&_16$$15, _17$$15, "bind", &_9, 0, &engineService, &di); zephir_check_call_status(); ZEPHIR_CPY_WRT(&engineService, &_16$$15); - ZEPHIR_CALL_FUNCTION(&_16$$15, "call_user_func", &_10, 184, &engineService, this_ptr); + ZEPHIR_CALL_FUNCTION(&_16$$15, "call_user_func", &_10, 178, &engineService, this_ptr); zephir_check_call_status(); zephir_array_update_zval(&engines, &extension, &_16$$15, PH_COPY | PH_SEPARATE); } else { @@ -2778,7 +2778,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, 495); + ZEPHIR_CALL_FUNCTION(&_1$$3, "ob_get_contents", NULL, 489); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("content"), &_1$$3); RETURN_MM_BOOL(0); @@ -2836,7 +2836,7 @@ PHP_METHOD(Phalcon_Mvc_View, processRender) RETURN_MM_BOOL(0); } } - ZEPHIR_CALL_FUNCTION(&_8, "ob_get_contents", NULL, 495); + ZEPHIR_CALL_FUNCTION(&_8, "ob_get_contents", NULL, 489); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("content"), &_8); silence = 1; diff --git a/ext/phalcon/mvc/view/engine/abstractengine.zep.c b/ext/phalcon/mvc/view/engine/abstractengine.zep.c index a63e44dca4..32034fc57f 100644 --- a/ext/phalcon/mvc/view/engine/abstractengine.zep.c +++ b/ext/phalcon/mvc/view/engine/abstractengine.zep.c @@ -61,9 +61,9 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_AbstractEngine, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(view, phalcon_mvc_viewbaseinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(view, zephir_get_internal_ce(SL("phalcon\\mvc\\viewbaseinterface"))) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/view/engine/php.zep.c b/ext/phalcon/mvc/view/engine/php.zep.c index 018257d5f2..e3811d1af1 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, 496); + ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 490); 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, 495); + ZEPHIR_CALL_FUNCTION(&_7$$7, "ob_get_contents", NULL, 489); 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 d12fcf39a6..0530b665b5 100644 --- a/ext/phalcon/mvc/view/engine/volt.zep.c +++ b/ext/phalcon/mvc/view/engine/volt.zep.c @@ -126,7 +126,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, callMacro) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_RETURN_CALL_FUNCTION("call_user_func", NULL, 184, ¯o, &arguments); + ZEPHIR_RETURN_CALL_FUNCTION("call_user_func", NULL, 178, ¯o, &arguments); zephir_check_call_status(); RETURN_MM(); } @@ -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, 497, &text); + ZEPHIR_RETURN_CALL_FUNCTION("utf8_encode", NULL, 491, &text); zephir_check_call_status(); RETURN_MM(); } @@ -195,12 +195,12 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, convertEncoding) _1 = ZEPHIR_IS_STRING_IDENTICAL(&from, "utf8"); } if (_1) { - ZEPHIR_RETURN_CALL_FUNCTION("utf8_decode", NULL, 286, &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, 330, &text, &from, &to); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 324, &text, &from, &to); 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, 498, &_1$$3); + ZEPHIR_CALL_METHOD(NULL, &compiler, "__construct", NULL, 492, &_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, 499, &container); + ZEPHIR_CALL_METHOD(NULL, &compiler, "setdi", NULL, 493, &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, 500, &options); + ZEPHIR_CALL_METHOD(NULL, &compiler, "setoptions", NULL, 494, &options); zephir_check_call_status(); } zephir_update_property_zval(this_ptr, ZEND_STRL("compiler"), &compiler); @@ -378,7 +378,7 @@ 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, 233, item); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strlen", NULL, 227, item); zephir_check_call_status(); RETURN_MM(); } @@ -470,7 +470,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, 501, &_8$$5, &_5$$5, &attributes); + ZEPHIR_CALL_METHOD(NULL, &link, "__construct", NULL, 495, &_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); @@ -482,7 +482,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, 502, &_10$$5); + ZEPHIR_CALL_METHOD(&_9$$5, &_8$$5, "serialize", NULL, 496, &_10$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(&header); ZEPHIR_CONCAT_SV(&header, "Link: ", &_9$$5); @@ -559,7 +559,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render) if (mustClean) { - ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 496); + ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 490); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&compiler, this_ptr, "getcompiler", NULL, 0); @@ -635,7 +635,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, 495); + ZEPHIR_CALL_FUNCTION(&_12$$11, "ob_get_contents", NULL, 489); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_11$$11, "setcontent", NULL, 0, &_12$$11); zephir_check_call_status(); @@ -659,7 +659,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, setEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -792,19 +792,19 @@ 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, 503, value, &_5$$9, &length); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 497, 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, 227, 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, 227, value, &_7$$10); + ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", NULL, 221, value, &_7$$10); zephir_check_call_status(); RETURN_MM(); } @@ -844,7 +844,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, sort) ZEPHIR_MAKE_REF(&value); - ZEPHIR_CALL_FUNCTION(NULL, "asort", NULL, 504, &value); + ZEPHIR_CALL_FUNCTION(NULL, "asort", NULL, 498, &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 f242771fee..ddffa1fc6f 100644 --- a/ext/phalcon/mvc/view/engine/volt/compiler.zep.c +++ b/ext/phalcon/mvc/view/engine/volt/compiler.zep.c @@ -160,7 +160,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, __construct) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 1) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(view, phalcon_mvc_viewbaseinterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(view, zephir_get_internal_ce(SL("phalcon\\mvc\\viewbaseinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -385,7 +385,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, attributeReader) } } } else { - ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", NULL, 505, &left); + ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", NULL, 499, &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", 244); @@ -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", 258); zephir_concat_self(&exprCode, &_11$$11); } else { - ZEPHIR_CALL_METHOD(&_12$$12, this_ptr, "expression", NULL, 505, &right); + ZEPHIR_CALL_METHOD(&_12$$12, this_ptr, "expression", NULL, 499, &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, 506, &_18$$35); + ZEPHIR_CALL_METHOD(NULL, &_17$$35, "__construct", NULL, 500, &_18$$35); zephir_check_call_status(); zephir_throw_exception_debug(&_17$$35, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 478); 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, 507, &_0, &_1); + ZEPHIR_CALL_METHOD(&compilation, this_ptr, "statementlist", NULL, 501, &_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, 506, &_1$$4, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 500, &_1$$4, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$4, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 568); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 505, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 499, &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", 592); return; } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 505, &expr); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 499, &expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -941,21 +941,21 @@ 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, 506, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 500, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 616); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 505, &expr); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 499, &expr); zephir_check_call_status(); zephir_array_fetch_string(&_2, &expr, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 624); if (ZEPHIR_IS_LONG(&_2, 350)) { - ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "istagfactory", NULL, 508, &expr); + ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "istagfactory", NULL, 502, &expr); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_3$$4)) { ZVAL_BOOL(&_4$$5, 1); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 505, &expr, &_4$$5); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 499, &expr, &_4$$5); zephir_check_call_status(); } zephir_array_fetch_string(&name, &expr, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 629); @@ -1015,13 +1015,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, 506, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 500, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 666); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 505, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 499, &expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -1111,7 +1111,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, 506, &_1$$4); + ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 500, &_1$$4); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$4, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 706); ZEPHIR_MM_RESTORE(); @@ -1124,7 +1124,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, 506, &_3$$5); + ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 500, &_3$$5); zephir_check_call_status(); zephir_throw_exception_debug(&_2$$5, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 718); ZEPHIR_MM_RESTORE(); @@ -1249,7 +1249,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", 782); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 505, &expr); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 499, &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", 788); @@ -1309,7 +1309,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) } else { ZVAL_BOOL(&_4, 0); } - ZEPHIR_CALL_METHOD(&code, this_ptr, "statementlist", NULL, 507, &blockStatements, &_4); + ZEPHIR_CALL_METHOD(&code, this_ptr, "statementlist", NULL, 501, &blockStatements, &_4); zephir_check_call_status(); ZEPHIR_OBS_VAR(&loopContext); zephir_read_property(&loopContext, this_ptr, ZEND_STRL("loopPointers"), PH_NOISY_CC); @@ -1360,7 +1360,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, 505, &ifExpr); + ZEPHIR_CALL_METHOD(&_16$$15, this_ptr, "expression", NULL, 499, &ifExpr); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_17$$15); ZEPHIR_CONCAT_SVS(&_17$$15, "if (", &_16$$15, ") { ?>"); @@ -1502,13 +1502,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, 506, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 500, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 941); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 505, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 499, &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", 947); if (extendsMode) { @@ -1516,7 +1516,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) } else { ZVAL_BOOL(&_5, 0); } - ZEPHIR_CALL_METHOD(&_3, this_ptr, "statementlist", NULL, 507, &_4, &_5); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "statementlist", NULL, 501, &_4, &_5); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6); ZEPHIR_CONCAT_SVSV(&_6, "", &_3); @@ -1528,7 +1528,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, 507, &blockStatements, &_8$$4); + ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "statementlist", NULL, 501, &blockStatements, &_8$$4); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_9$$4); ZEPHIR_CONCAT_SV(&_9$$4, "", &_7$$4); @@ -1606,14 +1606,14 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileInclude) RETURN_CCTOR(&compilation); } } - ZEPHIR_CALL_METHOD(&path, this_ptr, "expression", NULL, 505, &pathExpr); + ZEPHIR_CALL_METHOD(&path, this_ptr, "expression", NULL, 499, &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, 505, ¶ms); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "expression", NULL, 499, ¶ms); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "partial(", &path, ", ", &_3, "); ?>"); RETURN_MM(); @@ -1701,7 +1701,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, 506, &_2$$4); + ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 500, &_2$$4); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$4, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1063); ZEPHIR_MM_RESTORE(); @@ -1752,7 +1752,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, 505, &defaultValue); + ZEPHIR_CALL_METHOD(&_14$$8, this_ptr, "expression", &_15, 499, &defaultValue); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$8); ZEPHIR_CONCAT_SVSVS(&_16$$8, "$", &variableName, " = ", &_14$$8, ";"); @@ -1795,7 +1795,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, 505, &defaultValue); + ZEPHIR_CALL_METHOD(&_22$$11, this_ptr, "expression", &_15, 499, &defaultValue); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_23$$11); ZEPHIR_CONCAT_SVSVS(&_23$$11, "$", &variableName, " = ", &_22$$11, ";"); @@ -1821,7 +1821,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, 507, &blockStatements, &_26$$13); + ZEPHIR_CALL_METHOD(&_25$$13, this_ptr, "statementlist", NULL, 501, &blockStatements, &_26$$13); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_27$$13); ZEPHIR_CONCAT_VS(&_27$$13, &_25$$13, ""); RETURN_MM(); @@ -1944,10 +1944,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", 1174); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_3, 505, &_2$$4); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_3, 499, &_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", 1181); - ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_3, 505, &_4$$4); + ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_3, 499, &_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", 1187); do { @@ -1994,10 +1994,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", 1174); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_3, 505, &_11$$10); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_3, 499, &_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", 1181); - ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_3, 505, &_12$$10); + ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_3, 499, &_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", 1187); do { @@ -2162,13 +2162,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, 506, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 500, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1253); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 505, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 499, &expr); zephir_check_call_status(); ZEPHIR_INIT_VAR(&compilation); ZEPHIR_CONCAT_SVS(&compilation, ""); @@ -2179,7 +2179,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSwitch) } else { ZVAL_BOOL(&_3$$4, 0); } - ZEPHIR_CALL_METHOD(&lines, this_ptr, "statementlist", NULL, 507, &caseClauses, &_3$$4); + ZEPHIR_CALL_METHOD(&lines, this_ptr, "statementlist", NULL, 501, &caseClauses, &_3$$4); zephir_check_call_status(); if (zephir_fast_strlen_ev(&lines) != 0) { ZEPHIR_INIT_VAR(&_4$$5); @@ -2292,7 +2292,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, 509, &_2$$4, &_1$$4); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "fireextensionevent", &_3, 503, &_2$$4, &_1$$4); zephir_check_call_status(); if (Z_TYPE_P(&exprCode) == IS_STRING) { break; @@ -2314,7 +2314,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) } else { ZVAL_BOOL(&_7$$7, 0); } - ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_8, 505, &_6$$7, &_7$$7); + ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_8, 499, &_6$$7, &_7$$7); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); if (zephir_array_isset_string_fetch(&name, &singleExpr, SL("name"), 0)) { @@ -2342,7 +2342,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) } else { ZVAL_BOOL(&_11$$10, 0); } - ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_8, 505, &_10$$10, &_11$$10); + ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_8, 499, &_10$$10, &_11$$10); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); if (zephir_array_isset_string_fetch(&name, &singleExpr, SL("name"), 0)) { @@ -2373,7 +2373,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) } else { ZVAL_BOOL(&_14$$14, 0); } - ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_8, 505, &left, &_14$$14); + ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_8, 499, &left, &_14$$14); zephir_check_call_status(); } if (ZEPHIR_IS_LONG(&type, 311)) { @@ -2384,7 +2384,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) } if (ZEPHIR_IS_LONG(&type, 124)) { zephir_array_fetch_string(&_17$$16, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1390); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "resolvefilter", &_18, 510, &_17$$16, &leftCode); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "resolvefilter", &_18, 504, &_17$$16, &leftCode); zephir_check_call_status(); break; } @@ -2395,7 +2395,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) } else { ZVAL_BOOL(&_19$$17, 0); } - ZEPHIR_CALL_METHOD(&rightCode, this_ptr, "expression", &_8, 505, &right, &_19$$17); + ZEPHIR_CALL_METHOD(&rightCode, this_ptr, "expression", &_8, 499, &right, &_19$$17); zephir_check_call_status(); } ZEPHIR_INIT_NVAR(&exprCode); @@ -2586,7 +2586,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) } else { ZVAL_BOOL(&_28$$54, 0); } - ZEPHIR_CALL_METHOD(&startCode, this_ptr, "expression", &_8, 505, &start, &_28$$54); + ZEPHIR_CALL_METHOD(&startCode, this_ptr, "expression", &_8, 499, &start, &_28$$54); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&startCode); @@ -2599,7 +2599,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) } else { ZVAL_BOOL(&_29$$56, 0); } - ZEPHIR_CALL_METHOD(&endCode, this_ptr, "expression", &_8, 505, &end, &_29$$56); + ZEPHIR_CALL_METHOD(&endCode, this_ptr, "expression", &_8, 499, &end, &_29$$56); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&endCode); @@ -2696,7 +2696,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) } else { ZVAL_BOOL(&_32$$74, 0); } - ZEPHIR_CALL_METHOD(&_30$$74, this_ptr, "expression", &_8, 505, &_31$$74, &_32$$74); + ZEPHIR_CALL_METHOD(&_30$$74, this_ptr, "expression", &_8, 499, &_31$$74, &_32$$74); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&exprCode); ZEPHIR_CONCAT_SVSVSVS(&exprCode, "(", &_30$$74, " ? ", &leftCode, " : ", &rightCode, ")"); @@ -2723,7 +2723,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) zephir_array_fetch_string(&_35$$78, &expr, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1646); ZEPHIR_INIT_NVAR(&_36$$78); ZEPHIR_CONCAT_SVSVSV(&_36$$78, "Unknown expression ", &type, " in ", &_34$$78, " on line ", &_35$$78); - ZEPHIR_CALL_METHOD(NULL, &_33$$78, "__construct", &_37, 506, &_36$$78); + ZEPHIR_CALL_METHOD(NULL, &_33$$78, "__construct", &_37, 500, &_36$$78); zephir_check_call_status(); zephir_throw_exception_debug(&_33$$78, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1646); ZEPHIR_MM_RESTORE(); @@ -2960,7 +2960,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) } else { ZVAL_BOOL(&_0$$3, 0); } - ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 505, &funcArguments, &_0$$3); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 499, &funcArguments, &_0$$3); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&arguments); @@ -2979,7 +2979,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) zephir_array_fast_append(&_2$$6, &funcArguments); ZEPHIR_INIT_VAR(&_3$$6); ZVAL_STRING(&_3$$6, "compileFunction"); - ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 509, &_3$$6, &_2$$6); + ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 503, &_3$$6, &_2$$6); zephir_check_call_status(); if (Z_TYPE_P(&code) == IS_STRING) { RETURN_CCTOR(&code); @@ -3011,7 +3011,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) zephir_array_fetch_string(&_7$$9, &expr, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1782); ZEPHIR_INIT_VAR(&_8$$9); ZEPHIR_CONCAT_SVSVSV(&_8$$9, "Invalid definition for user function '", &name, "' in ", &_6$$9, " on line ", &_7$$9); - ZEPHIR_CALL_METHOD(NULL, &_5$$9, "__construct", NULL, 506, &_8$$9); + ZEPHIR_CALL_METHOD(NULL, &_5$$9, "__construct", NULL, 500, &_8$$9); zephir_check_call_status(); zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1782); ZEPHIR_MM_RESTORE(); @@ -3040,7 +3040,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) zephir_read_property(&_12$$17, this_ptr, ZEND_STRL("exprLevel"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&exprLevel, &_12$$17); if (Z_TYPE_P(&block) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&code, this_ptr, "statementlistorextends", NULL, 511, &block); + ZEPHIR_CALL_METHOD(&code, this_ptr, "statementlistorextends", NULL, 505, &block); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&exprLevel, 1)) { ZEPHIR_CPY_WRT(&escapedCode, &code); @@ -3125,7 +3125,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) ZEPHIR_OBS_NVAR(&funcArguments); if (zephir_array_isset_string_fetch(&funcArguments, &expr, SL("arguments"), 0)) { ZVAL_BOOL(&_22$$30, 1); - ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 505, &funcArguments, &_22$$30); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 499, &funcArguments, &_22$$30); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&arguments); @@ -3176,7 +3176,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) } else { ZVAL_BOOL(&_24, 0); } - ZEPHIR_CALL_METHOD(&_23, this_ptr, "expression", NULL, 505, &nameExpr, &_24); + ZEPHIR_CALL_METHOD(&_23, this_ptr, "expression", NULL, 499, &nameExpr, &_24); zephir_check_call_status(); ZEPHIR_CONCAT_VSVS(return_value, &_23, "(", &arguments, ")"); RETURN_MM(); @@ -3515,21 +3515,21 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveTest) do { 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", 2144); - ZEPHIR_CALL_METHOD(&_0$$12, this_ptr, "expression", NULL, 505, &_1$$12); + ZEPHIR_CALL_METHOD(&_0$$12, this_ptr, "expression", NULL, 499, &_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", 2146); - ZEPHIR_CALL_METHOD(&_2$$13, this_ptr, "expression", NULL, 505, &_3$$13); + ZEPHIR_CALL_METHOD(&_2$$13, this_ptr, "expression", NULL, 499, &_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", 2148); - ZEPHIR_CALL_METHOD(&_4$$14, this_ptr, "expression", NULL, 505, &_5$$14); + ZEPHIR_CALL_METHOD(&_4$$14, this_ptr, "expression", NULL, 499, &_5$$14); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "gettype(", &left, ") === (", &_4$$14, ")"); RETURN_MM(); @@ -3538,7 +3538,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveTest) } } - ZEPHIR_CALL_METHOD(&_6, this_ptr, "expression", NULL, 505, &test); + ZEPHIR_CALL_METHOD(&_6, this_ptr, "expression", NULL, 499, &test); zephir_check_call_status(); ZEPHIR_CONCAT_VSV(return_value, &left, " == ", &_6); RETURN_MM(); @@ -3556,7 +3556,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, setDI) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -3757,7 +3757,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource) } else { ZVAL_BOOL(&_0, 0); } - ZEPHIR_CALL_METHOD(&compilation, this_ptr, "statementlist", NULL, 507, &intermediate, &_0); + ZEPHIR_CALL_METHOD(&compilation, this_ptr, "statementlist", NULL, 501, &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); @@ -3793,11 +3793,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, 507, &localBlock); + ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 501, &localBlock); zephir_check_call_status(); } else { if (Z_TYPE_P(&block) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 507, &block); + ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 501, &block); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&blockCompilation, &block); @@ -3838,11 +3838,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, 507, &localBlock); + ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 501, &localBlock); zephir_check_call_status(); } else { if (Z_TYPE_P(&block) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 507, &block); + ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 501, &block); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&blockCompilation, &block); @@ -4036,7 +4036,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", 2368); 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, 506, &_3$$5); + ZEPHIR_CALL_METHOD(NULL, &_0$$5, "__construct", NULL, 500, &_3$$5); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$5, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2368); ZEPHIR_MM_RESTORE(); @@ -4070,11 +4070,11 @@ 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, 271, &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, 505, &funcArguments); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 499, &funcArguments); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&arguments, &left); @@ -4089,7 +4089,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, 509, &_8$$9, &_7$$9); + ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 503, &_8$$9, &_7$$9); zephir_check_call_status(); if (Z_TYPE_P(&code) == IS_STRING) { RETURN_CCTOR(&code); @@ -4120,7 +4120,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", 2462); 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, 506, &_13$$11); + ZEPHIR_CALL_METHOD(NULL, &_10$$11, "__construct", NULL, 500, &_13$$11); zephir_check_call_status(); zephir_throw_exception_debug(&_10$$11, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2462); ZEPHIR_MM_RESTORE(); @@ -4245,7 +4245,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) zephir_array_fetch_string(&_22, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2529); ZEPHIR_INIT_VAR(&_23); ZEPHIR_CONCAT_SVSVSV(&_23, "Unknown filter \"", &name, "\" in ", &_21, " on line ", &_22); - ZEPHIR_CALL_METHOD(NULL, &_20, "__construct", NULL, 506, &_23); + ZEPHIR_CALL_METHOD(NULL, &_20, "__construct", NULL, 500, &_23); zephir_check_call_status(); zephir_throw_exception_debug(&_20, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2529); ZEPHIR_MM_RESTORE(); @@ -4416,7 +4416,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", 2577); 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, 506, &_7$$7, &statement); + ZEPHIR_CALL_METHOD(NULL, &_4$$7, "__construct", &_8, 500, &_7$$7, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_4$$7, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2579); ZEPHIR_MM_RESTORE(); @@ -4428,7 +4428,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, 509, &_10$$8, &_9$$8); + ZEPHIR_CALL_METHOD(&tempCompilation, this_ptr, "fireextensionevent", &_11, 503, &_10$$8, &_9$$8); zephir_check_call_status(); if (Z_TYPE_P(&tempCompilation) == IS_STRING) { zephir_concat_self(&compilation, &tempCompilation); @@ -4533,7 +4533,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, 507, &blockStatements, &_34$$24); + ZEPHIR_CALL_METHOD(&_33$$24, this_ptr, "statementlist", &_35, 501, &blockStatements, &_34$$24); zephir_check_call_status(); zephir_concat_self(&compilation, &_33$$24); } @@ -4643,7 +4643,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", 2807); 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, 506, &_59$$37); + ZEPHIR_CALL_METHOD(NULL, &_56$$37, "__construct", &_8, 500, &_59$$37); zephir_check_call_status(); zephir_throw_exception_debug(&_56$$37, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2807); ZEPHIR_MM_RESTORE(); @@ -4673,7 +4673,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", 2577); 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, 506, &_63$$40, &statement); + ZEPHIR_CALL_METHOD(NULL, &_60$$40, "__construct", &_8, 500, &_63$$40, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_60$$40, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2579); ZEPHIR_MM_RESTORE(); @@ -4685,7 +4685,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, 509, &_65$$41, &_64$$41); + ZEPHIR_CALL_METHOD(&tempCompilation, this_ptr, "fireextensionevent", &_11, 503, &_65$$41, &_64$$41); zephir_check_call_status(); if (Z_TYPE_P(&tempCompilation) == IS_STRING) { zephir_concat_self(&compilation, &tempCompilation); @@ -4790,7 +4790,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, 507, &blockStatements, &_81$$57); + ZEPHIR_CALL_METHOD(&_80$$57, this_ptr, "statementlist", &_35, 501, &blockStatements, &_81$$57); zephir_check_call_status(); zephir_concat_self(&compilation, &_80$$57); } @@ -4900,7 +4900,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", 2807); 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, 506, &_97$$70); + ZEPHIR_CALL_METHOD(NULL, &_94$$70, "__construct", &_8, 500, &_97$$70); zephir_check_call_status(); zephir_throw_exception_debug(&_94$$70, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2807); ZEPHIR_MM_RESTORE(); @@ -4993,7 +4993,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementListOrExtends) ZEPHIR_INIT_NVAR(&statement); } if (isStatementList) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "statementlist", NULL, 507, statements); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "statementlist", NULL, 501, statements); zephir_check_call_status(); RETURN_MM(); } @@ -5043,7 +5043,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, isTagFactory) _0$$6 = Z_TYPE_P(&_1$$6) == IS_ARRAY; } if (_0$$6) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "istagfactory", NULL, 508, &left); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "istagfactory", NULL, 502, &left); 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 7fcbddddda..47ff456058 100644 --- a/ext/phalcon/mvc/view/simple.zep.c +++ b/ext/phalcon/mvc/view/simple.zep.c @@ -418,7 +418,7 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, partial) } - ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 390); + ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 384); 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); @@ -431,12 +431,12 @@ 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, 506, &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, 491); + ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 485); zephir_check_call_status(); zephir_read_property(&_2, this_ptr, ZEND_STRL("content"), PH_NOISY_CC | PH_READONLY); zend_print_zval(&_2, 0); @@ -535,15 +535,15 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, render) ZEPHIR_INIT_VAR(&_0); ZEPHIR_CREATE_SYMBOL_TABLE(); - ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 390); + ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 384); 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, 506, &path, &mergedParams); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 491); + ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 485); zephir_check_call_status(); RETURN_MM_MEMBER(getThis(), "content"); } @@ -604,7 +604,7 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, setEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -795,7 +795,7 @@ 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, 507, &viewsDir); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("viewsDir"), &_0); ZEPHIR_MM_RESTORE(); @@ -854,7 +854,7 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, 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, 494, this_ptr, &di); + ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 488, this_ptr, &di); zephir_check_call_status(); zephir_array_update_string(&engines, SL(".phtml"), &_2$$4, PH_COPY | PH_SEPARATE); } else { @@ -880,7 +880,7 @@ 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, 184, &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); @@ -923,7 +923,7 @@ 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, 184, &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); diff --git a/ext/phalcon/paginator/adapter/abstractadapter.zep.c b/ext/phalcon/paginator/adapter/abstractadapter.zep.c index 1c9be2b7bf..a055b46c60 100644 --- a/ext/phalcon/paginator/adapter/abstractadapter.zep.c +++ b/ext/phalcon/paginator/adapter/abstractadapter.zep.c @@ -197,7 +197,7 @@ PHP_METHOD(Phalcon_Paginator_Adapter_AbstractAdapter, setRepository) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(repository, phalcon_paginator_repositoryinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(repository, zephir_get_internal_ce(SL("phalcon\\paginator\\repositoryinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/paginator/adapter/model.zep.c b/ext/phalcon/paginator/adapter/model.zep.c index 1e9e85aa41..c61d625a37 100644 --- a/ext/phalcon/paginator/adapter/model.zep.c +++ b/ext/phalcon/paginator/adapter/model.zep.c @@ -166,7 +166,7 @@ PHP_METHOD(Phalcon_Paginator_Adapter_Model, paginate) ZEPHIR_INIT_VAR(&_6); ZVAL_STRING(&_6, "count"); zephir_array_fast_append(&_5, &_6); - ZEPHIR_CALL_FUNCTION(&rowCountResult, "call_user_func", NULL, 184, &_5, ¶meters); + ZEPHIR_CALL_FUNCTION(&rowCountResult, "call_user_func", NULL, 178, &_5, ¶meters); zephir_check_call_status(); if (Z_TYPE_P(&rowCountResult) == IS_OBJECT) { ZEPHIR_CALL_METHOD(&_7$$6, &rowCountResult, "count", NULL, 0); @@ -193,7 +193,7 @@ PHP_METHOD(Phalcon_Paginator_Adapter_Model, paginate) ZEPHIR_INIT_VAR(&_11$$10); ZVAL_STRING(&_11$$10, "find"); zephir_array_fast_append(&_10$$10, &_11$$10); - ZEPHIR_CALL_FUNCTION(&_12$$10, "call_user_func", NULL, 184, &_10$$10, ¶meters); + ZEPHIR_CALL_FUNCTION(&_12$$10, "call_user_func", NULL, 178, &_10$$10, ¶meters); zephir_check_call_status(); ZEPHIR_CPY_WRT(&pageItems, &_12$$10); } diff --git a/ext/phalcon/paginator/adapter/nativearray.zep.c b/ext/phalcon/paginator/adapter/nativearray.zep.c index 76c1d313e1..e010644292 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, 503, &items, &_0, &_4); + ZEPHIR_CALL_FUNCTION(&_5, "array_slice", NULL, 497, &items, &_0, &_4); zephir_check_call_status(); ZEPHIR_CPY_WRT(&items, &_5); if (pageNumber < totalPages) { diff --git a/ext/phalcon/paginator/adapter/querybuilder.zep.c b/ext/phalcon/paginator/adapter/querybuilder.zep.c index 7259d47c2a..1a255342a1 100644 --- a/ext/phalcon/paginator/adapter/querybuilder.zep.c +++ b/ext/phalcon/paginator/adapter/querybuilder.zep.c @@ -421,7 +421,7 @@ PHP_METHOD(Phalcon_Paginator_Adapter_QueryBuilder, setQueryBuilder) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(builder, phalcon_mvc_model_query_builder_ce) + Z_PARAM_OBJECT_OF_CLASS(builder, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\query\\builder"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/session/adapter/libmemcached.zep.c b/ext/phalcon/session/adapter/libmemcached.zep.c index afcd49cae5..ca990878d9 100644 --- a/ext/phalcon/session/adapter/libmemcached.zep.c +++ b/ext/phalcon/session/adapter/libmemcached.zep.c @@ -74,7 +74,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Libmemcached, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_storage_adapterfactory_ce) + Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\storage\\adapterfactory"))) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/phalcon/session/adapter/redis.zep.c b/ext/phalcon/session/adapter/redis.zep.c index 1fc10ead7b..42b782ed10 100644 --- a/ext/phalcon/session/adapter/redis.zep.c +++ b/ext/phalcon/session/adapter/redis.zep.c @@ -69,7 +69,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Redis, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_storage_adapterfactory_ce) + Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\storage\\adapterfactory"))) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/phalcon/session/adapter/stream.zep.c b/ext/phalcon/session/adapter/stream.zep.c index cd4ddfc3b4..19de674495 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, 0, &path); + ZEPHIR_CALL_METHOD(&_6, this_ptr, "getdirseparator", NULL, 508, &path); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("path"), &_6); ZEPHIR_MM_RESTORE(); @@ -177,12 +177,12 @@ 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, 509, &file); zephir_check_call_status(); _2 = zephir_is_true(&_3); } if (_2) { - ZEPHIR_CALL_FUNCTION(NULL, "unlink", NULL, 119, &file); + ZEPHIR_CALL_FUNCTION(NULL, "unlink", NULL, 113, &file); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -236,7 +236,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) zephir_time(&_2); ZEPHIR_INIT_VAR(&time); ZVAL_LONG(&time, (zephir_get_numberval(&_2) - maxlifetime)); - ZEPHIR_CALL_FUNCTION(&_3, "glob", NULL, 0, &pattern); + ZEPHIR_CALL_FUNCTION(&_3, "glob", NULL, 510, &pattern); zephir_check_call_status(); zephir_is_iterable(&_3, 0, "phalcon/Session/Adapter/Stream.zep", 111); if (Z_TYPE_P(&_3) == IS_ARRAY) { @@ -246,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, 0, &file); + ZEPHIR_CALL_FUNCTION(&_7$$3, "is_file", &_8, 509, &file); zephir_check_call_status(); _6$$3 = ZEPHIR_IS_TRUE_IDENTICAL(&_7$$3); } @@ -257,7 +257,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) _9$$3 = ZEPHIR_LT(&_10$$3, &time); } if (_9$$3) { - ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_11, 119, &file); + ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_11, 113, &file); zephir_check_call_status(); } } ZEND_HASH_FOREACH_END(); @@ -274,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, 0, &file); + ZEPHIR_CALL_FUNCTION(&_13$$5, "is_file", &_8, 509, &file); zephir_check_call_status(); _12$$5 = ZEPHIR_IS_TRUE_IDENTICAL(&_13$$5); } @@ -285,7 +285,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) _14$$5 = ZEPHIR_LT(&_15$$5, &time); } if (_14$$5) { - ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_11, 119, &file); + ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_11, 113, &file); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, &_3, "next", NULL, 0); @@ -370,7 +370,7 @@ 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, 128, &pointer, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "flock", NULL, 122, &pointer, &_4$$3); zephir_check_call_status(); if (zephir_is_true(&_5$$3)) { ZEPHIR_CALL_METHOD(&data, this_ptr, "phpfilegetcontents", NULL, 0, &name); @@ -640,7 +640,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, phpFilePutContents) ZVAL_LONG(&_0, flags); - ZEPHIR_RETURN_CALL_FUNCTION("file_put_contents", NULL, 135, &filename, data, &_0, context); + ZEPHIR_RETURN_CALL_FUNCTION("file_put_contents", NULL, 129, &filename, data, &_0, context); zephir_check_call_status(); RETURN_MM(); } @@ -678,7 +678,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, phpFopen) zephir_get_strval(&mode, mode_param); - ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 136, &filename, &mode); + ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 130, &filename, &mode); zephir_check_call_status(); RETURN_MM(); } @@ -715,7 +715,7 @@ 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, 511, &varname); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/session/bag.zep.c b/ext/phalcon/session/bag.zep.c index d9a672759f..8884fae211 100644 --- a/ext/phalcon/session/bag.zep.c +++ b/ext/phalcon/session/bag.zep.c @@ -89,7 +89,7 @@ PHP_METHOD(Phalcon_Session_Bag, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(session, phalcon_session_managerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(session, zephir_get_internal_ce(SL("phalcon\\session\\managerinterface"))) Z_PARAM_STR(name) ZEND_PARSE_PARAMETERS_END(); #endif @@ -306,7 +306,7 @@ PHP_METHOD(Phalcon_Session_Bag, setDI) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/session/manager.zep.c b/ext/phalcon/session/manager.zep.c index 146813432d..a8521d592f 100644 --- a/ext/phalcon/session/manager.zep.c +++ b/ext/phalcon/session/manager.zep.c @@ -853,7 +853,7 @@ PHP_METHOD(Phalcon_Session_Manager, phpHeadersSent) ZEPHIR_MM_GROW(); - ZEPHIR_RETURN_CALL_FUNCTION("headers_sent", NULL, 362); + ZEPHIR_RETURN_CALL_FUNCTION("headers_sent", NULL, 356); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/storage/adapter/abstractadapter.zep.c b/ext/phalcon/storage/adapter/abstractadapter.zep.c index b0b7e9591d..82e95b9788 100644 --- a/ext/phalcon/storage/adapter/abstractadapter.zep.c +++ b/ext/phalcon/storage/adapter/abstractadapter.zep.c @@ -118,7 +118,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_storage_serializerfactory_ce) + Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\storage\\serializerfactory"))) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/phalcon/storage/adapter/apcu.zep.c b/ext/phalcon/storage/adapter/apcu.zep.c index b41ad327db..02b9d49a78 100644 --- a/ext/phalcon/storage/adapter/apcu.zep.c +++ b/ext/phalcon/storage/adapter/apcu.zep.c @@ -69,7 +69,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_storage_serializerfactory_ce) + Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\storage\\serializerfactory"))) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); @@ -657,9 +657,7 @@ 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, 99, key, &_0, success, &_1); - ZEPHIR_UNREF(success); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_dec", NULL, 0, key, &_0, success, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -684,7 +682,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuDelete) zephir_fetch_params(1, 1, 0, &key); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_delete", NULL, 100, key); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_delete", NULL, 0, key); zephir_check_call_status(); RETURN_MM(); } @@ -709,7 +707,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuExists) zephir_fetch_params(1, 1, 0, &key); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_exists", NULL, 101, key); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_exists", NULL, 0, key); zephir_check_call_status(); RETURN_MM(); } @@ -758,9 +756,7 @@ 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, 102, key, &_0, success, &_1); - ZEPHIR_UNREF(success); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_inc", NULL, 0, key, &_0, success, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -793,15 +789,14 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuFetch) } - ZEPHIR_MAKE_REF(success); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_fetch", NULL, 103, key, success); - ZEPHIR_UNREF(success); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_fetch", NULL, 0, key, success); zephir_check_call_status(); RETURN_MM(); } PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuIterator) { + zend_class_entry *_0 = NULL; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval *pattern_param = NULL; @@ -822,9 +817,15 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuIterator) zephir_get_strval(&pattern, pattern_param); - object_init_ex(return_value, zephir_get_internal_ce(SL("apcuiterator"))); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 0, &pattern); - zephir_check_call_status(); + if (!_0) { + _0 = zephir_fetch_class_str_ex(SL("APCUIterator"), ZEND_FETCH_CLASS_AUTO); + } + object_init_ex(return_value, _0); + if (zephir_has_constructor(return_value)) { + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 0, &pattern); + zephir_check_call_status(); + } + RETURN_MM(); } @@ -859,7 +860,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuStore) ZVAL_LONG(&_0, ttl); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_store", NULL, 104, key, payload, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_store", NULL, 0, key, payload, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/storage/adapter/libmemcached.zep.c b/ext/phalcon/storage/adapter/libmemcached.zep.c index 6ad4c7ddff..fdf67171dc 100644 --- a/ext/phalcon/storage/adapter/libmemcached.zep.c +++ b/ext/phalcon/storage/adapter/libmemcached.zep.c @@ -68,7 +68,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Libmemcached, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_storage_serializerfactory_ce) + Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\storage\\serializerfactory"))) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); @@ -331,14 +331,14 @@ 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, 105, &connection, &client); + ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "setoptions", NULL, 99, &connection, &client); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_10$$4, &_9$$4, "setservers", NULL, 106, &connection, &servers); + ZEPHIR_CALL_METHOD(&_10$$4, &_9$$4, "setservers", NULL, 100, &connection, &servers); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_10$$4, "setsasl", NULL, 107, &connection, &saslUser, &saslPass); + ZEPHIR_CALL_METHOD(NULL, &_10$$4, "setsasl", NULL, 101, &connection, &saslUser, &saslPass); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 108, &connection); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 102, &connection); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("adapter"), &connection); } diff --git a/ext/phalcon/storage/adapter/memory.zep.c b/ext/phalcon/storage/adapter/memory.zep.c index 1c7ebffbfd..72849173e8 100644 --- a/ext/phalcon/storage/adapter/memory.zep.c +++ b/ext/phalcon/storage/adapter/memory.zep.c @@ -70,7 +70,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Memory, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_storage_serializerfactory_ce) + Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\storage\\serializerfactory"))) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/phalcon/storage/adapter/redis.zep.c b/ext/phalcon/storage/adapter/redis.zep.c index 05b7f08465..aeb2bfd58d 100644 --- a/ext/phalcon/storage/adapter/redis.zep.c +++ b/ext/phalcon/storage/adapter/redis.zep.c @@ -96,7 +96,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Redis, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_storage_serializerfactory_ce) + Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\storage\\serializerfactory"))) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); @@ -350,19 +350,22 @@ PHP_METHOD(Phalcon_Storage_Adapter_Redis, getAdapter) if (Z_TYPE_P(&_0) == IS_NULL) { ZEPHIR_INIT_VAR(&connection); 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, 109, &connection); + if (zephir_has_constructor(&connection)) { + ZEPHIR_CALL_METHOD(NULL, &connection, "__construct", NULL, 0); + zephir_check_call_status(); + } + + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "checkconnect", NULL, 103, &connection); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_2$$3, &_1$$3, "checkauth", NULL, 110, &connection); + ZEPHIR_CALL_METHOD(&_2$$3, &_1$$3, "checkauth", NULL, 104, &connection); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "checkindex", NULL, 111, &connection); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "checkindex", NULL, 105, &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, 112, &connection); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 106, &connection); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("adapter"), &connection); } @@ -822,7 +825,7 @@ 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, 113, &_5$$5, &host, &port); + ZEPHIR_CALL_FUNCTION(&_6$$5, "sprintf", NULL, 107, &_5$$5, &host, &port); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_4$$5, "__construct", NULL, 29, &_6$$5); zephir_check_call_status(); @@ -928,34 +931,34 @@ 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, 114, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "defined", NULL, 108, &_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, 115, &_2$$3); + ZEPHIR_CALL_FUNCTION(&_3$$3, "constant", NULL, 109, &_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, 114, &_0); + ZEPHIR_CALL_FUNCTION(&_4, "defined", NULL, 108, &_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, 115, &_5$$4); + ZEPHIR_CALL_FUNCTION(&_6$$4, "constant", NULL, 109, &_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, 114, &_0); + ZEPHIR_CALL_FUNCTION(&_7, "defined", NULL, 108, &_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, 115, &_8$$5); + ZEPHIR_CALL_FUNCTION(&_9$$5, "constant", NULL, 109, &_8$$5); zephir_check_call_status(); zephir_array_update_string(&map, SL("redis_json"), &_9$$5, PH_COPY | PH_SEPARATE); } diff --git a/ext/phalcon/storage/adapter/stream.zep.c b/ext/phalcon/storage/adapter/stream.zep.c index d18a9ce061..cc11ffd131 100644 --- a/ext/phalcon/storage/adapter/stream.zep.c +++ b/ext/phalcon/storage/adapter/stream.zep.c @@ -87,7 +87,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_storage_serializerfactory_ce) + Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\storage\\serializerfactory"))) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); @@ -114,7 +114,7 @@ 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", 60); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "getdirseparator", NULL, 116, &storageDir); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "getdirseparator", NULL, 110, &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); @@ -153,9 +153,9 @@ 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, 116, &_0); + ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdirseparator", NULL, 110, &_0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 117, &directory); + ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 111, &directory); zephir_check_call_status(); zephir_is_iterable(&iterator, 0, "phalcon/Storage/Adapter/Stream.zep", 91); if (Z_TYPE_P(&iterator) == IS_ARRAY) { @@ -319,9 +319,9 @@ 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, 118, &key); + ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 112, &key); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("unlink", NULL, 119, &filepath); + ZEPHIR_RETURN_CALL_FUNCTION("unlink", NULL, 113, &filepath); zephir_check_call_status(); RETURN_MM(); } @@ -378,17 +378,17 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, get) } - ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 118, &key); + ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 112, &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, 120, &filepath); + ZEPHIR_CALL_METHOD(&payload, this_ptr, "getpayload", NULL, 114, &filepath); zephir_check_call_status(); _0 = ZEPHIR_IS_EMPTY(&payload); if (!(_0)) { - ZEPHIR_CALL_METHOD(&_1, this_ptr, "isexpired", NULL, 121, &payload); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "isexpired", NULL, 115, &payload); zephir_check_call_status(); _0 = zephir_is_true(&_1); } @@ -465,7 +465,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getKeys) ZEPHIR_INIT_VAR(&files); array_init(&files); - ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 122); + ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 116); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, this_ptr, "phpfileexists", NULL, 0, &directory); zephir_check_call_status(); @@ -473,7 +473,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getKeys) array_init(return_value); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 117, &directory); + ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 111, &directory); zephir_check_call_status(); zephir_is_iterable(&iterator, 0, "phalcon/Storage/Adapter/Stream.zep", 197); if (Z_TYPE_P(&iterator) == IS_ARRAY) { @@ -564,19 +564,19 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, has) } - ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 118, &key); + ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 112, &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, 120, &filepath); + ZEPHIR_CALL_METHOD(&payload, this_ptr, "getpayload", NULL, 114, &filepath); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_IS_EMPTY(&payload))) { RETURN_MM_BOOL(0); } - ZEPHIR_CALL_METHOD(&_1, this_ptr, "isexpired", NULL, 121, &payload); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "isexpired", NULL, 115, &payload); zephir_check_call_status(); RETURN_MM_BOOL(!zephir_is_true(&_1)); } @@ -725,7 +725,7 @@ 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, 123, &payload, &key); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "storepayload", NULL, 117, &payload, &key); zephir_check_call_status(); RETURN_MM(); } @@ -784,7 +784,7 @@ 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, 123, &payload, &key); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "storepayload", NULL, 117, &payload, &key); zephir_check_call_status(); RETURN_MM(); } @@ -843,15 +843,15 @@ 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, 116, &_2); + ZEPHIR_CALL_METHOD(&dirPrefix, this_ptr, "getdirseparator", NULL, 110, &_2); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "getkeywithoutprefix", NULL, 124, &key); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "getkeywithoutprefix", NULL, 118, &key); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&dirFromFile, this_ptr, "getdirfromfile", NULL, 125, &_3); + ZEPHIR_CALL_METHOD(&dirFromFile, this_ptr, "getdirfromfile", NULL, 119, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); ZEPHIR_CONCAT_VV(&_4, &dirPrefix, &dirFromFile); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getdirseparator", NULL, 116, &_4); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getdirseparator", NULL, 110, &_4); zephir_check_call_status(); RETURN_MM(); } @@ -887,9 +887,9 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getFilepath) zephir_get_strval(&key, key_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdir", NULL, 122, &key); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdir", NULL, 116, &key); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "getkeywithoutprefix", NULL, 124, &key); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getkeywithoutprefix", NULL, 118, &key); zephir_check_call_status(); ZEPHIR_CONCAT_VV(return_value, &_0, &_1); RETURN_MM(); @@ -980,10 +980,10 @@ 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, 126, &dir, &_1); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 120, &dir, &_1); zephir_check_call_status(); ZVAL_LONG(&_1, 2); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 127, &_0, &_1); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 121, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -1044,7 +1044,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getPayload) RETURN_MM(); } ZVAL_LONG(&_1, 1); - ZEPHIR_CALL_FUNCTION(&_2, "flock", NULL, 128, &pointer, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "flock", NULL, 122, &pointer, &_1); zephir_check_call_status(); if (EXPECTED(ZEPHIR_IS_TRUE_IDENTICAL(&_2))) { ZEPHIR_CALL_METHOD(&payload, this_ptr, "phpfilegetcontents", NULL, 0, &filepath); @@ -1055,34 +1055,34 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getPayload) array_init(return_value); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 129); + ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 123); 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, 130, &version, &_0, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "version_compare", NULL, 124, &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_1__closure_ce, SL("__invoke")); ZVAL_LONG(&_6$$6, 8); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 131, &_5$$6, &_6$$6); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 125, &_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_2__closure_ce, SL("__invoke")); ZVAL_LONG(&_8$$7, 8); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 131, &_7$$7, &_8$$7); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 125, &_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, 132); + ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 126); zephir_check_call_status(); _10 = ZEPHIR_GLOBAL(warning).enable; if (!(_10)) { @@ -1197,13 +1197,13 @@ 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, 122, &key); + ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 116, &key); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_0, "is_dir", NULL, 133, &directory); + ZEPHIR_CALL_FUNCTION(&_0, "is_dir", NULL, 127, &directory); zephir_check_call_status(); if (!(zephir_is_true(&_0))) { ZVAL_LONG(&_1$$3, 0777); - ZEPHIR_CALL_FUNCTION(NULL, "mkdir", NULL, 134, &directory, &_1$$3, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "mkdir", NULL, 128, &directory, &_1$$3, &__$true); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_3); @@ -1306,7 +1306,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, phpFilePutContents) ZVAL_LONG(&_0, flags); - ZEPHIR_RETURN_CALL_FUNCTION("file_put_contents", NULL, 135, &filename, data, &_0, context); + ZEPHIR_RETURN_CALL_FUNCTION("file_put_contents", NULL, 129, &filename, data, &_0, context); zephir_check_call_status(); RETURN_MM(); } @@ -1336,7 +1336,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, phpFopen) zephir_get_strval(&mode, mode_param); - ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 136, &filename, &mode); + ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 130, &filename, &mode); zephir_check_call_status(); RETURN_MM(); } @@ -1363,7 +1363,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, phpUnlink) zephir_get_strval(&filename, filename_param); - ZEPHIR_RETURN_CALL_FUNCTION("unlink", NULL, 119, &filename); + ZEPHIR_RETURN_CALL_FUNCTION("unlink", NULL, 113, &filename); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/storage/adapterfactory.zep.c b/ext/phalcon/storage/adapterfactory.zep.c index 11bc092390..7cb6f1f89c 100644 --- a/ext/phalcon/storage/adapterfactory.zep.c +++ b/ext/phalcon/storage/adapterfactory.zep.c @@ -56,7 +56,7 @@ PHP_METHOD(Phalcon_Storage_AdapterFactory, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_storage_serializerfactory_ce) + Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\storage\\serializerfactory"))) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(services) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/phalcon/storage/serializer/base64.zep.c b/ext/phalcon/storage/serializer/base64.zep.c index fe2d85693c..827263ef6d 100644 --- a/ext/phalcon/storage/serializer/base64.zep.c +++ b/ext/phalcon/storage/serializer/base64.zep.c @@ -60,7 +60,7 @@ 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, 230, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 224, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -166,7 +166,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Base64, phpBase64Decode) ZVAL_BOOL(&_0, (strict ? 1 : 0)); - ZEPHIR_RETURN_CALL_FUNCTION("base64_decode", NULL, 229, &input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("base64_decode", NULL, 223, &input, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/storage/serializer/igbinary.zep.c b/ext/phalcon/storage/serializer/igbinary.zep.c index 69ed1d67a6..cb72a3541b 100644 --- a/ext/phalcon/storage/serializer/igbinary.zep.c +++ b/ext/phalcon/storage/serializer/igbinary.zep.c @@ -128,33 +128,33 @@ 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, 129); + ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 123); 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, 130, &version, &_1$$4, &_2$$4); + ZEPHIR_CALL_FUNCTION(&_3$$4, "version_compare", NULL, 124, &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_3__closure_ce, SL("__invoke")); ZVAL_LONG(&_5$$5, 2); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 131, &_4$$5, &_5$$5); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 125, &_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_4__closure_ce, SL("__invoke")); ZVAL_LONG(&_7$$6, 2); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 131, &_6$$6, &_7$$6); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 125, &_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, 132); + ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 126); zephir_check_call_status(); _8$$4 = ZEPHIR_GLOBAL(warning).enable; if (!(_8$$4)) { @@ -207,7 +207,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, phpIgbinarySerialize) zephir_fetch_params(1, 1, 0, &value); - ZEPHIR_RETURN_CALL_FUNCTION("igbinary_serialize", NULL, 137, value); + ZEPHIR_RETURN_CALL_FUNCTION("igbinary_serialize", NULL, 131, value); zephir_check_call_status(); RETURN_MM(); } @@ -271,7 +271,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, doUnserialize) zephir_fetch_params(1, 1, 0, &value); - ZEPHIR_RETURN_CALL_FUNCTION("igbinary_unserialize", NULL, 138, value); + ZEPHIR_RETURN_CALL_FUNCTION("igbinary_unserialize", NULL, 132, value); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/storage/serializer/json.zep.c b/ext/phalcon/storage/serializer/json.zep.c index 5de1f0412a..e5ca535eed 100644 --- a/ext/phalcon/storage/serializer/json.zep.c +++ b/ext/phalcon/storage/serializer/json.zep.c @@ -75,7 +75,7 @@ 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, 195, &_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(); @@ -201,16 +201,16 @@ 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, 193); + 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, 194); + 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, 195, &_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(); @@ -266,16 +266,16 @@ 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, 193); + 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, 194); + 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, 195, &_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(); diff --git a/ext/phalcon/storage/serializer/php.zep.c b/ext/phalcon/storage/serializer/php.zep.c index 180df33a07..f785305d33 100644 --- a/ext/phalcon/storage/serializer/php.zep.c +++ b/ext/phalcon/storage/serializer/php.zep.c @@ -109,33 +109,33 @@ PHP_METHOD(Phalcon_Storage_Serializer_Php, unserialize) zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); RETURN_MM_NULL(); } - ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 129); + ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 123); 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, 130, &version, &_1, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "version_compare", NULL, 124, &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, 131, &_4$$4, &_5$$4); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 125, &_4$$4, &_5$$4); zephir_check_call_status(); } 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, 131, &_6$$5, &_7$$5); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 125, &_6$$5, &_7$$5); 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, 132); + ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 126); zephir_check_call_status(); _8 = ZEPHIR_GLOBAL(warning).enable; if (!(_8)) { diff --git a/ext/phalcon/support/debug.zep.c b/ext/phalcon/support/debug.zep.c index b5fd4ea015..134cad9a21 100644 --- a/ext/phalcon/support/debug.zep.c +++ b/ext/phalcon/support/debug.zep.c @@ -362,7 +362,7 @@ 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, 131, &_0); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 125, &_0); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); zephir_create_array(&_2, 2, 0); @@ -407,7 +407,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, 491); + ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 485); zephir_check_call_status(); } zephir_read_static_property_ce(&_0, phalcon_support_debug_ce, SL("isActive"), PH_NOISY_CC | PH_READONLY); @@ -1582,7 +1582,7 @@ 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, 150, &className); + ZEPHIR_CALL_METHOD(NULL, &classReflection, "__construct", NULL, 144, &className); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_11$$5, &classReflection, "isinternal", NULL, 0); zephir_check_call_status(); @@ -1615,7 +1615,7 @@ 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, 147, &functionName); + ZEPHIR_CALL_METHOD(NULL, &functionReflection, "__construct", NULL, 141, &functionName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_17$$10, &functionReflection, "isinternal", NULL, 0); zephir_check_call_status(); diff --git a/ext/phalcon/support/debug/dump.zep.c b/ext/phalcon/support/debug/dump.zep.c index 68d93ba2a5..fc6369f279 100644 --- a/ext/phalcon/support/debug/dump.zep.c +++ b/ext/phalcon/support/debug/dump.zep.c @@ -885,7 +885,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, 429, variable); + ZEPHIR_CALL_FUNCTION(&_46$$12, "get_object_vars", NULL, 423, variable); zephir_check_call_status(); zephir_is_iterable(&_46$$12, 0, "phalcon/Support/Debug/Dump.zep", 273); if (Z_TYPE_P(&_46$$12) == IS_ARRAY) { @@ -976,10 +976,10 @@ 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, 150, variable); + ZEPHIR_CALL_METHOD(NULL, &reflect$$15, "__construct", NULL, 144, variable); zephir_check_call_status(); ZVAL_LONG(&_67$$15, ((1 | 2) | 4)); - ZEPHIR_CALL_METHOD(&props$$15, &reflect$$15, "getproperties", NULL, 161, &_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", 299); if (Z_TYPE_P(&props$$15) == IS_ARRAY) { @@ -1257,7 +1257,7 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, output) ZEPHIR_CONCAT_VV(return_value, &output, &_145$$26); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_147, "is_float", NULL, 213, variable); + ZEPHIR_CALL_FUNCTION(&_147, "is_float", NULL, 207, variable); zephir_check_call_status(); if (zephir_is_true(&_147)) { ZEPHIR_INIT_VAR(&_148$$27); @@ -1418,16 +1418,16 @@ 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, 193); + 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, 194); + 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, 195, &_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", 366); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/support/helper/arr/first.zep.c b/ext/phalcon/support/helper/arr/first.zep.c index 21bc2e5e7d..057b4acdd5 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, 479, &filtered); + ZEPHIR_RETURN_CALL_FUNCTION("reset", NULL, 473, &filtered); ZEPHIR_UNREF(&filtered); zephir_check_call_status(); RETURN_MM(); diff --git a/ext/phalcon/support/helper/arr/group.zep.c b/ext/phalcon/support/helper/arr/group.zep.c index 91b6838003..72a1849069 100644 --- a/ext/phalcon/support/helper/arr/group.zep.c +++ b/ext/phalcon/support/helper/arr/group.zep.c @@ -193,7 +193,7 @@ 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, 184, 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); } diff --git a/ext/phalcon/support/helper/arr/isunique.zep.c b/ext/phalcon/support/helper/arr/isunique.zep.c index 2ecd22335e..2149493fb4 100644 --- a/ext/phalcon/support/helper/arr/isunique.zep.c +++ b/ext/phalcon/support/helper/arr/isunique.zep.c @@ -65,7 +65,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_IsUnique, __invoke) zephir_get_arrval(&collection, collection_param); - ZEPHIR_CALL_FUNCTION(&_0, "array_unique", NULL, 176, &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)); } diff --git a/ext/phalcon/support/helper/arr/last.zep.c b/ext/phalcon/support/helper/arr/last.zep.c index 02fa544e7d..ca1a934bbc 100644 --- a/ext/phalcon/support/helper/arr/last.zep.c +++ b/ext/phalcon/support/helper/arr/last.zep.c @@ -77,7 +77,7 @@ 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, 324, &filtered); + ZEPHIR_RETURN_CALL_FUNCTION("end", NULL, 318, &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 20715d10a3..5fc0476100 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, 503, &collection, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 497, &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 f0aeb8bcc0..1da6d02fde 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, 503, &collection, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 497, &collection, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/support/helper/file/basename.zep.c b/ext/phalcon/support/helper/file/basename.zep.c index 184083b5a5..6e0092fbb8 100644 --- a/ext/phalcon/support/helper/file/basename.zep.c +++ b/ext/phalcon/support/helper/file/basename.zep.c @@ -100,7 +100,7 @@ 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, 361, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "preg_quote", NULL, 355, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5); ZEPHIR_CONCAT_SVS(&_5, "@[^", &_4, "]+$@"); @@ -116,7 +116,7 @@ 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, 361, &suffix, &_6$$3); + ZEPHIR_CALL_FUNCTION(&_7$$3, "preg_quote", NULL, 355, &suffix, &_6$$3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_8$$3); ZEPHIR_CONCAT_SVS(&_8$$3, "@", &_7$$3, "$@"); diff --git a/ext/phalcon/support/helper/json/decode.zep.c b/ext/phalcon/support/helper/json/decode.zep.c index 25aea5a8a7..1b152bf4ff 100644 --- a/ext/phalcon/support/helper/json/decode.zep.c +++ b/ext/phalcon/support/helper/json/decode.zep.c @@ -107,16 +107,16 @@ 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, 193); + 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, 194); + 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, 195, &_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(); diff --git a/ext/phalcon/support/helper/json/encode.zep.c b/ext/phalcon/support/helper/json/encode.zep.c index 6577bdf855..f910cdce33 100644 --- a/ext/phalcon/support/helper/json/encode.zep.c +++ b/ext/phalcon/support/helper/json/encode.zep.c @@ -107,12 +107,12 @@ 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, 193); + 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, 194); + 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); diff --git a/ext/phalcon/support/helper/str/concat.zep.c b/ext/phalcon/support/helper/str/concat.zep.c index b53ae1ece8..8a5779116f 100644 --- a/ext/phalcon/support/helper/str/concat.zep.c +++ b/ext/phalcon/support/helper/str/concat.zep.c @@ -81,19 +81,19 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Concat, __invoke) return; } ZEPHIR_MAKE_REF(&arguments); - ZEPHIR_CALL_FUNCTION(&delimiter, "reset", NULL, 479, &arguments); + ZEPHIR_CALL_FUNCTION(&delimiter, "reset", NULL, 473, &arguments); ZEPHIR_UNREF(&arguments); zephir_check_call_status(); ZVAL_LONG(&_0, 1); - ZEPHIR_CALL_FUNCTION(&_1, "array_slice", NULL, 503, &arguments, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "array_slice", NULL, 497, &arguments, &_0); zephir_check_call_status(); ZEPHIR_CPY_WRT(&arguments, &_1); ZEPHIR_MAKE_REF(&arguments); - ZEPHIR_CALL_FUNCTION(&first, "reset", NULL, 479, &arguments); + ZEPHIR_CALL_FUNCTION(&first, "reset", NULL, 473, &arguments); ZEPHIR_UNREF(&arguments); zephir_check_call_status(); ZEPHIR_MAKE_REF(&arguments); - ZEPHIR_CALL_FUNCTION(&last, "end", NULL, 324, &arguments); + ZEPHIR_CALL_FUNCTION(&last, "end", NULL, 318, &arguments); ZEPHIR_UNREF(&arguments); zephir_check_call_status(); ZEPHIR_INIT_VAR(&prefix); diff --git a/ext/phalcon/support/helper/str/decapitalize.zep.c b/ext/phalcon/support/helper/str/decapitalize.zep.c index 453dcd8db4..21ae978f97 100644 --- a/ext/phalcon/support/helper/str/decapitalize.zep.c +++ b/ext/phalcon/support/helper/str/decapitalize.zep.c @@ -91,7 +91,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Decapitalize, __invoke) ZVAL_LONG(&_0, 1); - ZEPHIR_CALL_FUNCTION(&substr, "mb_substr", NULL, 227, &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); @@ -101,7 +101,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Decapitalize, __invoke) } ZVAL_LONG(&_0, 0); ZVAL_LONG(&_2, 1); - ZEPHIR_CALL_FUNCTION(&_3, "mb_substr", NULL, 227, &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(); diff --git a/ext/phalcon/support/helper/str/dirfromfile.zep.c b/ext/phalcon/support/helper/str/dirfromfile.zep.c index 648e089d09..3375130598 100644 --- a/ext/phalcon/support/helper/str/dirfromfile.zep.c +++ b/ext/phalcon/support/helper/str/dirfromfile.zep.c @@ -79,12 +79,12 @@ PHP_METHOD(Phalcon_Support_Helper_Str_DirFromFile, __invoke) zephir_check_call_status(); ZVAL_LONG(&_0, 0); ZVAL_LONG(&_1, -2); - ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 227, &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, 227, &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); diff --git a/ext/phalcon/support/helper/str/dynamic.zep.c b/ext/phalcon/support/helper/str/dynamic.zep.c index cd5fe56218..ea224736db 100644 --- a/ext/phalcon/support/helper/str/dynamic.zep.c +++ b/ext/phalcon/support/helper/str/dynamic.zep.c @@ -142,9 +142,9 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Dynamic, __invoke) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_FUNCTION(&ldS, "preg_quote", NULL, 361, &leftDelimiter); + ZEPHIR_CALL_FUNCTION(&ldS, "preg_quote", NULL, 355, &leftDelimiter); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&rdS, "preg_quote", NULL, 361, &rightDelimiter); + ZEPHIR_CALL_FUNCTION(&rdS, "preg_quote", NULL, 355, &rightDelimiter); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); ZEPHIR_CONCAT_SVSVVSVS(&_4, "/", &ldS, "([^", &ldS, &rdS, "]+)", &rdS, "/"); @@ -174,11 +174,11 @@ 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, 200, &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, 361, &_12$$6, &separator); + ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 355, &_12$$6, &separator); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_13$$6); ZEPHIR_CONCAT_SVS(&_13$$6, "/", &sub, "/"); @@ -209,11 +209,11 @@ 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, 200, &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, 361, &_20$$8, &separator); + ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 355, &_20$$8, &separator); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_21$$8); ZEPHIR_CONCAT_SVS(&_21$$8, "/", &sub, "/"); diff --git a/ext/phalcon/support/helper/str/friendly.zep.c b/ext/phalcon/support/helper/str/friendly.zep.c index 458afb0361..3bbc2341dd 100644 --- a/ext/phalcon/support/helper/str/friendly.zep.c +++ b/ext/phalcon/support/helper/str/friendly.zep.c @@ -241,7 +241,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Friendly, getMatrix) ZEPHIR_INIT_VAR(&matrix); - zephir_create_array(&matrix, 79, 0); + zephir_create_array(&matrix, 78, 0); add_assoc_stringl_ex(&matrix, SL("Š"), SL("S")); add_assoc_stringl_ex(&matrix, SL("š"), SL("s")); add_assoc_stringl_ex(&matrix, SL("Đ"), SL("Dj")); diff --git a/ext/phalcon/support/helper/str/len.zep.c b/ext/phalcon/support/helper/str/len.zep.c index 3981a76e3c..89c732ae85 100644 --- a/ext/phalcon/support/helper/str/len.zep.c +++ b/ext/phalcon/support/helper/str/len.zep.c @@ -73,7 +73,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Len, __invoke) } - ZEPHIR_RETURN_CALL_FUNCTION("mb_strlen", NULL, 233, &text, &encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strlen", NULL, 227, &text, &encoding); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/support/helper/str/random.zep.c b/ext/phalcon/support/helper/str/random.zep.c index b1d3489d24..80c8d6e29e 100644 --- a/ext/phalcon/support/helper/str/random.zep.c +++ b/ext/phalcon/support/helper/str/random.zep.c @@ -134,37 +134,37 @@ 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, 318, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&_5, "range", NULL, 312, &_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, 318, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&_6, "range", NULL, 312, &_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, 318, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_9, "range", NULL, 312, &_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, 318, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&_10, "range", NULL, 312, &_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, 318, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 312, &_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, 318, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 312, &_7, &_8); zephir_check_call_status(); zephir_array_update_long(&pools, 4, &_11, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); ZEPHIR_INIT_NVAR(&_2); @@ -174,21 +174,21 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Random, __invoke) 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, 318, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 312, &_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, 318, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_12, "range", NULL, 312, &_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, 318, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_13, "range", NULL, 312, &_2, &_3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_14, "array_merge", NULL, 334, &_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); diff --git a/ext/phalcon/support/version.zep.c b/ext/phalcon/support/version.zep.c index 96f7425e92..307eb7471e 100644 --- a/ext/phalcon/support/version.zep.c +++ b/ext/phalcon/support/version.zep.c @@ -271,11 +271,11 @@ PHP_METHOD(Phalcon_Support_Version, getId) zephir_array_fetch_long(&specialNumber, &version, 4, PH_NOISY, "phalcon/Support/Version.zep", 164); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "%02s"); - ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 113, &_0, &medium); + ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 107, &_0, &medium); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "%02s"); - ZEPHIR_CALL_FUNCTION(&_2, "sprintf", NULL, 113, &_0, &minor); + ZEPHIR_CALL_FUNCTION(&_2, "sprintf", NULL, 107, &_0, &minor); zephir_check_call_status(); ZEPHIR_CONCAT_VVVVV(return_value, &major, &_1, &_2, &special, &specialNumber); RETURN_MM(); diff --git a/ext/phalcon/tag.zep.c b/ext/phalcon/tag.zep.c index ab191280ac..ee88d899bf 100644 --- a/ext/phalcon/tag.zep.c +++ b/ext/phalcon/tag.zep.c @@ -960,7 +960,7 @@ 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, 297, &documentPrependTitle); + ZEPHIR_CALL_FUNCTION(&tmp$$5, "array_reverse", NULL, 291, &documentPrependTitle); zephir_check_call_status(); zephir_is_iterable(&tmp$$5, 0, "phalcon/Tag.zep", 443); if (Z_TYPE_P(&tmp$$5) == IS_ARRAY) { @@ -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, 501, &_8$$5, &_5$$5, &attributes); + ZEPHIR_CALL_METHOD(NULL, &link, "__construct", NULL, 495, &_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, 502, &_10$$5); + ZEPHIR_CALL_METHOD(&_9$$5, &_8$$5, "serialize", NULL, 496, &_10$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(&header); ZEPHIR_CONCAT_SV(&header, "Link: ", &_9$$5); @@ -2588,7 +2588,7 @@ PHP_METHOD(Phalcon_Tag, setDI) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) ZEND_PARSE_PARAMETERS_END(); #endif @@ -3110,7 +3110,7 @@ PHP_METHOD(Phalcon_Tag, textArea) ZVAL_STRING(&_1, "", &_2, ""); diff --git a/ext/phalcon/tag/select.zep.c b/ext/phalcon/tag/select.zep.c index e4a09abe21..1906a50862 100644 --- a/ext/phalcon/tag/select.zep.c +++ b/ext/phalcon/tag/select.zep.c @@ -292,7 +292,7 @@ PHP_METHOD(Phalcon_Tag_Select, optionsFromArray) } ZEPHIR_INIT_NVAR(&optionText); ZVAL_COPY(&optionText, _0); - ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_4, 287, &optionValue); + ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_4, 281, &optionValue); zephir_check_call_status(); if (Z_TYPE_P(&optionText) == IS_ARRAY) { ZEPHIR_INIT_NVAR(&_5$$4); @@ -345,7 +345,7 @@ PHP_METHOD(Phalcon_Tag_Select, optionsFromArray) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&optionText, &data, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_4, 287, &optionValue); + ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_4, 281, &optionValue); zephir_check_call_status(); if (Z_TYPE_P(&optionText) == IS_ARRAY) { ZEPHIR_INIT_NVAR(&_16$$12); @@ -434,7 +434,7 @@ PHP_METHOD(Phalcon_Tag_Select, optionsFromResultset) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(4, 4) - Z_PARAM_OBJECT_OF_CLASS(resultset, phalcon_mvc_model_resultsetinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(resultset, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\resultsetinterface"))) Z_PARAM_ZVAL(using) Z_PARAM_ZVAL(value) Z_PARAM_STR(closeOption) diff --git a/ext/phalcon/translate/adapter/abstractadapter.zep.c b/ext/phalcon/translate/adapter/abstractadapter.zep.c index a4305798b7..6ef46b1a4c 100644 --- a/ext/phalcon/translate/adapter/abstractadapter.zep.c +++ b/ext/phalcon/translate/adapter/abstractadapter.zep.c @@ -72,7 +72,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_AbstractAdapter, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(interpolator, phalcon_translate_interpolatorfactory_ce) + Z_PARAM_OBJECT_OF_CLASS(interpolator, zephir_get_internal_ce(SL("phalcon\\translate\\interpolatorfactory"))) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/phalcon/translate/adapter/csv.zep.c b/ext/phalcon/translate/adapter/csv.zep.c index b325f8d87b..f94010be04 100644 --- a/ext/phalcon/translate/adapter/csv.zep.c +++ b/ext/phalcon/translate/adapter/csv.zep.c @@ -83,7 +83,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Csv, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(interpolator, phalcon_translate_interpolatorfactory_ce) + Z_PARAM_OBJECT_OF_CLASS(interpolator, zephir_get_internal_ce(SL("phalcon\\translate\\interpolatorfactory"))) Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); #endif @@ -403,7 +403,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Csv, phpFopen) zephir_get_strval(&mode, mode_param); - ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 136, &filename, &mode); + ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 130, &filename, &mode); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/translate/adapter/gettext.zep.c b/ext/phalcon/translate/adapter/gettext.zep.c index 0dfc34ae75..110fc7b2ee 100644 --- a/ext/phalcon/translate/adapter/gettext.zep.c +++ b/ext/phalcon/translate/adapter/gettext.zep.c @@ -106,7 +106,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(interpolator, phalcon_translate_interpolatorfactory_ce) + Z_PARAM_OBJECT_OF_CLASS(interpolator, zephir_get_internal_ce(SL("phalcon\\translate\\interpolatorfactory"))) Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/translate/adapter/nativearray.zep.c b/ext/phalcon/translate/adapter/nativearray.zep.c index 0ae5ca81fc..810514d131 100644 --- a/ext/phalcon/translate/adapter/nativearray.zep.c +++ b/ext/phalcon/translate/adapter/nativearray.zep.c @@ -87,7 +87,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_NativeArray, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(interpolator, phalcon_translate_interpolatorfactory_ce) + Z_PARAM_OBJECT_OF_CLASS(interpolator, zephir_get_internal_ce(SL("phalcon\\translate\\interpolatorfactory"))) Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/translate/interpolator/indexedarray.zep.c b/ext/phalcon/translate/interpolator/indexedarray.zep.c index 372ca5f9fc..51032b1eed 100644 --- a/ext/phalcon/translate/interpolator/indexedarray.zep.c +++ b/ext/phalcon/translate/interpolator/indexedarray.zep.c @@ -92,7 +92,7 @@ PHP_METHOD(Phalcon_Translate_Interpolator_IndexedArray, replacePlaceholders) if (1 != ZEPHIR_IS_EMPTY(&placeholders)) { ZEPHIR_MAKE_REF(&placeholders); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 271, &placeholders, &translation); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 265, &placeholders, &translation); ZEPHIR_UNREF(&placeholders); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0$$3); diff --git a/ext/phalcon/translate/translatefactory.zep.c b/ext/phalcon/translate/translatefactory.zep.c index 146e1987a4..2c8d6843ae 100644 --- a/ext/phalcon/translate/translatefactory.zep.c +++ b/ext/phalcon/translate/translatefactory.zep.c @@ -66,7 +66,7 @@ PHP_METHOD(Phalcon_Translate_TranslateFactory, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(interpolator, phalcon_translate_interpolatorfactory_ce) + Z_PARAM_OBJECT_OF_CLASS(interpolator, zephir_get_internal_ce(SL("phalcon\\translate\\interpolatorfactory"))) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(services) ZEND_PARSE_PARAMETERS_END(); diff --git a/phalcon/Mvc/Model/Row.zep b/phalcon/Mvc/Model/Row.zep index 134abdcb61..ab9aca006c 100644 --- a/phalcon/Mvc/Model/Row.zep +++ b/phalcon/Mvc/Model/Row.zep @@ -19,7 +19,7 @@ use Phalcon\Mvc\ModelInterface; * 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]. */ -class Row implements EntityInterface, ResultInterface, ArrayAccess, JsonSerializable +class Row extends \stdClass implements EntityInterface, ResultInterface, ArrayAccess, JsonSerializable { /** * Serializes the object for json_encode From 0c12a338c0cfa9f030fcb0208e17d4f8719786fd Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Mon, 17 Jul 2023 12:27:40 -0400 Subject: [PATCH 14/35] Added stdClass to Injectable --- phalcon/Di/Injectable.zep | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phalcon/Di/Injectable.zep b/phalcon/Di/Injectable.zep index 51a262c463..fdca331f6a 100644 --- a/phalcon/Di/Injectable.zep +++ b/phalcon/Di/Injectable.zep @@ -10,6 +10,7 @@ namespace Phalcon\Di; +use stdClass; use Phalcon\Di\Di; use Phalcon\Session\BagInterface; @@ -42,7 +43,7 @@ use Phalcon\Session\BagInterface; * @property \Phalcon\Session\Bag|\Phalcon\Session\BagInterface $persistent * @property \Phalcon\Mvc\View|\Phalcon\Mvc\ViewInterface $view */ -abstract class Injectable implements InjectionAwareInterface +abstract class Injectable extends stdClass implements InjectionAwareInterface { /** * Dependency Injector From 064ccd37bc3915d0fde6f87a358f72fe85d4da70 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Mon, 17 Jul 2023 12:27:52 -0400 Subject: [PATCH 15/35] Adding test for php 8.2 deprecation warning --- .../integration/Mvc/Micro/GetServiceCest.php | 76 ++++++++++++------- 1 file changed, 50 insertions(+), 26 deletions(-) diff --git a/tests/integration/Mvc/Micro/GetServiceCest.php b/tests/integration/Mvc/Micro/GetServiceCest.php index 0ed85adba6..6369ba801a 100644 --- a/tests/integration/Mvc/Micro/GetServiceCest.php +++ b/tests/integration/Mvc/Micro/GetServiceCest.php @@ -13,59 +13,83 @@ namespace Phalcon\Tests\Integration\Mvc\Micro; +use ErrorException; use IntegrationTester; use Phalcon\Di\Di; +use Phalcon\Di\FactoryDefault; use Phalcon\Html\Escaper; +use Phalcon\Http\Request; use Phalcon\Mvc\Dispatcher; use Phalcon\Mvc\Micro; use Phalcon\Mvc\Router; +use function restore_error_handler; +use function set_error_handler; + class GetServiceCest { /** * Tests Phalcon\Mvc\Micro :: getService() * - * @author Sid Roberts + * @author Phalcon Team * @since 2019-05-22 */ public function mvcMicroGetService(IntegrationTester $I) { $I->wantToTest('Mvc\Micro - getService()'); - $micro = new Micro(); - - $di = new Di(); - - $micro->setDi($di); - - - $escaper = new Escaper(); - + $micro = new Micro(); + $container = new Di(); + $escaper = new Escaper(); + $micro->setDi($container); $micro->setService('escaper', $escaper); - $I->assertSame( - $escaper, - $micro->getService('escaper') - ); - + $expected = $escaper; + $actual = $micro->getService('escaper'); + $I->assertSame($expected, $actual); $dispatcher = new Dispatcher(); - $micro['dispatcher'] = $dispatcher; - $I->assertSame( - $dispatcher, - $micro->getService('dispatcher') - ); - + $expected = $dispatcher; + $actual = $micro->getService('dispatcher'); + $I->assertSame($expected, $actual); $router = new Router(); + $container->set('router', $router); - $di->set('router', $router); - - $I->assertSame( - $router, - $micro->getService('router') + $expected = $router; + $actual = $micro->getService('router'); + $I->assertSame($expected, $actual); + } + /** + * Tests after binding event + * + * @author Phalcon Team + * @since 2023-07-03 + */ + public function mvcMicroGetServiceWithProperty(IntegrationTester $I) + { + $container = new FactoryDefault(); + $micro = new Micro($container); + $error = ''; + + set_error_handler( + function ($number, $message, $file, $line) { + throw new ErrorException($message, 0, $number, $file, $line); + } ); + + try { + $class = Request::class; + $request = $micro->request; + $I->assertInstanceOf($class, $request); + } catch (ErrorException $ex) { + $error = $ex->getMessage(); + } + + restore_error_handler(); + + $I->assertEmpty($error); } } From 58e25db065f87101f097a38781f452c3765daa66 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Mon, 17 Jul 2023 12:46:18 -0400 Subject: [PATCH 16/35] updating changelog --- CHANGELOG-5.0.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md index ca9af17a6f..42cf60f501 100644 --- a/CHANGELOG-5.0.md +++ b/CHANGELOG-5.0.md @@ -5,6 +5,7 @@ ### Fixed - Tried to reproduce the behavior described in #16244 but had no success. [#16244](https://github.com/phalcon/cphalcon/issues/16244) - Added `getAdapter()` in `Phalcon\Mvc\Model\Metadata` to retrieve the internal cache adapter if necessary. [#16244](https://github.com/phalcon/cphalcon/issues/16244) +- Extended `Phalcon\Di\Injectable` from `stdClass` to remove the deprecation warning (dynamic properties) for PHP 8.2 [#16308](https://github.com/phalcon/cphalcon/issues/16308) ## [5.2.2](https://github.com/phalcon/cphalcon/releases/tag/v5.2.2) (2023-06-18) From 041554b91ef4ddc97d73c9b13748a14aa5d72fef Mon Sep 17 00:00:00 2001 From: Rudi Servo Date: Mon, 17 Jul 2023 19:01:54 +0000 Subject: [PATCH 17/35] added Weak Storage and Cache, for objects only using WeakReference --- CHANGELOG-5.0.md | 1 + phalcon/Cache/Adapter/Weak.zep | 21 ++ phalcon/Cache/AdapterFactory.zep | 3 +- phalcon/Storage/Adapter/Weak.zep | 225 ++++++++++++++++++ phalcon/Storage/AdapterFactory.zep | 3 +- tests/integration/Cache/Adapter/ClearCest.php | 50 +++- .../Cache/Adapter/ConstructCest.php | 8 + .../integration/Cache/Adapter/DeleteCest.php | 53 +++++ .../Cache/Adapter/GetAdapterCest.php | 9 + .../Cache/Adapter/GetPrefixCest.php | 30 +++ .../integration/Cache/Adapter/GetSetCest.php | 34 +++ .../Adapter/GetSetDefaultSerializerCest.php | 25 ++ .../Cache/Adapter/GetSetForeverCest.php | 32 +++ tests/integration/Cache/Adapter/HasCest.php | 29 +++ .../Cache/Adapter/Weak/GetKeysCest.php | 85 +++++++ .../Cache/Adapter/Weak/GetSetCest.php | 75 ++++++ .../Cache/AdapterFactory/NewInstanceCest.php | 6 + .../integration/Storage/Adapter/ClearCest.php | 48 ++++ .../Storage/Adapter/ConstructCest.php | 8 + .../Storage/Adapter/DeleteCest.php | 53 +++++ .../Storage/Adapter/GetAdapterCest.php | 9 + .../Storage/Adapter/GetKeysCest.php | 54 +++++ .../Storage/Adapter/GetPrefixCest.php | 30 +++ .../Storage/Adapter/GetSetCest.php | 34 +++ .../Adapter/GetSetDefaultSerializerCest.php | 25 ++ .../Storage/Adapter/GetSetForeverCest.php | 32 +++ tests/integration/Storage/Adapter/HasCest.php | 29 +++ .../AdapterFactory/NewInstanceCest.php | 6 + 28 files changed, 1014 insertions(+), 3 deletions(-) create mode 100644 phalcon/Cache/Adapter/Weak.zep create mode 100644 phalcon/Storage/Adapter/Weak.zep create mode 100644 tests/integration/Cache/Adapter/Weak/GetKeysCest.php create mode 100644 tests/integration/Cache/Adapter/Weak/GetSetCest.php diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md index ca9af17a6f..e0573917c8 100644 --- a/CHANGELOG-5.0.md +++ b/CHANGELOG-5.0.md @@ -5,6 +5,7 @@ ### Fixed - Tried to reproduce the behavior described in #16244 but had no success. [#16244](https://github.com/phalcon/cphalcon/issues/16244) - Added `getAdapter()` in `Phalcon\Mvc\Model\Metadata` to retrieve the internal cache adapter if necessary. [#16244](https://github.com/phalcon/cphalcon/issues/16244) +- Added `Phalcon\Storage\Adapter\Weak` implemented with WeakReference has a cache/retrieval solution for objects not yet collected by the Garbage Collection. [#16372] (https://github.com/phalcon/cphalcon/issues/16372) ## [5.2.2](https://github.com/phalcon/cphalcon/releases/tag/v5.2.2) (2023-06-18) diff --git a/phalcon/Cache/Adapter/Weak.zep b/phalcon/Cache/Adapter/Weak.zep new file mode 100644 index 0000000000..0999926c89 --- /dev/null +++ b/phalcon/Cache/Adapter/Weak.zep @@ -0,0 +1,21 @@ + +/** + * 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. + */ + +namespace Phalcon\Cache\Adapter; + +use Phalcon\Cache\Adapter\AdapterInterface as CacheAdapterInterface; +use Phalcon\Storage\Adapter\Weak as StorageWeak; + +/** +* WeakCache implementation based on WeakReference +*/ +class Weak extends StorageWeak implements CacheAdapterInterface +{ +} diff --git a/phalcon/Cache/AdapterFactory.zep b/phalcon/Cache/AdapterFactory.zep index 1e03e42237..2c121768b7 100644 --- a/phalcon/Cache/AdapterFactory.zep +++ b/phalcon/Cache/AdapterFactory.zep @@ -101,7 +101,8 @@ class AdapterFactory extends AbstractFactory "libmemcached" : "Phalcon\\Cache\\Adapter\\Libmemcached", "memory" : "Phalcon\\Cache\\Adapter\\Memory", "redis" : "Phalcon\\Cache\\Adapter\\Redis", - "stream" : "Phalcon\\Cache\\Adapter\\Stream" + "stream" : "Phalcon\\Cache\\Adapter\\Stream", + "weak" : "Phalcon\\Cache\\Adapter\\Weak" ]; } } diff --git a/phalcon/Storage/Adapter/Weak.zep b/phalcon/Storage/Adapter/Weak.zep new file mode 100644 index 0000000000..d404970465 --- /dev/null +++ b/phalcon/Storage/Adapter/Weak.zep @@ -0,0 +1,225 @@ + +/** + * 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. + */ + +namespace Phalcon\Storage\Adapter; + + +use DateInterval; +use Exception as BaseException; +use Phalcon\Storage\SerializerFactory; +use Phalcon\Support\Exception as SupportException; +use Phalcon\Storage\Serializer\SerializerInterface; + +/** +* Weak Adapter +*/ +class Weak extends AbstractAdapter +{ + + /** + * + * + * @var int|null + */ + protected fetching = null; + + /** + * @var array + */ + + protected weakList = []; + + /** + * @var array + */ + protected options = []; + + /** + * Constructor, there are no options + * + * @param array options = [] + * @throws SupportException + */ + public function __construct( factory, array! options = []) + { + let this->defaultSerializer = "none", + this->prefix = "", + this->options = options; + } + + /** + * Flushes/clears the cache + */ + public function clear() -> bool + { + let this->weakList = []; + return true; + } + + /** + * Decrements a stored number + * + * @param string $key + * @param int $value + * + * @return bool|int + */ + public function decrement(string! key, int value = 1) -> int | bool + { + return false; + } + + /** + * Deletes data from the adapter + * + * @param string $key + * + * @return bool + */ + public function delete(string! key) -> bool + { + var exists; + if key === this->fetching { + return false; + } + let exists = isset this->weakList[key]; + unset(this->weakList[key]); + return exists; + } + + /** + * Stores data in the adapter + * + * @param string $prefix + * + * @return array + */ + public function getKeys(string prefix = "") -> array + { + var keys, key; + array results; + let keys = array_keys(this->weakList); + if unlikely "" !== prefix { + let results = []; + for key in keys { + if starts_with(key, prefix) { + let results[] = key; + } + } + return results; + } + return keys; + } + + /** + * Increments a stored number + * + * @param string $key + * @param int $value + * + * @return bool|int + */ + public function increment(string! key, int value = 1) -> int | bool + { + return false; + } + + /** + * Reads data from the adapter + * + * @param string key + * @param mixed|null defaultValue + * + * @return mixed + */ + public function get(string! key, var defaultValue = null) -> var + { + var value, wr; + /** + * while getting a key, garbage collection might be triggered, + * this will stop unsetting the key, will not stop however the model gets destroid by GC, + * this is for the destruct that is in the model + * not do destroy the key before getting it. + */ + let this->fetching = key; + if false === isset this->weakList[key] { + let this->fetching = null; + return defaultValue; + } + let wr = this->weakList[key]; + let value = wr->get(); + let this->fetching = null; + /** + * value could be null, object could be destroid while fetching + */ + if null === value { + this->delete(key); + } + return value; + } + + /** + * Checks if an element exists in the cache + * + * @param string key + * + * @return bool + */ + public function has(string! key) -> bool + { + return isset this->weakList[key]; + } + + /** + * Stores data in the adapter. If the TTL is `null` (default) or not defined + * then the default TTL will be used, as set in this adapter. If the TTL + * is `0` or a negative number, a `delete()` will be issued, since this + * item has expired. If you need to set this key forever, you should use + * the `setForever()` method. + * + * @param string $key + * @param mixed $value + * @param DateInterval|int|null $ttl + * + * @return bool + * @throws BaseException + */ + public function set(string! key, var value, var ttl = null) -> bool + { + if typeof value !== "object" { + return false; + } + if false === isset this->weakList[key] { + let this->weakList[key] = \WeakReference::create(value); + } + return true; + } + + /** + * For compatiblity only, there is no Forever with WeakReference. + * + * @param string $key + * @param mixed $value + * + * @return bool + */ + public function setForever(string key, value) -> bool + { + return this->set(key, value); + } + + /** + * will never set a serializer, WeakReference cannot be serialized + * @param string $serializer + */ + public function setDefaultSerializer(string serializer) -> void + { + } +} diff --git a/phalcon/Storage/AdapterFactory.zep b/phalcon/Storage/AdapterFactory.zep index fdd85dda69..3b2ccf9bb1 100644 --- a/phalcon/Storage/AdapterFactory.zep +++ b/phalcon/Storage/AdapterFactory.zep @@ -92,7 +92,8 @@ class AdapterFactory extends AbstractFactory "libmemcached" : "Phalcon\\Storage\\Adapter\\Libmemcached", "memory" : "Phalcon\\Storage\\Adapter\\Memory", "redis" : "Phalcon\\Storage\\Adapter\\Redis", - "stream" : "Phalcon\\Storage\\Adapter\\Stream" + "stream" : "Phalcon\\Storage\\Adapter\\Stream", + "weak" : "Phalcon\\Storage\\Adapter\\Weak" ]; } } diff --git a/tests/integration/Cache/Adapter/ClearCest.php b/tests/integration/Cache/Adapter/ClearCest.php index de5c42db4d..e4468f22c2 100644 --- a/tests/integration/Cache/Adapter/ClearCest.php +++ b/tests/integration/Cache/Adapter/ClearCest.php @@ -21,6 +21,7 @@ use Phalcon\Cache\Adapter\Memory; use Phalcon\Cache\Adapter\Redis; use Phalcon\Cache\Adapter\Stream; +use Phalcon\Cache\Adapter\Weak; use Phalcon\Storage\SerializerFactory; use function getOptionsLibmemcached; @@ -169,7 +170,7 @@ public function cacheAdapterClear(IntegrationTester $I, Example $example) { $I->wantToTest( sprintf( - 'Cache\Adapter\%s - getPrefix()', + 'Cache\Adapter\%s - getClear()', $example['className'] ) ); @@ -211,6 +212,53 @@ public function cacheAdapterClear(IntegrationTester $I, Example $example) $I->assertTrue($actual); } + /** + * Tests Phalcon\Cache\Adapter\Weak :: clear() + * + * @param IntegrationTester $I + * + * @throws HelperException + * + * @author Phalcon Team + * @since 2023-07-17 + */ + public function cacheAdapterWealClear(IntegrationTester $I) + { + + $I->wantToTest('Cache\Adapter\Weak - getAdapter()'); + + $serializer = new SerializerFactory(); + $adapter = new Weak($serializer); + + $obj1 = new \stdClass(); + $obj1->id = 1; + $obj2 = new \stdClass(); + $obj2->id = 2; + $key1 = uniqid(); + $key2 = uniqid(); + $adapter->set($key1, $obj1); + $adapter->set($key2, $obj2); + + $temp = $adapter->get($key1); + $I->assertEquals($temp, $adapter->get($key1)); + $I->assertEquals($temp, $obj1); + + $temp = $adapter->get($key2); + $I->assertEquals($temp, $adapter->get($key2)); + $I->assertEquals($temp, $obj2); + + $actual = $adapter->clear(); + $I->assertTrue($actual); + $actual = $adapter->has($key1); + $I->assertFalse($actual); + + $actual = $adapter->has($key2); + $I->assertFalse($actual); + + $actual = $adapter->clear(); + $I->assertTrue($actual); + } + /** * @return array[] */ diff --git a/tests/integration/Cache/Adapter/ConstructCest.php b/tests/integration/Cache/Adapter/ConstructCest.php index cfda9f14c4..47fab597d6 100644 --- a/tests/integration/Cache/Adapter/ConstructCest.php +++ b/tests/integration/Cache/Adapter/ConstructCest.php @@ -22,6 +22,7 @@ use Phalcon\Cache\Adapter\Memory; use Phalcon\Cache\Adapter\Redis; use Phalcon\Cache\Adapter\Stream; +use Phalcon\Cache\Adapter\Weak; use Phalcon\Storage\Exception as CacheException; use Phalcon\Storage\SerializerFactory; use Phalcon\Support\Exception as SupportException; @@ -196,6 +197,13 @@ private function getExamples(): array ], 'extension' => '', ], + [ + 'className' => 'Weak', + 'label' => 'default', + 'class' => Weak::class, + 'options' => [], + 'extension' => '', + ], ]; } } diff --git a/tests/integration/Cache/Adapter/DeleteCest.php b/tests/integration/Cache/Adapter/DeleteCest.php index f920f3424b..6bdee230b4 100644 --- a/tests/integration/Cache/Adapter/DeleteCest.php +++ b/tests/integration/Cache/Adapter/DeleteCest.php @@ -20,6 +20,7 @@ use Phalcon\Cache\Adapter\Memory; use Phalcon\Cache\Adapter\Redis; use Phalcon\Cache\Adapter\Stream; +use Phalcon\Cache\Adapter\Weak; use Phalcon\Storage\SerializerFactory; use function getOptionsLibmemcached; @@ -83,6 +84,58 @@ public function cacheAdapterDelete(IntegrationTester $I, Example $example) $I->assertFalse($actual); } + /** + * Tests Phalcon\Cache\Adapter\Weak :: delete() + * + * @param IntegrationTester $I + * + * @author Phalcon Team + * @since 2023-07-17 + */ + public function cacheAdapterWeakDelete(IntegrationTester $I) + { + + $I->wantToTest('Cache\Adapter\Weak - delete()'); + + $serializer = new SerializerFactory(); + $adapter = new Weak($serializer); + + $obj1 = new \stdClass(); + $obj1->id = 1; + $obj2 = new \stdClass(); + $obj2->id = 2; + + + $key1 = uniqid(); + $key2 = uniqid(); + $adapter->set($key1, $obj1); + $adapter->set($key2, $obj2); + + $actual = $adapter->has($key1); + $I->assertTrue($actual); + $actual = $adapter->has($key2); + $I->assertTrue($actual); + + unset($obj1); + gc_collect_cycles(); + $I->assertEquals(null, $adapter->get($key1)); + + $temp = $adapter->get($key2); + unset($obj2); + gc_collect_cycles(); + $I->assertEquals($temp, $adapter->get($key2)); + + unset($temp); + $actual = $adapter->delete($key2); + $I->assertTrue($actual); + $actual = $adapter->delete($key2); + $I->assertFalse($actual); + + $key = uniqid(); + $actual = $adapter->delete($key); + $I->assertFalse($actual); + } + /** * @return array[] */ diff --git a/tests/integration/Cache/Adapter/GetAdapterCest.php b/tests/integration/Cache/Adapter/GetAdapterCest.php index 43728a55f6..4da73f6d67 100644 --- a/tests/integration/Cache/Adapter/GetAdapterCest.php +++ b/tests/integration/Cache/Adapter/GetAdapterCest.php @@ -21,6 +21,7 @@ use Phalcon\Cache\Adapter\Memory; use Phalcon\Cache\Adapter\Redis; use Phalcon\Cache\Adapter\Stream; +use Phalcon\Cache\Adapter\Weak; use Phalcon\Storage\SerializerFactory; use Redis as NativeRedis; @@ -115,6 +116,14 @@ private function getExamples(): array 'expected' => null, 'extension' => '', ], + [ + 'className' => 'Weak', + 'label' => 'default', + 'class' => Weak::class, + 'options' => [], + 'expected' => null, + 'extension' => '', + ], ]; } } diff --git a/tests/integration/Cache/Adapter/GetPrefixCest.php b/tests/integration/Cache/Adapter/GetPrefixCest.php index 947b822c8b..7fa53bba69 100644 --- a/tests/integration/Cache/Adapter/GetPrefixCest.php +++ b/tests/integration/Cache/Adapter/GetPrefixCest.php @@ -20,6 +20,7 @@ use Phalcon\Cache\Adapter\Memory; use Phalcon\Cache\Adapter\Redis; use Phalcon\Cache\Adapter\Stream; +use Phalcon\Cache\Adapter\Weak; use Phalcon\Storage\SerializerFactory; use function array_merge; @@ -232,6 +233,35 @@ private function getExamples(): array 'expected' => 'my-prefix', 'extension' => '', ], + [ + 'className' => 'Weak', + 'label' => 'default', + 'class' => Weak::class, + 'options' => [ + ], + 'expected' => '', + 'extension' => '', + ], + [ + 'className' => 'Weak', + 'label' => 'empty', + 'class' => Weak::class, + 'options' => [ + 'prefix' => '', + ], + 'expected' => '', + 'extension' => '', + ], + [ + 'className' => 'Weak', + 'label' => 'prefix set', + 'class' => Weak::class, + 'options' => [ + 'prefix' => 'my-prefix', + ], + 'expected' => '', + 'extension' => '', + ], ]; } } diff --git a/tests/integration/Cache/Adapter/GetSetCest.php b/tests/integration/Cache/Adapter/GetSetCest.php index cf062ef5e5..cb8f811ed7 100644 --- a/tests/integration/Cache/Adapter/GetSetCest.php +++ b/tests/integration/Cache/Adapter/GetSetCest.php @@ -21,6 +21,7 @@ use Phalcon\Cache\Adapter\Memory; use Phalcon\Cache\Adapter\Redis; use Phalcon\Cache\Adapter\Stream; +use Phalcon\Cache\Adapter\Weak; use Phalcon\Storage\SerializerFactory; use Redis as NativeRedis; @@ -78,6 +79,39 @@ public function cacheAdapterGetSetWithZeroTtl(IntegrationTester $I, Example $exa $I->assertFalse($result); } + /** + * Tests Phalcon\Cache\Adapter\Weak :: get()/set() + * + * @author Phalcon Team + * @since 2023-07-17 + */ + public function cacheAdapterWeakGetSet(IntegrationTester $I) + { + $I->wantToTest('Cache\Adapter\Weak - get()/set()'); + + + $serializer = new SerializerFactory(); + $adapter = new Weak($serializer); + + $key = uniqid(); + $obj = new \stdClass(); + $result = $adapter->set($key, "test"); + $I->assertFalse($result); + $result = $adapter->set($key, $obj); + $I->assertTrue($result); + $result = $adapter->has($key); + $I->assertTrue($result); + + /** + * There is no TTl. + */ + $result = $adapter->set($key, $obj, 0); + $I->assertTrue($result); + + $result = $adapter->has($key); + $I->assertTrue($result); + } + /** * @return array[] */ diff --git a/tests/integration/Cache/Adapter/GetSetDefaultSerializerCest.php b/tests/integration/Cache/Adapter/GetSetDefaultSerializerCest.php index b39c909428..33f8477211 100644 --- a/tests/integration/Cache/Adapter/GetSetDefaultSerializerCest.php +++ b/tests/integration/Cache/Adapter/GetSetDefaultSerializerCest.php @@ -20,6 +20,7 @@ use Phalcon\Cache\Adapter\Memory; use Phalcon\Cache\Adapter\Redis; use Phalcon\Cache\Adapter\Stream; +use Phalcon\Cache\Adapter\Weak; use Phalcon\Storage\SerializerFactory; use function getOptionsLibmemcached; @@ -67,6 +68,30 @@ public function cacheAdapterGetSetDefaultSerializer(IntegrationTester $I, Exampl $I->assertEquals($expected, $actual); } + /** + * Tests Phalcon\Cache\Adapter\Weak :: GetSetDefaultSerializer() + * + * @param IntegrationTester $I + * + * @author Phalcon Team + * @since 2023-07-17 + */ + public function cacheAdapterWeakGetSetDefaultSerializerNone(IntegrationTester $I) + { + + $I->wantToTest('Cache\Adapter\Weak - GetSetDefaultSerializer()'); + + $serializer = new SerializerFactory(); + $adapter = new Weak($serializer); + + $actual = $adapter->getDefaultSerializer(); + $I->assertEquals('none', $actual); + + $adapter->setDefaultSerializer('Base64'); + $actual = $adapter->getDefaultSerializer(); + $I->assertEquals('none', $actual); + } + /** * @return array[] */ diff --git a/tests/integration/Cache/Adapter/GetSetForeverCest.php b/tests/integration/Cache/Adapter/GetSetForeverCest.php index 5a0250cba9..4f1cb804f7 100644 --- a/tests/integration/Cache/Adapter/GetSetForeverCest.php +++ b/tests/integration/Cache/Adapter/GetSetForeverCest.php @@ -21,6 +21,7 @@ use Phalcon\Cache\Adapter\Memory; use Phalcon\Cache\Adapter\Redis; use Phalcon\Cache\Adapter\Stream; +use Phalcon\Cache\Adapter\Weak; use Phalcon\Storage\SerializerFactory; use Redis as NativeRedis; @@ -77,6 +78,37 @@ public function cacheAdapterGetSetForever(IntegrationTester $I, Example $example $I->assertTrue($result); } + /** + * Tests Phalcon\Cache\Adapter\Weak :: get()setForever() + * + * + * @author Phalcon Team + * @since 2023-07-17 + */ + public function cacheAdapterWeakGetSetForever(IntegrationTester $I) + { + $I->wantToTest('Cache\Adapter\Weak - get()/setForever()'); + + + $serializer = new SerializerFactory(); + $adapter = new Weak($serializer); + + $key = uniqid(); + $obj = new \stdClass(); + $result = $adapter->setForever($key, "test"); + $I->assertFalse($result); + $result = $adapter->setForever($key, $obj); + $I->assertTrue($result); + sleep(2); + $result = $adapter->has($key); + $I->assertTrue($result); + /** + * Delete it + */ + $result = $adapter->delete($key); + $I->assertTrue($result); + } + /** * @return array[] */ diff --git a/tests/integration/Cache/Adapter/HasCest.php b/tests/integration/Cache/Adapter/HasCest.php index be0119184a..c752b5fea0 100644 --- a/tests/integration/Cache/Adapter/HasCest.php +++ b/tests/integration/Cache/Adapter/HasCest.php @@ -21,6 +21,7 @@ use Phalcon\Cache\Adapter\Memory; use Phalcon\Cache\Adapter\Redis; use Phalcon\Cache\Adapter\Stream; +use Phalcon\Cache\Adapter\Weak; use Phalcon\Storage\SerializerFactory; use function getOptionsLibmemcached; @@ -102,6 +103,34 @@ public function cacheAdapterStreamHasEmptyPayload(IntegrationTester $I) $I->assertFalse($actual); } + /** + * Tests Phalcon\Cache\Adapter\Weak :: has() + * + * @param IntegrationTester $I + * + * @author Phalcon Team + * @since 2023-07-17 + */ + public function cacheAdapterWeakHas(IntegrationTester $I) + { + + $I->wantToTest('Cache\Adapter\Weak - has()'); + + $serializer = new SerializerFactory(); + $adapter = new Weak($serializer); + + $obj1 = new \stdClass(); + + $key1 = uniqid(); + $actual = $adapter->has($key1); + $I->assertFalse($actual); + + $adapter->set($key1, $obj1); + + $actual = $adapter->has($key1); + $I->assertTrue($actual); + } + /** * Tests Phalcon\Cache\Adapter\* :: has() * diff --git a/tests/integration/Cache/Adapter/Weak/GetKeysCest.php b/tests/integration/Cache/Adapter/Weak/GetKeysCest.php new file mode 100644 index 0000000000..4c5a1e5429 --- /dev/null +++ b/tests/integration/Cache/Adapter/Weak/GetKeysCest.php @@ -0,0 +1,85 @@ + + * + * For the full copyright and license information, please view the LICENSE.txt + * file that was distributed with this source code. + */ + +declare(strict_types=1); + +namespace Phalcon\Tests\Integration\Cache\Adapter\Weak; + +use IntegrationTester; +use Phalcon\Cache\Adapter\Weak; +use Phalcon\Storage\SerializerFactory; +use Phalcon\Support\Exception as HelperException; + +class GetKeysCest +{ + /** + * Tests Phalcon\Cache\Adapter\Weak :: getKeys() + * + * @param IntegrationTester $I + * + * @throws HelperException + * + * @author Phalcon Team + * @since 2020-09-09 + */ + public function cacheAdapterWeakGetKeys(IntegrationTester $I) + { + $I->wantToTest('cache\Adapter\Weak - getKeys()'); + + $serializer = new SerializerFactory(); + $adapter = new Weak($serializer); + + $I->assertTrue($adapter->clear()); + $obj1 = new \stdClass(); + $obj1->id = 1; + $obj2 = new \stdClass(); + $obj2->id = 2; + $obj3 = new \stdClass(); + $obj3->id = 3; + + + $adapter->set('key-1', $obj1); + $adapter->set('key-2', $obj2); + $adapter->set('key-3', $obj3); + $adapter->set('one-1', $obj1); + $adapter->set('one-2', $obj2); + $adapter->set('one-3', $obj3); + + + $actual = $adapter->has('key-1'); + $I->assertTrue($actual); + $actual = $adapter->has('key-2'); + $I->assertTrue($actual); + $actual = $adapter->has('key-3'); + $I->assertTrue($actual); + + $expected = [ + 'key-1', + 'key-2', + 'key-3', + 'one-1', + 'one-2', + 'one-3', + ]; + $actual = $adapter->getKeys(); + sort($actual); + $I->assertEquals($expected, $actual); + + $expected = [ + 'one-1', + 'one-2', + 'one-3', + ]; + $actual = $adapter->getKeys("one"); + sort($actual); + $I->assertEquals($expected, $actual); + } +} diff --git a/tests/integration/Cache/Adapter/Weak/GetSetCest.php b/tests/integration/Cache/Adapter/Weak/GetSetCest.php new file mode 100644 index 0000000000..4994794ffd --- /dev/null +++ b/tests/integration/Cache/Adapter/Weak/GetSetCest.php @@ -0,0 +1,75 @@ + + * + * For the full copyright and license information, please view the LICENSE.txt + * file that was distributed with this source code. + */ + +declare(strict_types=1); + +namespace Phalcon\Tests\Integration\Cache\Adapter\Weak; + +use Codeception\Example; +use IntegrationTester; +use Phalcon\Cache\Adapter\Weak; +use Phalcon\Storage\SerializerFactory; +use Phalcon\Support\Exception as HelperException; + +class GetSetCest +{ + /** + * Tests Phalcon\Cache\Adapter\Weak :: get() + * + * @dataProvider getExamples + * + * @param IntegrationTester $I + * @param Example $example + * + * @throws HelperException + * + * @author Phalcon Team + * @since 2020-09-09 + */ + public function cacheAdapterWeakGetSet(IntegrationTester $I, Example $example) + { + $I->wantToTest('Cache\Adapter\Weak - get()/set() - ' . $example[0]); + + $serializer = new SerializerFactory(); + $adapter = new Weak($serializer); + + $key = uniqid(); + + $result = $adapter->set($key, $example[1]); + $I->assertTrue($result); + + $expected = $example[1]; + $actual = $adapter->get($key); + $I->assertEquals($expected, $actual); + } + + private function getExamples(): array + { + return [ + [ + 'sdtClass', + new \stdClass(), + ], + [ + 'arrayobject', + new \ArrayObject(), + ], + [ + 'splObjectStorage', + new \SplObjectStorage(), + ], + [ + 'splQueue', + new \SplQueue(), + ], + ]; + } +} diff --git a/tests/integration/Cache/AdapterFactory/NewInstanceCest.php b/tests/integration/Cache/AdapterFactory/NewInstanceCest.php index c91e09552b..10998b49df 100644 --- a/tests/integration/Cache/AdapterFactory/NewInstanceCest.php +++ b/tests/integration/Cache/AdapterFactory/NewInstanceCest.php @@ -20,6 +20,7 @@ use Phalcon\Cache\Adapter\Memory; use Phalcon\Cache\Adapter\Redis; use Phalcon\Cache\Adapter\Stream; +use Phalcon\Cache\Adapter\Weak; use Phalcon\Cache\AdapterFactory; use Phalcon\Cache\Exception\Exception; use Phalcon\Storage\SerializerFactory; @@ -113,6 +114,11 @@ private function getExamples(): array 'storageDir' => outputDir(), ], ], + [ + 'weak', + Weak::class, + [], + ], ]; } } diff --git a/tests/integration/Storage/Adapter/ClearCest.php b/tests/integration/Storage/Adapter/ClearCest.php index 5f3e6813c5..df3b51b34c 100644 --- a/tests/integration/Storage/Adapter/ClearCest.php +++ b/tests/integration/Storage/Adapter/ClearCest.php @@ -21,6 +21,7 @@ use Phalcon\Storage\Adapter\Memory; use Phalcon\Storage\Adapter\Redis; use Phalcon\Storage\Adapter\Stream; +use Phalcon\Storage\Adapter\Weak; use Phalcon\Storage\Exception as StorageException; use Phalcon\Storage\SerializerFactory; use Phalcon\Support\Exception; @@ -214,6 +215,53 @@ public function storageAdapterClear(IntegrationTester $I, Example $example) $I->assertTrue($actual); } + /** + * Tests Phalcon\Storage\Adapter\Weak :: clear() + * + * @param IntegrationTester $I + * + * @throws HelperException + * + * @author Phalcon Team + * @since 2023-07-17 + */ + public function storageAdapterWealClear(IntegrationTester $I) + { + + $I->wantToTest('Storage\Storate\Weak - getAdapter()'); + + $serializer = new SerializerFactory(); + $adapter = new Weak($serializer); + + $obj1 = new \stdClass(); + $obj1->id = 1; + $obj2 = new \stdClass(); + $obj2->id = 2; + $key1 = uniqid(); + $key2 = uniqid(); + $adapter->set($key1, $obj1); + $adapter->set($key2, $obj2); + + $temp = $adapter->get($key1); + $I->assertEquals($temp, $adapter->get($key1)); + $I->assertEquals($temp, $obj1); + + $temp = $adapter->get($key2); + $I->assertEquals($temp, $adapter->get($key2)); + $I->assertEquals($temp, $obj2); + + $actual = $adapter->clear(); + $I->assertTrue($actual); + $actual = $adapter->has($key1); + $I->assertFalse($actual); + + $actual = $adapter->has($key2); + $I->assertFalse($actual); + + $actual = $adapter->clear(); + $I->assertTrue($actual); + } + /** * @return array[] */ diff --git a/tests/integration/Storage/Adapter/ConstructCest.php b/tests/integration/Storage/Adapter/ConstructCest.php index 2e4645e3f8..ed5f278330 100644 --- a/tests/integration/Storage/Adapter/ConstructCest.php +++ b/tests/integration/Storage/Adapter/ConstructCest.php @@ -22,6 +22,7 @@ use Phalcon\Storage\Adapter\Memory; use Phalcon\Storage\Adapter\Redis; use Phalcon\Storage\Adapter\Stream; +use Phalcon\Storage\Adapter\Weak; use Phalcon\Storage\Exception as StorageException; use Phalcon\Storage\SerializerFactory; use Phalcon\Support\Exception as SupportException; @@ -196,6 +197,13 @@ private function getExamples(): array ], 'extension' => '', ], + [ + 'className' => 'Weak', + 'label' => 'default', + 'class' => Weak::class, + 'options' => [], + 'extension' => '', + ], ]; } } diff --git a/tests/integration/Storage/Adapter/DeleteCest.php b/tests/integration/Storage/Adapter/DeleteCest.php index 7d567b7abf..2beb0a8c76 100644 --- a/tests/integration/Storage/Adapter/DeleteCest.php +++ b/tests/integration/Storage/Adapter/DeleteCest.php @@ -20,6 +20,7 @@ use Phalcon\Storage\Adapter\Memory; use Phalcon\Storage\Adapter\Redis; use Phalcon\Storage\Adapter\Stream; +use Phalcon\Storage\Adapter\Weak; use Phalcon\Storage\SerializerFactory; use function getOptionsLibmemcached; @@ -83,6 +84,58 @@ public function storageAdapterDelete(IntegrationTester $I, Example $example) $I->assertFalse($actual); } + /** + * Tests Phalcon\Storage\Adapter\Weak :: delete() + * + * @param IntegrationTester $I + * + * @author Phalcon Team + * @since 2023-07-17 + */ + public function storageAdapterWeakDelete(IntegrationTester $I) + { + + $I->wantToTest('Storage\Adapter\Weak - delete()'); + + $serializer = new SerializerFactory(); + $adapter = new Weak($serializer); + + $obj1 = new \stdClass(); + $obj1->id = 1; + $obj2 = new \stdClass(); + $obj2->id = 2; + + + $key1 = uniqid(); + $key2 = uniqid(); + $adapter->set($key1, $obj1); + $adapter->set($key2, $obj2); + + $actual = $adapter->has($key1); + $I->assertTrue($actual); + $actual = $adapter->has($key2); + $I->assertTrue($actual); + + unset($obj1); + gc_collect_cycles(); + $I->assertEquals(null, $adapter->get($key1)); + + $temp = $adapter->get($key2); + unset($obj2); + gc_collect_cycles(); + $I->assertEquals($temp, $adapter->get($key2)); + + unset($temp); + $actual = $adapter->delete($key2); + $I->assertTrue($actual); + $actual = $adapter->delete($key2); + $I->assertFalse($actual); + + $key = uniqid(); + $actual = $adapter->delete($key); + $I->assertFalse($actual); + } + /** * @return array[] */ diff --git a/tests/integration/Storage/Adapter/GetAdapterCest.php b/tests/integration/Storage/Adapter/GetAdapterCest.php index 22e31cfaa7..b775b14c8e 100644 --- a/tests/integration/Storage/Adapter/GetAdapterCest.php +++ b/tests/integration/Storage/Adapter/GetAdapterCest.php @@ -21,6 +21,7 @@ use Phalcon\Storage\Adapter\Memory; use Phalcon\Storage\Adapter\Redis; use Phalcon\Storage\Adapter\Stream; +use Phalcon\Storage\Adapter\Weak; use Phalcon\Storage\SerializerFactory; use Redis as NativeRedis; @@ -115,6 +116,14 @@ private function getExamples(): array 'expected' => null, 'extension' => '', ], + [ + 'className' => 'Weak', + 'label' => 'default', + 'class' => Weak::class, + 'options' => [], + 'expected' => null, + 'extension' => '', + ], ]; } } diff --git a/tests/integration/Storage/Adapter/GetKeysCest.php b/tests/integration/Storage/Adapter/GetKeysCest.php index 80e054eed5..c982ea2a85 100644 --- a/tests/integration/Storage/Adapter/GetKeysCest.php +++ b/tests/integration/Storage/Adapter/GetKeysCest.php @@ -21,6 +21,7 @@ use Phalcon\Storage\Adapter\Memory; use Phalcon\Storage\Adapter\Redis; use Phalcon\Storage\Adapter\Stream; +use Phalcon\Storage\Adapter\Weak; use Phalcon\Storage\Exception as StorageException; use Phalcon\Storage\SerializerFactory; use Phalcon\Support\Exception; @@ -278,6 +279,59 @@ public function storageAdapterStreamGetKeysIssue14190(IntegrationTester $I) $I->safeDeleteDirectory(outputDir('basePrefix-')); } + /** + * Tests Phalcon\Storage\Adapter\Weak :: getKeys() + * + * @param IntegrationTester $I + * + * @throws HelperException + * + * @author Phalcon Team + * @since 2020-09-09 + */ + public function storageAdapterWeakGetKeys(IntegrationTester $I) + { + $I->wantToTest('Storage\Adapter\Weak - getKeys()'); + + $serializer = new SerializerFactory(); + $adapter = new Weak($serializer); + + $I->assertTrue($adapter->clear()); + + $obj1 = new \stdClass(); + $obj2 = new \stdClass(); + $obj3 = new \stdClass(); + + + $adapter->set('key-1', $obj1); + $adapter->set('key-2', $obj2); + $adapter->set('key-3', $obj3); + $adapter->set('one-1', $obj1); + $adapter->set('one-2', $obj2); + $adapter->set('one-3', $obj3); + + $expected = [ + 'key-1', + 'key-2', + 'key-3', + 'one-1', + 'one-2', + 'one-3', + ]; + $actual = $adapter->getKeys(); + sort($actual); + $I->assertSame($expected, $actual); + + $expected = [ + 'one-1', + 'one-2', + 'one-3', + ]; + $actual = $adapter->getKeys("one"); + sort($actual); + $I->assertSame($expected, $actual); + } + /** * Tests Phalcon\Storage\Adapter\Stream :: getKeys() * diff --git a/tests/integration/Storage/Adapter/GetPrefixCest.php b/tests/integration/Storage/Adapter/GetPrefixCest.php index 433f6013d0..ae52f4f209 100644 --- a/tests/integration/Storage/Adapter/GetPrefixCest.php +++ b/tests/integration/Storage/Adapter/GetPrefixCest.php @@ -20,6 +20,7 @@ use Phalcon\Storage\Adapter\Memory; use Phalcon\Storage\Adapter\Redis; use Phalcon\Storage\Adapter\Stream; +use Phalcon\Storage\Adapter\Weak; use Phalcon\Storage\SerializerFactory; use function array_merge; @@ -232,6 +233,35 @@ private function getExamples(): array 'expected' => 'my-prefix', 'extension' => '', ], + [ + 'className' => 'Weak', + 'label' => 'default', + 'class' => Weak::class, + 'options' => [ + ], + 'expected' => '', + 'extension' => '', + ], + [ + 'className' => 'Weak', + 'label' => 'empty', + 'class' => Weak::class, + 'options' => [ + 'prefix' => '', + ], + 'expected' => '', + 'extension' => '', + ], + [ + 'className' => 'Weak', + 'label' => 'prefix set', + 'class' => Weak::class, + 'options' => [ + 'prefix' => 'my-prefix', + ], + 'expected' => '', + 'extension' => '', + ], ]; } } diff --git a/tests/integration/Storage/Adapter/GetSetCest.php b/tests/integration/Storage/Adapter/GetSetCest.php index 4aa73f1469..f6c616f7ee 100644 --- a/tests/integration/Storage/Adapter/GetSetCest.php +++ b/tests/integration/Storage/Adapter/GetSetCest.php @@ -20,6 +20,7 @@ use Phalcon\Storage\Adapter\Memory; use Phalcon\Storage\Adapter\Redis; use Phalcon\Storage\Adapter\Stream; +use Phalcon\Storage\Adapter\Weak; use Phalcon\Storage\SerializerFactory; use stdClass; @@ -82,6 +83,39 @@ public function storageAdapterGetSet(IntegrationTester $I, Example $example) $I->assertFalse($result); } + /** + * Tests Phalcon\Storage\Adapter\Weak :: get()/set() + * + * @author Phalcon Team + * @since 2023-07-17 + */ + public function cacheAdapterWeakGetSet(IntegrationTester $I) + { + $I->wantToTest('Storage\Adapter\Weak - get()/set()'); + + + $serializer = new SerializerFactory(); + $adapter = new Weak($serializer); + + $key = uniqid(); + $obj = new \stdClass(); + $result = $adapter->set($key, "test"); + $I->assertFalse($result); + $result = $adapter->set($key, $obj); + $I->assertTrue($result); + $result = $adapter->has($key); + $I->assertTrue($result); + + /** + * There is no TTl. + */ + $result = $adapter->set($key, $obj, 0); + $I->assertTrue($result); + + $result = $adapter->has($key); + $I->assertTrue($result); + } + /** * @return array[] */ diff --git a/tests/integration/Storage/Adapter/GetSetDefaultSerializerCest.php b/tests/integration/Storage/Adapter/GetSetDefaultSerializerCest.php index 523450fc54..4d3521eba9 100644 --- a/tests/integration/Storage/Adapter/GetSetDefaultSerializerCest.php +++ b/tests/integration/Storage/Adapter/GetSetDefaultSerializerCest.php @@ -20,6 +20,7 @@ use Phalcon\Storage\Adapter\Memory; use Phalcon\Storage\Adapter\Redis; use Phalcon\Storage\Adapter\Stream; +use Phalcon\Storage\Adapter\Weak; use Phalcon\Storage\SerializerFactory; use function getOptionsLibmemcached; @@ -67,6 +68,30 @@ public function storageAdapterGetSetDefaultSerializer(IntegrationTester $I, Exam $I->assertSame($expected, $actual); } + /** + * Tests Phalcon\Storage\Adapter\Weak :: GetSetDefaultSerializer() + * + * @param IntegrationTester $I + * + * @author Phalcon Team + * @since 2023-07-17 + */ + public function storageAdapterWeakGetSetDefaultSerializerNone(IntegrationTester $I) + { + + $I->wantToTest('Storage\Adapter\Weak - GetSetDefaultSerializer()'); + + $serializer = new SerializerFactory(); + $adapter = new Weak($serializer); + + $actual = $adapter->getDefaultSerializer(); + $I->assertEquals('none', $actual); + + $adapter->setDefaultSerializer('Base64'); + $actual = $adapter->getDefaultSerializer(); + $I->assertEquals('none', $actual); + } + /** * @return array[] */ diff --git a/tests/integration/Storage/Adapter/GetSetForeverCest.php b/tests/integration/Storage/Adapter/GetSetForeverCest.php index db09e58645..7b76343c62 100644 --- a/tests/integration/Storage/Adapter/GetSetForeverCest.php +++ b/tests/integration/Storage/Adapter/GetSetForeverCest.php @@ -21,6 +21,7 @@ use Phalcon\Storage\Adapter\Memory; use Phalcon\Storage\Adapter\Redis; use Phalcon\Storage\Adapter\Stream; +use Phalcon\Storage\Adapter\Weak; use Phalcon\Storage\SerializerFactory; use Redis as NativeRedis; @@ -76,6 +77,37 @@ public function storageAdapterGetSetForever(IntegrationTester $I, Example $examp $I->assertTrue($result); } + /** + * Tests Phalcon\Storage\Adapter\Weak :: get()setForever() + * + * + * @author Phalcon Team + * @since 2023-07-17 + */ + public function storageAdapterWeakGetSetForever(IntegrationTester $I) + { + $I->wantToTest('Storage\Adapter\Weak - get()/setForever()'); + + + $serializer = new SerializerFactory(); + $adapter = new Weak($serializer); + + $key = uniqid(); + $obj = new \stdClass(); + $result = $adapter->setForever($key, "test"); + $I->assertFalse($result); + $result = $adapter->setForever($key, $obj); + $I->assertTrue($result); + sleep(2); + $result = $adapter->has($key); + $I->assertTrue($result); + /** + * Delete it + */ + $result = $adapter->delete($key); + $I->assertTrue($result); + } + /** * @return array[] */ diff --git a/tests/integration/Storage/Adapter/HasCest.php b/tests/integration/Storage/Adapter/HasCest.php index f72a3cbf6c..56a8afab49 100644 --- a/tests/integration/Storage/Adapter/HasCest.php +++ b/tests/integration/Storage/Adapter/HasCest.php @@ -21,6 +21,7 @@ use Phalcon\Storage\Adapter\Memory; use Phalcon\Storage\Adapter\Redis; use Phalcon\Storage\Adapter\Stream; +use Phalcon\Storage\Adapter\Weak; use Phalcon\Storage\Exception as StorageException; use Phalcon\Storage\SerializerFactory; use Phalcon\Support\Exception as HelperException; @@ -145,6 +146,34 @@ public function storageAdapterHas(IntegrationTester $I, Example $example) $I->assertTrue($actual); } + /** + * Tests Phalcon\Storage\Adapter\Weak :: has() + * + * @param IntegrationTester $I + * + * @author Phalcon Team + * @since 2023-07-17 + */ + public function storageAdapterWeakHas(IntegrationTester $I) + { + + $I->wantToTest('Storage\Adapter\Weak - has()'); + + $serializer = new SerializerFactory(); + $adapter = new Weak($serializer); + + $obj1 = new \stdClass(); + + $key1 = uniqid(); + $actual = $adapter->has($key1); + $I->assertFalse($actual); + + $adapter->set($key1, $obj1); + + $actual = $adapter->has($key1); + $I->assertTrue($actual); + } + /** * @return array[] */ diff --git a/tests/integration/Storage/AdapterFactory/NewInstanceCest.php b/tests/integration/Storage/AdapterFactory/NewInstanceCest.php index 6186fee639..b494e7e061 100644 --- a/tests/integration/Storage/AdapterFactory/NewInstanceCest.php +++ b/tests/integration/Storage/AdapterFactory/NewInstanceCest.php @@ -20,6 +20,7 @@ use Phalcon\Storage\Adapter\Memory; use Phalcon\Storage\Adapter\Redis; use Phalcon\Storage\Adapter\Stream; +use Phalcon\Storage\Adapter\Weak; use Phalcon\Storage\AdapterFactory; use Phalcon\Storage\Exception; use Phalcon\Storage\SerializerFactory; @@ -113,6 +114,11 @@ private function getExamples(): array 'storageDir' => outputDir(), ], ], + [ + 'weak', + Weak::class, + [], + ], ]; } } From a929176a6d2cfe8786085fabf2a2a2bc888dd459 Mon Sep 17 00:00:00 2001 From: Arhell Date: Wed, 19 Jul 2023 00:16:45 +0300 Subject: [PATCH 18/35] add backer --- BACKERS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/BACKERS.md b/BACKERS.md index 1540ad96b7..c535cc308c 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -117,6 +117,7 @@ Thanks for the support + [//]: github-sponsors From 762d930d7805862591723b51b26f62c3c33cb2b3 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Tue, 18 Jul 2023 22:12:05 -0400 Subject: [PATCH 19/35] added return type for getVar() in View --- phalcon/Mvc/View.zep | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/phalcon/Mvc/View.zep b/phalcon/Mvc/View.zep index 109a40c958..ca633b81e0 100644 --- a/phalcon/Mvc/View.zep +++ b/phalcon/Mvc/View.zep @@ -536,8 +536,10 @@ class View extends Injectable implements ViewInterface, EventsAwareInterface /** * Returns a parameter previously set in the view + * + * @return mixed|null */ - public function getVar(string! key) + public function getVar(string! key) -> var | null { var value; From a8e4047fbc7d4e4194effa4da294f574fd0860f2 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Wed, 19 Jul 2023 09:28:39 -0400 Subject: [PATCH 20/35] updating changelog --- CHANGELOG-5.0.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md index 72b7edb954..fb671d31f8 100644 --- a/CHANGELOG-5.0.md +++ b/CHANGELOG-5.0.md @@ -5,8 +5,10 @@ ### Fixed - Tried to reproduce the behavior described in #16244 but had no success. [#16244](https://github.com/phalcon/cphalcon/issues/16244) - Added `getAdapter()` in `Phalcon\Mvc\Model\Metadata` to retrieve the internal cache adapter if necessary. [#16244](https://github.com/phalcon/cphalcon/issues/16244) -- Added `Phalcon\Storage\Adapter\Weak` implemented with WeakReference has a cache/retrieval solution for objects not yet collected by the Garbage Collection. [#16372] (https://github.com/phalcon/cphalcon/issues/16372) +- Added `Phalcon\Storage\Adapter\Weak` implemented with WeakReference has a cache/retrieval solution for objects not yet collected by the Garbage Collection. [#16372](https://github.com/phalcon/cphalcon/issues/16372) - Extended `Phalcon\Di\Injectable` from `stdClass` to remove the deprecation warning (dynamic properties) for PHP 8.2 [#16308](https://github.com/phalcon/cphalcon/issues/16308) +- Corrected the return type of `Phalcon\Mvc\View::getVar()` so that stubs can be accurate. [#16276](https://github.com/phalcon/cphalcon/issues/16276) + ## [5.2.2](https://github.com/phalcon/cphalcon/releases/tag/v5.2.2) (2023-06-18) From 21c84ff6eaffea61acf9aef91c448611692c6387 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Tue, 25 Jul 2023 14:59:10 -0400 Subject: [PATCH 21/35] changed the json encode/decode to use the Support\Helper\Json classes --- phalcon/Config/Adapter/Json.zep | 27 +------ phalcon/DataMapper/Pdo/Profiler/Profiler.zep | 34 +++------ phalcon/Encryption/Security/JWT/Builder.zep | 40 ++++------- .../Encryption/Security/JWT/Token/Parser.zep | 45 ++++++------ phalcon/Http/Response.zep | 42 ++++------- phalcon/Storage/Serializer/Json.zep | 71 +++++++------------ phalcon/Support/Debug/Dump.zep | 33 +++------ phalcon/Support/Helper/Json/Decode.zep | 22 ++++-- phalcon/Support/Helper/Json/Encode.zep | 13 ++-- 9 files changed, 115 insertions(+), 212 deletions(-) diff --git a/phalcon/Config/Adapter/Json.zep b/phalcon/Config/Adapter/Json.zep index 1cb1be8416..1ecad32ac0 100644 --- a/phalcon/Config/Adapter/Json.zep +++ b/phalcon/Config/Adapter/Json.zep @@ -10,8 +10,8 @@ namespace Phalcon\Config\Adapter; -use InvalidArgumentException; // @todo this will also be removed when traits are available use Phalcon\Config\Config; +use Phalcon\Support\Helper\Json\Decode; /** * Reads JSON files and converts them to Phalcon\Config\Config objects. @@ -41,33 +41,10 @@ class Json extends Config public function __construct(string! filePath) { parent::__construct( - this->decode( + (new Decode())->__invoke( file_get_contents(filePath), true ) ); } - - /** - * @todo This will be removed when traits are introduced - */ - private function decode( - string! data, - bool associative = false, - int depth = 512, - int options = 0 - ) -> var - { - var decoded; - - let decoded = json_decode(data, associative, depth, options); - - if unlikely JSON_ERROR_NONE !== json_last_error() { - throw new InvalidArgumentException( - "json_decode error: " . json_last_error_msg() - ); - } - - return decoded; - } } diff --git a/phalcon/DataMapper/Pdo/Profiler/Profiler.zep b/phalcon/DataMapper/Pdo/Profiler/Profiler.zep index 84f6ec121f..d256f159fb 100644 --- a/phalcon/DataMapper/Pdo/Profiler/Profiler.zep +++ b/phalcon/DataMapper/Pdo/Profiler/Profiler.zep @@ -15,10 +15,10 @@ namespace Phalcon\DataMapper\Pdo\Profiler; -use InvalidArgumentException; // @todo this will also be removed when traits are available use Phalcon\DataMapper\Pdo\Exception\Exception; use Phalcon\Logger\Enum; use Phalcon\Logger\LoggerInterface; +use Phalcon\Support\Helper\Json\Encode; /** * Sends query profiles to a logger. @@ -50,6 +50,11 @@ class Profiler implements ProfilerInterface */ protected logger; + /** + * @var Encode + */ + private encode; + /** * Constructor. * @@ -63,7 +68,8 @@ class Profiler implements ProfilerInterface let this->logFormat = "{method} ({duration}s): {statement} {backtrace}", this->logLevel = Enum::DEBUG, - this->logger = logger; + this->logger = logger, + this->encode = new Encode(); } /** @@ -85,7 +91,7 @@ class Profiler implements ProfilerInterface this->context["duration"] = finish - this->context["start"], this->context["finish"] = finish, this->context["statement"] = statement, - this->context["values"] = empty(values) ? "" : this->encode(values); + this->context["values"] = empty(values) ? "" : this->encode->__invoke(values); this->logger->log(this->logLevel, this->logFormat, this->context); @@ -189,26 +195,4 @@ class Profiler implements ProfilerInterface ]; } } - - /** - * @todo This will be removed when traits are introduced - */ - private function encode( - var data, - int options = 0, - int depth = 512 - ) -> string - { - var encoded; - - let encoded = json_encode(data, options, depth); - - if unlikely JSON_ERROR_NONE !== json_last_error() { - throw new InvalidArgumentException( - "json_encode error: " . json_last_error_msg() - ); - } - - return encoded; - } } diff --git a/phalcon/Encryption/Security/JWT/Builder.zep b/phalcon/Encryption/Security/JWT/Builder.zep index 2d2ab1d6bf..9c8ec2da15 100644 --- a/phalcon/Encryption/Security/JWT/Builder.zep +++ b/phalcon/Encryption/Security/JWT/Builder.zep @@ -10,15 +10,15 @@ namespace Phalcon\Encryption\Security\JWT; -use InvalidArgumentException; // @todo this will also be removed when traits are available -use Phalcon\Support\Collection; -use Phalcon\Support\Collection\CollectionInterface; use Phalcon\Encryption\Security\JWT\Exceptions\ValidatorException; use Phalcon\Encryption\Security\JWT\Signer\SignerInterface; use Phalcon\Encryption\Security\JWT\Token\Enum; use Phalcon\Encryption\Security\JWT\Token\Item; use Phalcon\Encryption\Security\JWT\Token\Signature; use Phalcon\Encryption\Security\JWT\Token\Token; +use Phalcon\Support\Collection; +use Phalcon\Support\Collection\CollectionInterface; +use Phalcon\Support\Helper\Json\Encode; /** * JWT Builder @@ -32,6 +32,11 @@ class Builder */ private claims; + /** + * @var Encode + */ + private encode; + /** * @var CollectionInterface */ @@ -57,7 +62,8 @@ class Builder ) { this->init(); - let this->signer = signer; + let this->signer = signer, + this->encode = new Encode(); this->jose->set( Enum::ALGO, @@ -192,9 +198,9 @@ class Builder ); } - let encodedClaims = this->encodeUrl(this->encode(this->getClaims())), + let encodedClaims = this->encodeUrl(this->encode->__invoke(this->getClaims())), claims = new Item(this->getClaims(), encodedClaims), - encodedHeaders = this->encodeUrl(this->encode(this->getHeaders())), + encodedHeaders = this->encodeUrl(this->encode->__invoke(this->getHeaders())), headers = new Item(this->getHeaders(), encodedHeaders), signatureHash = this->signer->sign( encodedHeaders . "." . encodedClaims, @@ -426,26 +432,4 @@ class Builder { return str_replace("=", "", strtr(base64_encode(input), "+/", "-_")); } - - /** - * @todo This will be removed when traits are introduced - */ - private function encode( - var data, - int options = 0, - int depth = 512 - ) -> string - { - var encoded; - - let encoded = json_encode(data, options, depth); - - if unlikely JSON_ERROR_NONE !== json_last_error() { - throw new InvalidArgumentException( - "json_encode error: " . json_last_error_msg() - ); - } - - return encoded; - } } diff --git a/phalcon/Encryption/Security/JWT/Token/Parser.zep b/phalcon/Encryption/Security/JWT/Token/Parser.zep index 1e9b1c8ac5..3d32a339e0 100644 --- a/phalcon/Encryption/Security/JWT/Token/Parser.zep +++ b/phalcon/Encryption/Security/JWT/Token/Parser.zep @@ -11,6 +11,7 @@ namespace Phalcon\Encryption\Security\JWT\Token; use InvalidArgumentException; +use Phalcon\Support\Helper\Json\Decode; /** * Token Parser class. @@ -21,6 +22,23 @@ use InvalidArgumentException; */ class Parser { + /** + * @var Decode + */ + private decode; + + public function __construct( decode = null) + { + var service; + + let service = decode; + if (null === service) { + let service = new Decode(); + } + + let this->decode = service; + } + /** * Parse a token and return it * @@ -55,7 +73,7 @@ class Parser { var decoded; - let decoded = this->decode(this->decodeUrl(claims), true); + let decoded = this->decode->__invoke(this->decodeUrl(claims), true); if typeof decoded !== "array" { throw new InvalidArgumentException( @@ -84,7 +102,7 @@ class Parser { var decoded; - let decoded = this->decode(this->decodeUrl(headers), true); + let decoded = this->decode->__invoke(this->decodeUrl(headers), true); if typeof decoded !== "array" { throw new InvalidArgumentException( @@ -147,29 +165,6 @@ class Parser return parts; } - /** - * @todo This will be removed when traits are introduced - */ - private function decode( - string! data, - bool associative = false, - int depth = 512, - int options = 0 - ) -> var - { - var decoded; - - let decoded = json_decode(data, associative, depth, options); - - if unlikely JSON_ERROR_NONE !== json_last_error() { - throw new InvalidArgumentException( - "json_decode error: " . json_last_error_msg() - ); - } - - return decoded; - } - /** * @todo This will be removed when traits are introduced */ diff --git a/phalcon/Http/Response.zep b/phalcon/Http/Response.zep index d0b54aa7a8..623ca7f7df 100644 --- a/phalcon/Http/Response.zep +++ b/phalcon/Http/Response.zep @@ -12,19 +12,19 @@ namespace Phalcon\Http; use DateTime; use DateTimeZone; -use InvalidArgumentException; // @todo this will also be removed when traits are available use Phalcon\Di\Di; use Phalcon\Di\DiInterface; +use Phalcon\Di\InjectionAwareInterface; +use Phalcon\Events\EventsAwareInterface; +use Phalcon\Events\ManagerInterface; use Phalcon\Http\Message\ResponseStatusCodeInterface; +use Phalcon\Http\Response\CookiesInterface; use Phalcon\Http\Response\Exception; use Phalcon\Http\Response\HeadersInterface; -use Phalcon\Http\Response\CookiesInterface; use Phalcon\Mvc\Url\UrlInterface; use Phalcon\Mvc\ViewInterface; use Phalcon\Http\Response\Headers; -use Phalcon\Di\InjectionAwareInterface; -use Phalcon\Events\EventsAwareInterface; -use Phalcon\Events\ManagerInterface; +use Phalcon\Support\Helper\Json\Encode; /** * Part of the HTTP cycle is return responses to the clients. @@ -82,6 +82,11 @@ class Response implements ResponseInterface, InjectionAwareInterface, EventsAwar */ protected statusCodes = []; + /** + * @var Encode + */ + private encode; + /** * Phalcon\Http\Response constructor */ @@ -91,7 +96,8 @@ class Response implements ResponseInterface, InjectionAwareInterface, EventsAwar // A Phalcon\Http\Response\Headers bag is temporary used to manage // the headers before sent them to the client - let this->headers = new Headers(); + let this->headers = new Headers(), + this->encode = new Encode(); if content !== null { this->setContent(content); @@ -638,7 +644,7 @@ class Response implements ResponseInterface, InjectionAwareInterface, EventsAwar { this->setContentType("application/json"); - this->setContent(this->encode(content, jsonOptions, depth)); + this->setContent(this->encode->__invoke(content, jsonOptions, depth)); return this; } @@ -865,26 +871,4 @@ class Response implements ResponseInterface, InjectionAwareInterface, EventsAwar return filename; } - - /** - * @todo This will be removed when traits are introduced - */ - private function encode( - var data, - int options = 0, - int depth = 512 - ) -> string - { - var encoded; - - let encoded = json_encode(data, options, depth); - - if unlikely JSON_ERROR_NONE !== json_last_error() { - throw new InvalidArgumentException( - "json_encode error: " . json_last_error_msg() - ); - } - - return encoded; - } } diff --git a/phalcon/Storage/Serializer/Json.zep b/phalcon/Storage/Serializer/Json.zep index ad7366b5d2..6f7c4f1480 100644 --- a/phalcon/Storage/Serializer/Json.zep +++ b/phalcon/Storage/Serializer/Json.zep @@ -12,9 +12,33 @@ namespace Phalcon\Storage\Serializer; use InvalidArgumentException; use JsonSerializable; +use Phalcon\Support\Helper\Json\Encode; class Json extends AbstractSerializer { + /** + * @var Decode + */ + private decode; + + /** + * @var Encode + */ + private encode; + + /** + * AbstractSerializer constructor. + * + * @param mixed|null $data + */ + public function __construct(var data = null) + { + let this->encode = new Encode(), + this->decode = new Decode(); + + parent::__construct(data); + } + /** * Serializes data * @@ -33,7 +57,7 @@ class Json extends AbstractSerializer return this->data; } - return this->getEncode(this->data); + return this->encode->__invoke(this->data); } /** @@ -48,50 +72,7 @@ class Json extends AbstractSerializer if (true !== this->isSerializable(data)) { let this->data = data; } else { - let this->data = this->getDecode(data); + let this->data = this->decode->__invoke(data); } } - - /** - * @todo Remove this when we get traits - */ - private function getDecode( - string! data, - bool associative = false, - int depth = 512, - int options = 0 - ) -> var { - var decoded; - - let decoded = json_decode(data, associative, depth, options); - - if unlikely JSON_ERROR_NONE !== json_last_error() { - throw new InvalidArgumentException( - "json_decode error: " . json_last_error_msg() - ); - } - - return decoded; - } - - /** - * @todo Remove this when we get traits - */ - private function getEncode( - var data, - int options = 0, - int depth = 512 - ) -> string { - var encoded; - - let encoded = json_encode(data, options, depth); - - if unlikely JSON_ERROR_NONE !== json_last_error() { - throw new InvalidArgumentException( - "json_encode error: " . json_last_error_msg() - ); - } - - return encoded; - } } diff --git a/phalcon/Support/Debug/Dump.zep b/phalcon/Support/Debug/Dump.zep index cb8e02760a..8f1661d3fc 100644 --- a/phalcon/Support/Debug/Dump.zep +++ b/phalcon/Support/Debug/Dump.zep @@ -10,8 +10,8 @@ namespace Phalcon\Support\Debug; -use InvalidArgumentException; // @todo this will also be removed when traits are available use Phalcon\Di\Di; +use Phalcon\Support\Helper\Json\Encode; use Reflection; use ReflectionClass; use ReflectionProperty; @@ -51,11 +51,18 @@ class Dump */ protected styles = []; + /** + * @var Encode + */ + private encode; + /** * Phalcon\Debug\Dump constructor */ public function __construct(array! styles = [], bool detailed = false) { + let this->encode = new Encode(); + this->setStyles(styles); let this->detailed = detailed; @@ -138,7 +145,7 @@ class Dump */ public function toJson(var variable) -> string { - return this->encode( + return this->encode->__invoke( variable, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE ); @@ -346,26 +353,4 @@ class Dump return output . strtr("(:var)", [":style": this->getStyle("other"), ":var": variable]); } - - /** - * @todo This will be removed when traits are introduced - */ - private function encode( - var data, - int options = 0, - int depth = 512 - ) -> string - { - var encoded; - - let encoded = json_encode(data, options, depth); - - if unlikely JSON_ERROR_NONE !== json_last_error() { - throw new InvalidArgumentException( - "json_encode error: " . json_last_error_msg() - ); - } - - return encoded; - } } diff --git a/phalcon/Support/Helper/Json/Decode.zep b/phalcon/Support/Helper/Json/Decode.zep index 7e84890aa1..6308b1e37d 100644 --- a/phalcon/Support/Helper/Json/Decode.zep +++ b/phalcon/Support/Helper/Json/Decode.zep @@ -35,14 +35,24 @@ class Decode int depth = 512, int options = 0 ) { - var decoded; + var decoded, error, message; - let decoded = json_decode(data, associative, depth, options); + /** + * Need to clear the json_last_error() before the code below + */ + let decoded = json_encode(null), + decoded = json_decode(data, associative, depth, options), + error = json_last_error(), + message = json_last_error_msg(); - if (JSON_ERROR_NONE !== json_last_error()) { - throw new InvalidArgumentException( - "json_decode error: " . json_last_error_msg() - ); + /** + * The above will throw an exception when JSON_THROW_ON_ERROR is + * specified. If not, the code below will handle the exception when + * an error occurs + */ + if (JSON_ERROR_NONE !== error) { + json_encode(null); + throw new InvalidArgumentException(message, error); } return decoded; diff --git a/phalcon/Support/Helper/Json/Encode.zep b/phalcon/Support/Helper/Json/Encode.zep index 4a2dee772e..3f88ac9179 100644 --- a/phalcon/Support/Helper/Json/Encode.zep +++ b/phalcon/Support/Helper/Json/Encode.zep @@ -10,7 +10,7 @@ namespace Phalcon\Support\Helper\Json; -use JsonException; +use InvalidArgumentException; /** * Encodes a string using `json_encode` and throws an exception if the * JSON data cannot be encoded @@ -39,21 +39,24 @@ class Encode int options = 4194383, int depth = 512 ) -> string { - var encoded; + var encoded, error, message; /** * Need to clear the json_last_error() before the code below */ let encoded = json_encode(""), - encoded = json_encode(data, options, depth); + encoded = json_encode(data, options, depth), + error = json_last_error(), + message = json_last_error_msg(); /** * The above will throw an exception when JSON_THROW_ON_ERROR is * specified. If not, the code below will handle the exception when * an error occurs */ - if (JSON_ERROR_NONE !== json_last_error()) { - throw new JsonException(json_last_error_msg(), 5); + if (JSON_ERROR_NONE !== error) { + json_encode(""); + throw new InvalidArgumentException(message, error); } return (string) encoded; From 9768fb71c73075dfd7792f878e4440bc91fb5a6d Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Tue, 25 Jul 2023 14:59:19 -0400 Subject: [PATCH 22/35] adjusting tests --- tests/unit/Support/Helper/Json/DecodeCest.php | 5 +++-- tests/unit/Support/Helper/Json/EncodeCest.php | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/unit/Support/Helper/Json/DecodeCest.php b/tests/unit/Support/Helper/Json/DecodeCest.php index 33ceef4db4..7f4312719c 100644 --- a/tests/unit/Support/Helper/Json/DecodeCest.php +++ b/tests/unit/Support/Helper/Json/DecodeCest.php @@ -55,8 +55,9 @@ public function supportHelperJsonDecodeException(UnitTester $I) $I->expectThrowable( new InvalidArgumentException( - "json_decode error: Control character error, " . - "possibly incorrectly encoded" + "Control character error, " . + "possibly incorrectly encoded", + 3 ), function () { $data = '{"one'; diff --git a/tests/unit/Support/Helper/Json/EncodeCest.php b/tests/unit/Support/Helper/Json/EncodeCest.php index 603e0471a6..33c6d31ff8 100644 --- a/tests/unit/Support/Helper/Json/EncodeCest.php +++ b/tests/unit/Support/Helper/Json/EncodeCest.php @@ -13,7 +13,7 @@ namespace Phalcon\Tests\Unit\Support\Helper\Json; -use JsonException; +use InvalidArgumentException; use Phalcon\Support\Helper\Json\Encode; use UnitTester; @@ -56,7 +56,7 @@ public function supportHelperJsonEncodeExceptionDefaultOptions(UnitTester $I) $I->wantToTest('Support\Helper\Json - encode() - exception default options'); $I->expectThrowable( - new JsonException( + new InvalidArgumentException( 'Malformed UTF-8 characters, possibly incorrectly encoded', 5 ), @@ -80,7 +80,7 @@ public function supportHelperJsonEncodeExceptionNoOptions(UnitTester $I) $I->wantToTest('Support\Helper\Json - encode() - exception no options'); $I->expectThrowable( - new JsonException( + new InvalidArgumentException( 'Malformed UTF-8 characters, possibly incorrectly encoded', 5 ), From 01aa9127c2dd824010ec1df943a7d96b8cec6e17 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Tue, 25 Jul 2023 15:29:17 -0400 Subject: [PATCH 23/35] correcting reference --- phalcon/Storage/Serializer/Json.zep | 1 + 1 file changed, 1 insertion(+) diff --git a/phalcon/Storage/Serializer/Json.zep b/phalcon/Storage/Serializer/Json.zep index 6f7c4f1480..c0d608fb61 100644 --- a/phalcon/Storage/Serializer/Json.zep +++ b/phalcon/Storage/Serializer/Json.zep @@ -12,6 +12,7 @@ namespace Phalcon\Storage\Serializer; use InvalidArgumentException; use JsonSerializable; +use Phalcon\Support\Helper\Json\Decode; use Phalcon\Support\Helper\Json\Encode; class Json extends AbstractSerializer From 6dced328c1b498833f42a0a82b692f29fdb01b07 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Tue, 25 Jul 2023 15:41:17 -0400 Subject: [PATCH 24/35] correcting docblock --- phalcon/Support/Helper/Json/Encode.zep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phalcon/Support/Helper/Json/Encode.zep b/phalcon/Support/Helper/Json/Encode.zep index 3f88ac9179..0794eb0e5b 100644 --- a/phalcon/Support/Helper/Json/Encode.zep +++ b/phalcon/Support/Helper/Json/Encode.zep @@ -31,7 +31,7 @@ class Encode * * @return string * - * @throws JsonException if the JSON cannot be encoded. + * @throws InvalidArgumentException if the JSON cannot be encoded. * @link https://www.php.net/manual/en/function.json-encode.php */ public function __invoke( From 095788112c969968ec800bca5978f97a5594eec7 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Tue, 25 Jul 2023 15:52:50 -0400 Subject: [PATCH 25/35] minor adjustment --- phalcon/Support/Helper/Json/Encode.zep | 1 + 1 file changed, 1 insertion(+) diff --git a/phalcon/Support/Helper/Json/Encode.zep b/phalcon/Support/Helper/Json/Encode.zep index 0794eb0e5b..c3b62fd565 100644 --- a/phalcon/Support/Helper/Json/Encode.zep +++ b/phalcon/Support/Helper/Json/Encode.zep @@ -11,6 +11,7 @@ namespace Phalcon\Support\Helper\Json; use InvalidArgumentException; + /** * Encodes a string using `json_encode` and throws an exception if the * JSON data cannot be encoded From 04617247764273ea2fbb853c6eddd6b68c9e1934 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Tue, 25 Jul 2023 17:16:50 -0400 Subject: [PATCH 26/35] setting different options for json_* --- phalcon/Support/Helper/Json/Decode.zep | 11 ++++++++++- phalcon/Support/Helper/Json/Encode.zep | 14 +++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/phalcon/Support/Helper/Json/Decode.zep b/phalcon/Support/Helper/Json/Decode.zep index 6308b1e37d..df13934ffe 100644 --- a/phalcon/Support/Helper/Json/Decode.zep +++ b/phalcon/Support/Helper/Json/Decode.zep @@ -15,6 +15,15 @@ use InvalidArgumentException; /** * Decodes a string using `json_decode` and throws an exception if the * JSON data cannot be decoded + * + * The following options are used if none specified for json_encode + * + * JSON_HEX_TAG, JSON_HEX_APOS, JSON_HEX_AMP, JSON_HEX_QUOT, + * JSON_UNESCAPED_SLASHES + * + * If JSON_THROW_ON_ERROR is defined in the options a JsonException will be + * thrown in the case of an error. Otherwise, any error will throw + * InvalidArgumentException */ class Decode { @@ -33,7 +42,7 @@ class Decode string data, bool associative = false, int depth = 512, - int options = 0 + int options = 79 ) { var decoded, error, message; diff --git a/phalcon/Support/Helper/Json/Encode.zep b/phalcon/Support/Helper/Json/Encode.zep index c3b62fd565..93c3d8040b 100644 --- a/phalcon/Support/Helper/Json/Encode.zep +++ b/phalcon/Support/Helper/Json/Encode.zep @@ -19,7 +19,11 @@ use InvalidArgumentException; * The following options are used if none specified for json_encode * * JSON_HEX_TAG, JSON_HEX_APOS, JSON_HEX_AMP, JSON_HEX_QUOT, - * JSON_UNESCAPED_SLASHES, JSON_THROW_ON_ERROR + * JSON_UNESCAPED_SLASHES + * + * If JSON_THROW_ON_ERROR is defined in the options a JsonException will be + * thrown in the case of an error. Otherwise, any error will throw + * InvalidArgumentException * * @see https://www.ietf.org/rfc/rfc4627.txt */ @@ -27,7 +31,7 @@ class Encode { /** * @param mixed $data JSON data to parse - * @param int $options Bitmask of JSON decode options. + * @param int $options Bitmask of JSON encode options. * @param int $depth Recursion depth. * * @return string @@ -37,7 +41,7 @@ class Encode */ public function __invoke( var data, - int options = 4194383, + int options = 79, int depth = 512 ) -> string { var encoded, error, message; @@ -45,7 +49,7 @@ class Encode /** * Need to clear the json_last_error() before the code below */ - let encoded = json_encode(""), + let encoded = json_encode(null), encoded = json_encode(data, options, depth), error = json_last_error(), message = json_last_error_msg(); @@ -56,7 +60,7 @@ class Encode * an error occurs */ if (JSON_ERROR_NONE !== error) { - json_encode(""); + json_encode(null); throw new InvalidArgumentException(message, error); } From f95b4255574fad9b9046a3e6f8188db215b6e007 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Tue, 25 Jul 2023 18:35:43 -0400 Subject: [PATCH 27/35] updating changelog --- CHANGELOG-5.0.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md index fb671d31f8..8b80b3302b 100644 --- a/CHANGELOG-5.0.md +++ b/CHANGELOG-5.0.md @@ -8,6 +8,8 @@ - Added `Phalcon\Storage\Adapter\Weak` implemented with WeakReference has a cache/retrieval solution for objects not yet collected by the Garbage Collection. [#16372](https://github.com/phalcon/cphalcon/issues/16372) - Extended `Phalcon\Di\Injectable` from `stdClass` to remove the deprecation warning (dynamic properties) for PHP 8.2 [#16308](https://github.com/phalcon/cphalcon/issues/16308) - Corrected the return type of `Phalcon\Mvc\View::getVar()` so that stubs can be accurate. [#16276](https://github.com/phalcon/cphalcon/issues/16276) +- Changed all the `encode`/`decode` methods for JSON to use the `Phalcon\Support\Helper\Json\*` classes. [#15608](https://github.com/phalcon/cphalcon/issues/15608) +- Changed the `Phalcon\Support\Helper\Json\*` classes to clear up `json_last_error()` before doing any conversions. [#15608](https://github.com/phalcon/cphalcon/issues/15608) ## [5.2.2](https://github.com/phalcon/cphalcon/releases/tag/v5.2.2) (2023-06-18) From 45bff08f68979ca6e013dd46bbbe695aa4ca2f15 Mon Sep 17 00:00:00 2001 From: sinbad Date: Tue, 25 Jul 2023 10:17:00 +0500 Subject: [PATCH 28/35] Protect from empty body in method getJsonRawBody() --- phalcon/Http/Request.zep | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/phalcon/Http/Request.zep b/phalcon/Http/Request.zep index aeab902f06..501d40f234 100644 --- a/phalcon/Http/Request.zep +++ b/phalcon/Http/Request.zep @@ -579,6 +579,10 @@ class Request extends AbstractInjectionAware implements RequestInterface, Reques return false; } + if rawBody == "" { + let rawBody = "{}"; + } + return json_decode(rawBody, associative); } From e17bf4726dc8d8dbc010351ce2de7bc073a448df Mon Sep 17 00:00:00 2001 From: sinbad Date: Tue, 25 Jul 2023 10:18:53 +0500 Subject: [PATCH 29/35] test of method getJsonRawBody() when body is empty --- .../unit/Http/Request/GetJsonRawBodyCest.php | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tests/unit/Http/Request/GetJsonRawBodyCest.php b/tests/unit/Http/Request/GetJsonRawBodyCest.php index d7a48d311f..866569564c 100644 --- a/tests/unit/Http/Request/GetJsonRawBodyCest.php +++ b/tests/unit/Http/Request/GetJsonRawBodyCest.php @@ -61,4 +61,28 @@ public function httpRequestGetJsonRawBody(UnitTester $I) stream_wrapper_restore('php'); } + + public function httpRequestGetJsonRawBodyWhenBodyIsEmpty(UnitTester $I) + { + $I->wantToTest('Http\Request - getJsonRawBody() when Body is Empty'); + + $request = new Request(); + + stream_wrapper_unregister('php'); + stream_wrapper_register('php', PhpStream::class); + + $input = json_encode(new \stdClass()); + + file_put_contents('php://input', $input); + + $expected = json_decode($input); + $actual = $request->getJsonRawBody(); + + $I->assertEquals($expected, $actual); + + //and not null + $I->assertNotNull($actual); + + stream_wrapper_restore('php'); + } } From 43eeb70f632152089c7242197d8ab4dce2309d5c Mon Sep 17 00:00:00 2001 From: sinbad Date: Wed, 26 Jul 2023 11:38:19 +0500 Subject: [PATCH 30/35] resolve changelog --- CHANGELOG-5.0.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md index 8b80b3302b..ff337bcda9 100644 --- a/CHANGELOG-5.0.md +++ b/CHANGELOG-5.0.md @@ -1,6 +1,6 @@ # Changelog -## [5.2.3](https://github.com/phalcon/cphalcon/releases/tag/v5.2.2) (xxxx-xx-xx) +## [5.2.3](https://github.com/phalcon/cphalcon/releases/tag/v5.2.3) (xxxx-xx-xx) ### Fixed - Tried to reproduce the behavior described in #16244 but had no success. [#16244](https://github.com/phalcon/cphalcon/issues/16244) @@ -10,7 +10,7 @@ - Corrected the return type of `Phalcon\Mvc\View::getVar()` so that stubs can be accurate. [#16276](https://github.com/phalcon/cphalcon/issues/16276) - Changed all the `encode`/`decode` methods for JSON to use the `Phalcon\Support\Helper\Json\*` classes. [#15608](https://github.com/phalcon/cphalcon/issues/15608) - Changed the `Phalcon\Support\Helper\Json\*` classes to clear up `json_last_error()` before doing any conversions. [#15608](https://github.com/phalcon/cphalcon/issues/15608) - +- Fixed `Phalcon\Http\Request::getJsonRawBody` to protect from empty body [#16373](https://github.com/phalcon/cphalcon/issues/16373) ## [5.2.2](https://github.com/phalcon/cphalcon/releases/tag/v5.2.2) (2023-06-18) From aeb69c48ad427d170a2ff2f0a953a50578c03dfd Mon Sep 17 00:00:00 2001 From: sinbad Date: Wed, 26 Jul 2023 10:06:59 +0500 Subject: [PATCH 31/35] replace json_decode to Decode in getJsonRawBody --- phalcon/Http/Request.zep | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phalcon/Http/Request.zep b/phalcon/Http/Request.zep index 501d40f234..e9f3f0e65f 100644 --- a/phalcon/Http/Request.zep +++ b/phalcon/Http/Request.zep @@ -18,6 +18,7 @@ use Phalcon\Http\Message\RequestMethodInterface; use Phalcon\Http\Request\File; use Phalcon\Http\Request\FileInterface; use Phalcon\Http\Request\Exception; +use Phalcon\Support\Helper\Json\Decode; use UnexpectedValueException; use stdClass; @@ -583,7 +584,7 @@ class Request extends AbstractInjectionAware implements RequestInterface, Reques let rawBody = "{}"; } - return json_decode(rawBody, associative); + return (new Decode())->__invoke(rawBody, associative); } /** From 802803bd32a022ac1032a4a290527ee301999271 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Wed, 26 Jul 2023 09:58:20 -0400 Subject: [PATCH 32/35] adjusting version --- phalcon/Support/Version.zep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phalcon/Support/Version.zep b/phalcon/Support/Version.zep index 071da5e8ba..0c96596446 100644 --- a/phalcon/Support/Version.zep +++ b/phalcon/Support/Version.zep @@ -77,7 +77,7 @@ class Version */ protected function getVersion() -> array { - return [5, 2, 2, 4, 0]; + return [5, 2, 3, 4, 0]; } /** From 19bc3ea6aa1d1cc552b7a3b0ba2b1d41ace40025 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Wed, 26 Jul 2023 09:58:52 -0400 Subject: [PATCH 33/35] changing version --- .github/workflows/main.yml | 2 +- CHANGELOG-5.0.md | 8 +++++--- config.json | 2 +- package.xml | 20 +++++++++++++------- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5be572a05f..b747deeaaf 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.2.2 + PHALCON_VERSION: 5.2.3 ZEPHIR_PARSER_VERSION: 1.5.3 ZEPHIR_VERSION: 0.17.0 diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md index ff337bcda9..8e72992976 100644 --- a/CHANGELOG-5.0.md +++ b/CHANGELOG-5.0.md @@ -1,17 +1,19 @@ # Changelog -## [5.2.3](https://github.com/phalcon/cphalcon/releases/tag/v5.2.3) (xxxx-xx-xx) +## [5.2.3](https://github.com/phalcon/cphalcon/releases/tag/v5.2.3) (2023-07-26) ### Fixed - Tried to reproduce the behavior described in #16244 but had no success. [#16244](https://github.com/phalcon/cphalcon/issues/16244) -- Added `getAdapter()` in `Phalcon\Mvc\Model\Metadata` to retrieve the internal cache adapter if necessary. [#16244](https://github.com/phalcon/cphalcon/issues/16244) -- Added `Phalcon\Storage\Adapter\Weak` implemented with WeakReference has a cache/retrieval solution for objects not yet collected by the Garbage Collection. [#16372](https://github.com/phalcon/cphalcon/issues/16372) - Extended `Phalcon\Di\Injectable` from `stdClass` to remove the deprecation warning (dynamic properties) for PHP 8.2 [#16308](https://github.com/phalcon/cphalcon/issues/16308) - Corrected the return type of `Phalcon\Mvc\View::getVar()` so that stubs can be accurate. [#16276](https://github.com/phalcon/cphalcon/issues/16276) - Changed all the `encode`/`decode` methods for JSON to use the `Phalcon\Support\Helper\Json\*` classes. [#15608](https://github.com/phalcon/cphalcon/issues/15608) - Changed the `Phalcon\Support\Helper\Json\*` classes to clear up `json_last_error()` before doing any conversions. [#15608](https://github.com/phalcon/cphalcon/issues/15608) - Fixed `Phalcon\Http\Request::getJsonRawBody` to protect from empty body [#16373](https://github.com/phalcon/cphalcon/issues/16373) +### Added +- Added `getAdapter()` in `Phalcon\Mvc\Model\Metadata` to retrieve the internal cache adapter if necessary. [#16244](https://github.com/phalcon/cphalcon/issues/16244) +- Added `Phalcon\Storage\Adapter\Weak` implemented with WeakReference has a cache/retrieval solution for objects not yet collected by the Garbage Collection. [#16372](https://github.com/phalcon/cphalcon/issues/16372) + ## [5.2.2](https://github.com/phalcon/cphalcon/releases/tag/v5.2.2) (2023-06-18) ### Fixed diff --git a/config.json b/config.json index 0f2c08f665..68464ed9b0 100644 --- a/config.json +++ b/config.json @@ -3,7 +3,7 @@ "name": "phalcon", "description": "Phalcon is a full stack PHP framework, delivered as a PHP extension, offering lower resource consumption and high performance.", "author": "Phalcon Team and contributors", - "version": "5.2.2", + "version": "5.2.3", "verbose": false, "stubs": { "path": "ide\/%version%\/%namespace%\/", diff --git a/package.xml b/package.xml index 35ed74e33a..d1f41d208e 100644 --- a/package.xml +++ b/package.xml @@ -22,11 +22,11 @@ nikos@phalcon.io yes - 2023-06-18 + 2023-07-26 - 5.2.2 - 5.2.2 + 5.2.3 + 5.2.3 stable @@ -37,10 +37,16 @@ Full changelog can be found at: https://github.com/phalcon/cphalcon/blob/master/CHANGELOG-5.0.md ### Fixed - - Fixed `Encryption\Crypt::checkCipherHashIsAvailable` to allow proper setting of the hash [#16314](https://github.com/phalcon/cphalcon/issues/16314) - - Removed `unlikely` from `if` statements from the Stream storage adapter and Json serializer [#16339](https://github.com/phalcon/cphalcon/issues/16339) - - Fixed `Storage\Adapter\Stream::get()/set()` to correctly calculate the path if the prefix is present in the key [#16348](https://github.com/phalcon/cphalcon/issues/16348) - - Fixed `Html\Helper\Input\Checkbox` to correctly process empty values [#15959](https://github.com/phalcon/cphalcon/issues/15959) + - Tried to reproduce the behavior described in #16244 but had no success. [#16244](https://github.com/phalcon/cphalcon/issues/16244) + - Extended `Phalcon\Di\Injectable` from `stdClass` to remove the deprecation warning (dynamic properties) for PHP 8.2 [#16308](https://github.com/phalcon/cphalcon/issues/16308) + - Corrected the return type of `Phalcon\Mvc\View::getVar()` so that stubs can be accurate. [#16276](https://github.com/phalcon/cphalcon/issues/16276) + - Changed all the `encode`/`decode` methods for JSON to use the `Phalcon\Support\Helper\Json\*` classes. [#15608](https://github.com/phalcon/cphalcon/issues/15608) + - Changed the `Phalcon\Support\Helper\Json\*` classes to clear up `json_last_error()` before doing any conversions. [#15608](https://github.com/phalcon/cphalcon/issues/15608) + - Fixed `Phalcon\Http\Request::getJsonRawBody` to protect from empty body [#16373](https://github.com/phalcon/cphalcon/issues/16373) + + ### Added + - Added `getAdapter()` in `Phalcon\Mvc\Model\Metadata` to retrieve the internal cache adapter if necessary. [#16244](https://github.com/phalcon/cphalcon/issues/16244) + - Added `Phalcon\Storage\Adapter\Weak` implemented with WeakReference has a cache/retrieval solution for objects not yet collected by the Garbage Collection. [#16372](https://github.com/phalcon/cphalcon/issues/16372) From 6ba215109069780eb925f40ae1be0fcb1c501194 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Wed, 26 Jul 2023 09:58:59 -0400 Subject: [PATCH 34/35] refreshing ext --- ext/config.m4 | 8 +- ext/config.w32 | 4 +- ext/phalcon.c | 16 +- ext/phalcon.h | 8 +- ext/phalcon/acl/adapter/memory.zep.c | 76 +-- .../annotations/adapter/abstractadapter.zep.c | 2 +- ext/phalcon/annotations/adapter/apcu.zep.c | 6 +- ext/phalcon/annotations/adapter/memory.zep.c | 2 +- ext/phalcon/annotations/adapter/stream.zep.c | 12 +- ext/phalcon/annotations/annotation.zep.c | 6 +- .../annotations/annotationsfactory.zep.c | 2 +- ext/phalcon/annotations/collection.zep.c | 4 +- ext/phalcon/annotations/reader.zep.c | 26 +- .../application/abstractapplication.zep.c | 4 +- ext/phalcon/assets/collection.zep.c | 26 +- ext/phalcon/assets/manager.zep.c | 62 +- ext/phalcon/autoload/loader.zep.c | 54 +- ext/phalcon/cache/abstractcache.zep.c | 2 +- ext/phalcon/cache/adapter/weak.zep.c | 35 + ext/phalcon/cache/adapter/weak.zep.h | 5 + ext/phalcon/cache/adapterfactory.zep.c | 5 +- ext/phalcon/cache/cachefactory.zep.c | 4 +- ext/phalcon/cli/console.zep.c | 8 +- ext/phalcon/cli/router.zep.c | 6 +- ext/phalcon/cli/task.zep.c | 2 +- ext/phalcon/config/adapter/grouped.zep.c | 16 +- ext/phalcon/config/adapter/ini.zep.c | 4 +- ext/phalcon/config/adapter/json.zep.c | 106 +-- ext/phalcon/config/adapter/json.zep.h | 9 - ext/phalcon/config/adapter/yaml.zep.c | 4 +- ext/phalcon/config/configfactory.zep.c | 2 +- ext/phalcon/datamapper/pdo/connection.zep.c | 6 +- .../pdo/connection/abstractconnection.zep.c | 2 +- .../datamapper/pdo/connection/decorated.zep.c | 4 +- .../datamapper/pdo/connectionlocator.zep.c | 6 +- .../datamapper/pdo/profiler/profiler.zep.c | 119 +--- .../datamapper/pdo/profiler/profiler.zep.h | 8 - .../datamapper/query/abstractquery.zep.c | 4 +- ext/phalcon/datamapper/query/delete.zep.c | 4 +- ext/phalcon/datamapper/query/insert.zep.c | 6 +- .../datamapper/query/queryfactory.zep.c | 14 +- ext/phalcon/datamapper/query/select.zep.c | 6 +- ext/phalcon/datamapper/query/update.zep.c | 6 +- ext/phalcon/db/adapter/abstractadapter.zep.c | 18 +- ext/phalcon/db/adapter/pdo/mysql.zep.c | 6 +- ext/phalcon/db/adapter/pdo/postgresql.zep.c | 8 +- ext/phalcon/db/adapter/pdo/sqlite.zep.c | 4 +- ext/phalcon/db/adapter/pdofactory.zep.c | 2 +- ext/phalcon/db/dialect.zep.c | 8 +- ext/phalcon/db/dialect/mysql.zep.c | 60 +- ext/phalcon/db/dialect/postgresql.zep.c | 24 +- ext/phalcon/db/dialect/sqlite.zep.c | 26 +- ext/phalcon/db/profiler.zep.c | 12 +- ext/phalcon/db/result/pdoresult.zep.c | 2 +- ext/phalcon/di/abstractinjectionaware.zep.c | 2 +- ext/phalcon/di/di.zep.c | 10 +- ext/phalcon/di/injectable.zep.c | 6 +- ext/phalcon/di/service.zep.c | 4 +- ext/phalcon/di/service/builder.zep.c | 20 +- .../dispatcher/abstractdispatcher.zep.c | 4 +- ext/phalcon/encryption/crypt.zep.c | 76 +-- .../encryption/crypt/padding/ansi.zep.c | 8 +- .../encryption/crypt/padding/iso10126.zep.c | 8 +- .../encryption/crypt/padding/isoiek.zep.c | 10 +- .../encryption/crypt/padding/pkcs7.zep.c | 8 +- .../encryption/crypt/padding/space.zep.c | 4 +- .../encryption/crypt/padding/zero.zep.c | 6 +- ext/phalcon/encryption/crypt/padfactory.zep.c | 2 +- ext/phalcon/encryption/security.zep.c | 32 +- .../encryption/security/jwt/builder.zep.c | 148 ++-- .../encryption/security/jwt/builder.zep.h | 8 - .../encryption/security/jwt/signer/hmac.zep.c | 6 +- .../security/jwt/token/parser.zep.c | 224 +++---- .../security/jwt/token/parser.zep.h | 15 +- .../encryption/security/jwt/token/token.zep.c | 10 +- .../encryption/security/jwt/validator.zep.c | 12 +- ext/phalcon/encryption/security/random.zep.c | 16 +- ext/phalcon/events/abstracteventsaware.zep.c | 2 +- ext/phalcon/events/manager.zep.c | 16 +- ext/phalcon/filter/filter.zep.c | 30 +- ext/phalcon/filter/filterfactory.zep.c | 2 +- ext/phalcon/filter/sanitize/absint.zep.c | 4 +- ext/phalcon/filter/sanitize/email.zep.c | 2 +- ext/phalcon/filter/sanitize/floatval.zep.c | 2 +- ext/phalcon/filter/sanitize/intval.zep.c | 2 +- ext/phalcon/filter/sanitize/lower.zep.c | 4 +- ext/phalcon/filter/sanitize/special.zep.c | 2 +- ext/phalcon/filter/sanitize/specialfull.zep.c | 2 +- ext/phalcon/filter/sanitize/stringval.zep.c | 2 +- .../filter/sanitize/stringvallegacy.zep.c | 2 +- ext/phalcon/filter/sanitize/striptags.zep.c | 2 +- ext/phalcon/filter/sanitize/upper.zep.c | 4 +- ext/phalcon/filter/sanitize/upperwords.zep.c | 6 +- ext/phalcon/filter/sanitize/url.zep.c | 2 +- ext/phalcon/filter/validation.zep.c | 16 +- .../filter/validation/abstractvalidator.zep.c | 4 +- .../abstractvalidatorcomposite.zep.c | 2 +- .../filter/validation/validator/alnum.zep.c | 4 +- .../filter/validation/validator/alpha.zep.c | 2 +- .../filter/validation/validator/between.zep.c | 2 +- .../validation/validator/callback.zep.c | 4 +- .../validation/validator/confirmation.zep.c | 6 +- .../validation/validator/creditcard.zep.c | 8 +- .../filter/validation/validator/date.zep.c | 4 +- .../filter/validation/validator/digit.zep.c | 4 +- .../filter/validation/validator/email.zep.c | 4 +- .../validation/validator/exclusionin.zep.c | 4 +- .../filter/validation/validator/file.zep.c | 90 +-- .../validator/file/abstractfile.zep.c | 10 +- .../validation/validator/file/mimetype.zep.c | 8 +- .../validator/file/resolution/equal.zep.c | 4 +- .../validator/file/resolution/max.zep.c | 4 +- .../validator/file/resolution/min.zep.c | 4 +- .../validator/file/size/equal.zep.c | 2 +- .../validation/validator/file/size/max.zep.c | 2 +- .../validation/validator/file/size/min.zep.c | 2 +- .../validation/validator/identical.zep.c | 2 +- .../validation/validator/inclusionin.zep.c | 4 +- .../filter/validation/validator/ip.zep.c | 4 +- .../validation/validator/numericality.zep.c | 2 +- .../validation/validator/presenceof.zep.c | 2 +- .../filter/validation/validator/regex.zep.c | 2 +- .../validation/validator/stringlength.zep.c | 8 +- .../validator/stringlength/max.zep.c | 4 +- .../validator/stringlength/min.zep.c | 4 +- .../validation/validator/uniqueness.zep.c | 8 +- .../filter/validation/validator/url.zep.c | 6 +- ext/phalcon/flash/abstractflash.zep.c | 6 +- .../forms/element/abstractelement.zep.c | 10 +- ext/phalcon/forms/form.zep.c | 24 +- ext/phalcon/forms/manager.zep.c | 4 +- ext/phalcon/html/attributes.zep.c | 4 +- ext/phalcon/html/breadcrumbs.zep.c | 2 +- ext/phalcon/html/escaper.zep.c | 24 +- ext/phalcon/html/helper/abstracthelper.zep.c | 2 +- ext/phalcon/html/helper/input/checkbox.zep.c | 2 +- ext/phalcon/html/helper/input/select.zep.c | 2 +- ext/phalcon/html/helper/meta.zep.c | 6 +- ext/phalcon/html/helper/title.zep.c | 4 +- .../html/link/evolvablelinkprovider.zep.c | 4 +- ext/phalcon/html/tagfactory.zep.c | 2 +- ext/phalcon/http/cookie.zep.c | 28 +- ext/phalcon/http/request.zep.c | 481 ++++++------- ext/phalcon/http/request/file.zep.c | 18 +- ext/phalcon/http/response.zep.c | 134 ++-- ext/phalcon/http/response.zep.h | 8 - .../image/adapter/abstractadapter.zep.c | 4 +- ext/phalcon/image/adapter/gd.zep.c | 24 +- ext/phalcon/image/adapter/imagick.zep.c | 169 ++--- ext/phalcon/logger/abstractlogger.zep.c | 2 +- .../logger/adapter/abstractadapter.zep.c | 6 +- ext/phalcon/logger/adapter/noop.zep.c | 2 +- ext/phalcon/logger/adapter/stream.zep.c | 6 +- ext/phalcon/logger/adapter/syslog.zep.c | 4 +- .../logger/formatter/abstractformatter.zep.c | 2 +- ext/phalcon/logger/formatter/json.zep.c | 2 +- ext/phalcon/logger/formatter/line.zep.c | 2 +- ext/phalcon/logger/loggerfactory.zep.c | 2 +- ext/phalcon/messages/messages.zep.c | 2 +- ext/phalcon/mvc/micro.zep.c | 10 +- ext/phalcon/mvc/micro/lazyloader.zep.c | 2 +- ext/phalcon/mvc/model.zep.c | 38 +- ext/phalcon/mvc/model/behavior.zep.c | 4 +- .../mvc/model/behavior/softdelete.zep.c | 2 +- .../mvc/model/behavior/timestampable.zep.c | 2 +- ext/phalcon/mvc/model/binder.zep.c | 8 +- ext/phalcon/mvc/model/criteria.zep.c | 8 +- ext/phalcon/mvc/model/manager.zep.c | 92 +-- ext/phalcon/mvc/model/metadata.zep.c | 52 +- ext/phalcon/mvc/model/metadata/apcu.zep.c | 2 +- .../mvc/model/metadata/libmemcached.zep.c | 2 +- ext/phalcon/mvc/model/metadata/redis.zep.c | 2 +- .../model/metadata/strategy/annotations.zep.c | 8 +- .../metadata/strategy/introspection.zep.c | 8 +- ext/phalcon/mvc/model/query.zep.c | 20 +- ext/phalcon/mvc/model/query/builder.zep.c | 16 +- ext/phalcon/mvc/model/query/status.zep.c | 2 +- ext/phalcon/mvc/model/resultset/complex.zep.c | 2 +- ext/phalcon/mvc/model/transaction.zep.c | 8 +- .../mvc/model/transaction/failed.zep.c | 2 +- .../mvc/model/transaction/manager.zep.c | 10 +- ext/phalcon/mvc/model/validationfailed.zep.c | 2 +- ext/phalcon/mvc/router.zep.c | 6 +- ext/phalcon/mvc/router/annotations.zep.c | 6 +- ext/phalcon/mvc/router/route.zep.c | 2 +- ext/phalcon/mvc/url.zep.c | 2 +- ext/phalcon/mvc/view.zep.c | 58 +- .../mvc/view/engine/abstractengine.zep.c | 4 +- ext/phalcon/mvc/view/engine/volt.zep.c | 14 +- .../mvc/view/engine/volt/compiler.zep.c | 6 +- ext/phalcon/mvc/view/simple.zep.c | 6 +- .../paginator/adapter/abstractadapter.zep.c | 2 +- ext/phalcon/paginator/adapter/model.zep.c | 4 +- .../paginator/adapter/querybuilder.zep.c | 2 +- .../session/adapter/libmemcached.zep.c | 2 +- ext/phalcon/session/adapter/redis.zep.c | 2 +- ext/phalcon/session/adapter/stream.zep.c | 14 +- ext/phalcon/session/bag.zep.c | 4 +- .../storage/adapter/abstractadapter.zep.c | 4 +- ext/phalcon/storage/adapter/apcu.zep.c | 33 +- .../storage/adapter/libmemcached.zep.c | 10 +- ext/phalcon/storage/adapter/memory.zep.c | 2 +- ext/phalcon/storage/adapter/redis.zep.c | 31 +- ext/phalcon/storage/adapter/stream.zep.c | 72 +- ext/phalcon/storage/adapter/weak.zep.c | 634 ++++++++++++++++++ ext/phalcon/storage/adapter/weak.zep.h | 90 +++ ext/phalcon/storage/adapterfactory.zep.c | 5 +- ext/phalcon/storage/serializer/base64.zep.c | 4 +- ext/phalcon/storage/serializer/igbinary.zep.c | 14 +- ext/phalcon/storage/serializer/json.zep.c | 235 +++---- ext/phalcon/storage/serializer/json.zep.h | 23 +- ext/phalcon/storage/serializer/php.zep.c | 10 +- ext/phalcon/support/collection.zep.c | 2 +- ext/phalcon/support/debug.zep.c | 6 +- ext/phalcon/support/debug/dump.zep.c | 106 +-- ext/phalcon/support/debug/dump.zep.h | 8 - ext/phalcon/support/helper/arr/get.zep.c | 2 +- ext/phalcon/support/helper/arr/group.zep.c | 2 +- ext/phalcon/support/helper/arr/isunique.zep.c | 2 +- ext/phalcon/support/helper/arr/last.zep.c | 2 +- ext/phalcon/support/helper/json/decode.zep.c | 43 +- ext/phalcon/support/helper/json/encode.zep.c | 62 +- .../support/helper/str/abstractstr.zep.c | 4 +- ext/phalcon/support/helper/str/concat.zep.c | 2 +- .../support/helper/str/decapitalize.zep.c | 4 +- .../support/helper/str/dirfromfile.zep.c | 4 +- ext/phalcon/support/helper/str/dynamic.zep.c | 4 +- ext/phalcon/support/helper/str/friendly.zep.c | 2 +- ext/phalcon/support/helper/str/len.zep.c | 2 +- ext/phalcon/support/helper/str/random.zep.c | 20 +- ext/phalcon/support/helper/str/ucwords.zep.c | 2 +- ext/phalcon/support/version.zep.c | 6 +- ext/phalcon/tag.zep.c | 6 +- ext/phalcon/tag/select.zep.c | 6 +- .../translate/adapter/abstractadapter.zep.c | 2 +- ext/phalcon/translate/adapter/csv.zep.c | 4 +- ext/phalcon/translate/adapter/gettext.zep.c | 2 +- .../translate/adapter/nativearray.zep.c | 2 +- .../translate/interpolator/indexedarray.zep.c | 2 +- ext/phalcon/translate/translatefactory.zep.c | 2 +- ext/php_phalcon.h | 2 +- 241 files changed, 2530 insertions(+), 2220 deletions(-) create mode 100644 ext/phalcon/cache/adapter/weak.zep.c create mode 100644 ext/phalcon/cache/adapter/weak.zep.h create mode 100644 ext/phalcon/storage/adapter/weak.zep.c create mode 100644 ext/phalcon/storage/adapter/weak.zep.h diff --git a/ext/config.m4 b/ext/config.m4 index 43db897658..2c8e216c23 100644 --- a/ext/config.m4 +++ b/ext/config.m4 @@ -15,18 +15,18 @@ if test "$PHP_PHALCON" = "yes"; then phalcon/filter/validation/abstractvalidator.zep.c phalcon/html/helper/input/abstractinput.zep.c phalcon/events/eventsawareinterface.zep.c + phalcon/storage/adapter/adapterinterface.zep.c phalcon/factory/abstractconfigfactory.zep.c phalcon/support/collection/collectioninterface.zep.c phalcon/di/abstractinjectionaware.zep.c - phalcon/storage/adapter/adapterinterface.zep.c phalcon/factory/abstractfactory.zep.c phalcon/storage/serializer/serializerinterface.zep.c phalcon/storage/serializer/abstractserializer.zep.c phalcon/di/injectable.zep.c phalcon/forms/element/elementinterface.zep.c phalcon/forms/element/abstractelement.zep.c - phalcon/support/helper/str/abstractstr.zep.c phalcon/storage/adapter/abstractadapter.zep.c + phalcon/support/helper/str/abstractstr.zep.c phalcon/support/collection.zep.c phalcon/support/helper/arr/abstractarr.zep.c phalcon/storage/serializer/none.zep.c @@ -34,9 +34,9 @@ if test "$PHP_PHALCON" = "yes"; then phalcon/encryption/crypt/padding/padinterface.zep.c phalcon/filter/validation/validator/file/abstractfile.zep.c phalcon/assets/assetinterface.zep.c + phalcon/cache/adapter/adapterinterface.zep.c phalcon/config/configinterface.zep.c phalcon/mvc/model/metadatainterface.zep.c - phalcon/cache/adapter/adapterinterface.zep.c phalcon/config/config.zep.c phalcon/datamapper/query/abstractquery.zep.c phalcon/db/adapter/adapterinterface.zep.c @@ -180,6 +180,7 @@ if test "$PHP_PHALCON" = "yes"; then phalcon/storage/adapter/memory.zep.c phalcon/storage/adapter/redis.zep.c phalcon/storage/adapter/stream.zep.c + phalcon/storage/adapter/weak.zep.c phalcon/storage/serializer/igbinary.zep.c phalcon/acl/adapter/memory.zep.c phalcon/acl/component.zep.c @@ -214,6 +215,7 @@ if test "$PHP_PHALCON" = "yes"; then phalcon/cache/adapter/memory.zep.c phalcon/cache/adapter/redis.zep.c phalcon/cache/adapter/stream.zep.c + phalcon/cache/adapter/weak.zep.c phalcon/cache/adapterfactory.zep.c phalcon/cache/cache.zep.c phalcon/cache/cachefactory.zep.c diff --git a/ext/config.w32 b/ext/config.w32 index e9ba2d1d36..60a87aa8e8 100644 --- a/ext/config.w32 +++ b/ext/config.w32 @@ -19,9 +19,9 @@ if (PHP_PHALCON != "no") { 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"); ADD_SOURCES(configure_module_dirname + "/phalcon/events", "eventsawareinterface.zep.c abstracteventsaware.zep.c eventinterface.zep.c managerinterface.zep.c event.zep.c exception.zep.c manager.zep.c", "phalcon"); + ADD_SOURCES(configure_module_dirname + "/phalcon/storage/adapter", "adapterinterface.zep.c abstractadapter.zep.c apcu.zep.c libmemcached.zep.c memory.zep.c redis.zep.c stream.zep.c weak.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/factory", "abstractconfigfactory.zep.c abstractfactory.zep.c exception.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/support/collection", "collectioninterface.zep.c exception.zep.c readonlycollection.zep.c", "phalcon"); - ADD_SOURCES(configure_module_dirname + "/phalcon/storage/adapter", "adapterinterface.zep.c abstractadapter.zep.c apcu.zep.c libmemcached.zep.c memory.zep.c redis.zep.c stream.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/storage/serializer", "serializerinterface.zep.c abstractserializer.zep.c none.zep.c igbinary.zep.c base64.zep.c json.zep.c memcachedigbinary.zep.c memcachedjson.zep.c memcachedphp.zep.c msgpack.zep.c php.zep.c redisigbinary.zep.c redisjson.zep.c redismsgpack.zep.c redisnone.zep.c redisphp.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/forms/element", "elementinterface.zep.c abstractelement.zep.c check.zep.c date.zep.c email.zep.c file.zep.c hidden.zep.c numeric.zep.c password.zep.c radio.zep.c select.zep.c submit.zep.c text.zep.c textarea.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/support/helper/str", "abstractstr.zep.c pascalcase.zep.c camelize.zep.c concat.zep.c countvowels.zep.c decapitalize.zep.c decrement.zep.c dirfromfile.zep.c dirseparator.zep.c dynamic.zep.c endswith.zep.c firstbetween.zep.c friendly.zep.c humanize.zep.c includes.zep.c increment.zep.c interpolate.zep.c isanagram.zep.c islower.zep.c ispalindrome.zep.c isupper.zep.c kebabcase.zep.c len.zep.c lower.zep.c prefix.zep.c random.zep.c reduceslashes.zep.c snakecase.zep.c startswith.zep.c suffix.zep.c ucwords.zep.c uncamelize.zep.c underscore.zep.c upper.zep.c", "phalcon"); @@ -31,9 +31,9 @@ if (PHP_PHALCON != "no") { ADD_SOURCES(configure_module_dirname + "/phalcon/encryption/crypt/padding", "padinterface.zep.c ansi.zep.c iso10126.zep.c isoiek.zep.c noop.zep.c pkcs7.zep.c space.zep.c zero.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/filter/validation/validator/file", "abstractfile.zep.c mimetype.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/assets", "assetinterface.zep.c filterinterface.zep.c asset.zep.c inline.zep.c collection.zep.c exception.zep.c manager.zep.c", "phalcon"); + ADD_SOURCES(configure_module_dirname + "/phalcon/cache/adapter", "adapterinterface.zep.c apcu.zep.c libmemcached.zep.c memory.zep.c redis.zep.c stream.zep.c weak.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/config", "configinterface.zep.c config.zep.c configfactory.zep.c exception.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/model", "metadatainterface.zep.c metadata.zep.c resultsetinterface.zep.c behaviorinterface.zep.c exception.zep.c behavior.zep.c resultinterface.zep.c resultset.zep.c binderinterface.zep.c criteriainterface.zep.c managerinterface.zep.c queryinterface.zep.c relationinterface.zep.c transactioninterface.zep.c binder.zep.c criteria.zep.c manager.zep.c query.zep.c relation.zep.c row.zep.c transaction.zep.c validationfailed.zep.c", "phalcon"); - ADD_SOURCES(configure_module_dirname + "/phalcon/cache/adapter", "adapterinterface.zep.c apcu.zep.c libmemcached.zep.c memory.zep.c redis.zep.c stream.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/datamapper/query", "abstractquery.zep.c abstractconditions.zep.c bind.zep.c delete.zep.c insert.zep.c queryfactory.zep.c select.zep.c update.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/db/adapter", "adapterinterface.zep.c abstractadapter.zep.c pdofactory.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/annotations/adapter", "adapterinterface.zep.c abstractadapter.zep.c apcu.zep.c memory.zep.c stream.zep.c", "phalcon"); diff --git a/ext/phalcon.c b/ext/phalcon.c index 2c7042023b..9e79b90810 100644 --- a/ext/phalcon.c +++ b/ext/phalcon.c @@ -27,16 +27,16 @@ zend_class_entry *phalcon_di_injectionawareinterface_ce; zend_class_entry *phalcon_filter_validation_validatorinterface_ce; zend_class_entry *phalcon_events_eventsawareinterface_ce; -zend_class_entry *phalcon_support_collection_collectioninterface_ce; zend_class_entry *phalcon_storage_adapter_adapterinterface_ce; +zend_class_entry *phalcon_support_collection_collectioninterface_ce; zend_class_entry *phalcon_storage_serializer_serializerinterface_ce; zend_class_entry *phalcon_forms_element_elementinterface_ce; zend_class_entry *phalcon_dispatcher_dispatcherinterface_ce; zend_class_entry *phalcon_encryption_crypt_padding_padinterface_ce; zend_class_entry *phalcon_assets_assetinterface_ce; +zend_class_entry *phalcon_cache_adapter_adapterinterface_ce; zend_class_entry *phalcon_config_configinterface_ce; zend_class_entry *phalcon_mvc_model_metadatainterface_ce; -zend_class_entry *phalcon_cache_adapter_adapterinterface_ce; zend_class_entry *phalcon_db_adapter_adapterinterface_ce; zend_class_entry *phalcon_annotations_adapter_adapterinterface_ce; zend_class_entry *phalcon_datamapper_pdo_connection_pdointerface_ce; @@ -140,8 +140,8 @@ zend_class_entry *phalcon_factory_abstractfactory_ce; zend_class_entry *phalcon_storage_serializer_abstractserializer_ce; zend_class_entry *phalcon_di_injectable_ce; zend_class_entry *phalcon_forms_element_abstractelement_ce; -zend_class_entry *phalcon_support_helper_str_abstractstr_ce; zend_class_entry *phalcon_storage_adapter_abstractadapter_ce; +zend_class_entry *phalcon_support_helper_str_abstractstr_ce; zend_class_entry *phalcon_support_collection_ce; zend_class_entry *phalcon_support_helper_arr_abstractarr_ce; zend_class_entry *phalcon_storage_serializer_none_ce; @@ -204,6 +204,7 @@ zend_class_entry *phalcon_storage_adapter_libmemcached_ce; zend_class_entry *phalcon_storage_adapter_memory_ce; zend_class_entry *phalcon_storage_adapter_redis_ce; zend_class_entry *phalcon_storage_adapter_stream_ce; +zend_class_entry *phalcon_storage_adapter_weak_ce; zend_class_entry *phalcon_storage_serializer_igbinary_ce; zend_class_entry *phalcon_0__closure_ce; zend_class_entry *phalcon_10__closure_ce; @@ -251,6 +252,7 @@ zend_class_entry *phalcon_cache_adapter_libmemcached_ce; zend_class_entry *phalcon_cache_adapter_memory_ce; zend_class_entry *phalcon_cache_adapter_redis_ce; zend_class_entry *phalcon_cache_adapter_stream_ce; +zend_class_entry *phalcon_cache_adapter_weak_ce; zend_class_entry *phalcon_cache_adapterfactory_ce; zend_class_entry *phalcon_cache_cache_ce; zend_class_entry *phalcon_cache_cachefactory_ce; @@ -676,16 +678,16 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Di_InjectionAwareInterface); ZEPHIR_INIT(Phalcon_Filter_Validation_ValidatorInterface); ZEPHIR_INIT(Phalcon_Events_EventsAwareInterface); - ZEPHIR_INIT(Phalcon_Support_Collection_CollectionInterface); ZEPHIR_INIT(Phalcon_Storage_Adapter_AdapterInterface); + ZEPHIR_INIT(Phalcon_Support_Collection_CollectionInterface); ZEPHIR_INIT(Phalcon_Storage_Serializer_SerializerInterface); ZEPHIR_INIT(Phalcon_Forms_Element_ElementInterface); ZEPHIR_INIT(Phalcon_Dispatcher_DispatcherInterface); ZEPHIR_INIT(Phalcon_Encryption_Crypt_Padding_PadInterface); ZEPHIR_INIT(Phalcon_Assets_AssetInterface); + ZEPHIR_INIT(Phalcon_Cache_Adapter_AdapterInterface); ZEPHIR_INIT(Phalcon_Config_ConfigInterface); ZEPHIR_INIT(Phalcon_Mvc_Model_MetaDataInterface); - ZEPHIR_INIT(Phalcon_Cache_Adapter_AdapterInterface); ZEPHIR_INIT(Phalcon_Db_Adapter_AdapterInterface); ZEPHIR_INIT(Phalcon_Annotations_Adapter_AdapterInterface); ZEPHIR_INIT(Phalcon_DataMapper_Pdo_Connection_PdoInterface); @@ -789,8 +791,8 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Storage_Serializer_AbstractSerializer); ZEPHIR_INIT(Phalcon_Di_Injectable); ZEPHIR_INIT(Phalcon_Forms_Element_AbstractElement); - ZEPHIR_INIT(Phalcon_Support_Helper_Str_AbstractStr); ZEPHIR_INIT(Phalcon_Storage_Adapter_AbstractAdapter); + ZEPHIR_INIT(Phalcon_Support_Helper_Str_AbstractStr); ZEPHIR_INIT(Phalcon_Support_Collection); ZEPHIR_INIT(Phalcon_Support_Helper_Arr_AbstractArr); ZEPHIR_INIT(Phalcon_Storage_Serializer_None); @@ -853,6 +855,7 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Storage_Adapter_Memory); ZEPHIR_INIT(Phalcon_Storage_Adapter_Redis); ZEPHIR_INIT(Phalcon_Storage_Adapter_Stream); + ZEPHIR_INIT(Phalcon_Storage_Adapter_Weak); ZEPHIR_INIT(Phalcon_Storage_Serializer_Igbinary); ZEPHIR_INIT(Phalcon_Acl_Adapter_Memory); ZEPHIR_INIT(Phalcon_Acl_Component); @@ -886,6 +889,7 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Cache_Adapter_Memory); ZEPHIR_INIT(Phalcon_Cache_Adapter_Redis); ZEPHIR_INIT(Phalcon_Cache_Adapter_Stream); + ZEPHIR_INIT(Phalcon_Cache_Adapter_Weak); ZEPHIR_INIT(Phalcon_Cache_Cache); ZEPHIR_INIT(Phalcon_Cache_CacheFactory); ZEPHIR_INIT(Phalcon_Cache_Exception_Exception); diff --git a/ext/phalcon.h b/ext/phalcon.h index fda5828a79..f2b17d8a8c 100644 --- a/ext/phalcon.h +++ b/ext/phalcon.h @@ -10,18 +10,18 @@ #include "phalcon/filter/validation/abstractvalidator.zep.h" #include "phalcon/html/helper/input/abstractinput.zep.h" #include "phalcon/events/eventsawareinterface.zep.h" +#include "phalcon/storage/adapter/adapterinterface.zep.h" #include "phalcon/factory/abstractconfigfactory.zep.h" #include "phalcon/support/collection/collectioninterface.zep.h" #include "phalcon/di/abstractinjectionaware.zep.h" -#include "phalcon/storage/adapter/adapterinterface.zep.h" #include "phalcon/factory/abstractfactory.zep.h" #include "phalcon/storage/serializer/serializerinterface.zep.h" #include "phalcon/storage/serializer/abstractserializer.zep.h" #include "phalcon/di/injectable.zep.h" #include "phalcon/forms/element/elementinterface.zep.h" #include "phalcon/forms/element/abstractelement.zep.h" -#include "phalcon/support/helper/str/abstractstr.zep.h" #include "phalcon/storage/adapter/abstractadapter.zep.h" +#include "phalcon/support/helper/str/abstractstr.zep.h" #include "phalcon/support/collection.zep.h" #include "phalcon/support/helper/arr/abstractarr.zep.h" #include "phalcon/storage/serializer/none.zep.h" @@ -29,9 +29,9 @@ #include "phalcon/encryption/crypt/padding/padinterface.zep.h" #include "phalcon/filter/validation/validator/file/abstractfile.zep.h" #include "phalcon/assets/assetinterface.zep.h" +#include "phalcon/cache/adapter/adapterinterface.zep.h" #include "phalcon/config/configinterface.zep.h" #include "phalcon/mvc/model/metadatainterface.zep.h" -#include "phalcon/cache/adapter/adapterinterface.zep.h" #include "phalcon/config/config.zep.h" #include "phalcon/datamapper/query/abstractquery.zep.h" #include "phalcon/db/adapter/adapterinterface.zep.h" @@ -175,6 +175,7 @@ #include "phalcon/storage/adapter/memory.zep.h" #include "phalcon/storage/adapter/redis.zep.h" #include "phalcon/storage/adapter/stream.zep.h" +#include "phalcon/storage/adapter/weak.zep.h" #include "phalcon/storage/serializer/igbinary.zep.h" #include "phalcon/acl/adapter/memory.zep.h" #include "phalcon/acl/component.zep.h" @@ -209,6 +210,7 @@ #include "phalcon/cache/adapter/memory.zep.h" #include "phalcon/cache/adapter/redis.zep.h" #include "phalcon/cache/adapter/stream.zep.h" +#include "phalcon/cache/adapter/weak.zep.h" #include "phalcon/cache/adapterfactory.zep.h" #include "phalcon/cache/cache.zep.h" #include "phalcon/cache/cachefactory.zep.h" diff --git a/ext/phalcon/acl/adapter/memory.zep.c b/ext/phalcon/acl/adapter/memory.zep.c index e0eab5463d..f260cfccbe 100644 --- a/ext/phalcon/acl/adapter/memory.zep.c +++ b/ext/phalcon/acl/adapter/memory.zep.c @@ -263,10 +263,10 @@ 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, 133, componentValue); + ZEPHIR_CALL_METHOD(NULL, &componentObject, "__construct", NULL, 139, componentValue); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&componentName, &componentObject, "getname", NULL, 134); + ZEPHIR_CALL_METHOD(&componentName, &componentObject, "getname", NULL, 140); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("componentsNames"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset(&_1, &componentName))) { @@ -323,7 +323,7 @@ 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, 135, &_0, &componentName, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 141, &_0, &componentName, &_1); zephir_check_call_status(); _2 = Z_TYPE_P(accessList) != IS_ARRAY; if (_2) { @@ -474,7 +474,7 @@ 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, 135, &_0, &roleName, &_1, &_2); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 141, &_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))) { @@ -538,7 +538,7 @@ 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, 136, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 142, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -554,7 +554,7 @@ 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, 136, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 142, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_16$$12, "next", NULL, 0); @@ -598,7 +598,7 @@ 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, 136, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 142, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -614,7 +614,7 @@ 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, 136, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 142, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_25$$18, "next", NULL, 0); @@ -681,7 +681,7 @@ 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, 136, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 142, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -697,7 +697,7 @@ 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, 136, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 142, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_36$$27, "next", NULL, 0); @@ -741,7 +741,7 @@ 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, 136, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 142, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -757,7 +757,7 @@ 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, 136, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 142, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_43$$33, "next", NULL, 0); @@ -831,13 +831,13 @@ 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, 137, role); + ZEPHIR_CALL_METHOD(NULL, &roleObject, "__construct", NULL, 143, 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", 394); return; } - ZEPHIR_CALL_METHOD(&roleName, &roleObject, "getname", NULL, 138); + ZEPHIR_CALL_METHOD(&roleName, &roleObject, "getname", NULL, 144); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("roles"), PH_NOISY_CC | PH_READONLY); if (zephir_array_isset(&_1, &roleName)) { @@ -928,7 +928,7 @@ 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, 139, &role, &componentName, access, &_4$$4, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 145, &role, &componentName, access, &_4$$4, func); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -943,7 +943,7 @@ 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, 139, &role, &componentName, access, &_6$$5, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 145, &role, &componentName, access, &_6$$5, func); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &rolesArray, "next", NULL, 0); zephir_check_call_status(); @@ -1030,7 +1030,7 @@ 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, 139, &role, &componentName, access, &_4$$4, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 145, &role, &componentName, access, &_4$$4, func); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -1045,7 +1045,7 @@ 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, 139, &role, &componentName, access, &_6$$5, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 145, &role, &componentName, access, &_6$$5, func); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &rolesArray, "next", NULL, 0); zephir_check_call_status(); @@ -1463,7 +1463,7 @@ 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, 140, roleName, componentName, &access); + ZEPHIR_CALL_METHOD(&accessKey, this_ptr, "canaccess", NULL, 146, roleName, componentName, &access); zephir_check_call_status(); _10 = Z_TYPE_P(&accessKey) != IS_NULL; if (_10) { @@ -1492,9 +1492,9 @@ 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, 141, &funcAccess); + ZEPHIR_CALL_METHOD(NULL, &reflectionFunction, "__construct", NULL, 147, &funcAccess); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&reflectionParameters, &reflectionFunction, "getparameters", NULL, 142); + ZEPHIR_CALL_METHOD(&reflectionParameters, &reflectionFunction, "getparameters", NULL, 148); zephir_check_call_status(); ZEPHIR_INIT_VAR(¶meterNumber); ZVAL_LONG(¶meterNumber, zephir_fast_count_int(&reflectionParameters)); @@ -1510,7 +1510,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) } ZEPHIR_INIT_VAR(¶metersForFunction); array_init(¶metersForFunction); - ZEPHIR_CALL_METHOD(&numberOfRequiredParameters, &reflectionFunction, "getnumberofrequiredparameters", NULL, 143); + ZEPHIR_CALL_METHOD(&numberOfRequiredParameters, &reflectionFunction, "getnumberofrequiredparameters", NULL, 149); zephir_check_call_status(); ZEPHIR_CPY_WRT(&userParametersSizeShouldBe, ¶meterNumber); zephir_is_iterable(&reflectionParameters, 0, "phalcon/Acl/Adapter/Memory.zep", 766); @@ -1528,11 +1528,11 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&reflectionClass); object_init_ex(&reflectionClass, zephir_get_internal_ce(SL("reflectionclass"))); - ZEPHIR_CALL_METHOD(NULL, &reflectionClass, "__construct", &_17, 144, &className); + ZEPHIR_CALL_METHOD(NULL, &reflectionClass, "__construct", &_17, 150, &className); zephir_check_call_status(); _18$$18 = Z_TYPE_P(&roleObject) != IS_NULL; if (_18$$18) { - ZEPHIR_CALL_METHOD(&_19$$18, &reflectionClass, "isinstance", &_20, 145, &roleObject); + ZEPHIR_CALL_METHOD(&_19$$18, &reflectionClass, "isinstance", &_20, 151, &roleObject); zephir_check_call_status(); _18$$18 = zephir_is_true(&_19$$18); } @@ -1549,7 +1549,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) } _22$$18 = Z_TYPE_P(&componentObject) != IS_NULL; if (_22$$18) { - ZEPHIR_CALL_METHOD(&_23$$18, &reflectionClass, "isinstance", &_20, 145, &componentObject); + ZEPHIR_CALL_METHOD(&_23$$18, &reflectionClass, "isinstance", &_20, 151, &componentObject); zephir_check_call_status(); _22$$18 = zephir_is_true(&_23$$18); } @@ -1572,7 +1572,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) _27$$18 = _25$$18; if (_27$$18) { zephir_array_fetch(&_29$$18, ¶meters, ¶meterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 743); - ZEPHIR_CALL_METHOD(&_28$$18, &reflectionClass, "isinstance", &_20, 145, &_29$$18); + ZEPHIR_CALL_METHOD(&_28$$18, &reflectionClass, "isinstance", &_20, 151, &_29$$18); zephir_check_call_status(); _27$$18 = !zephir_is_true(&_28$$18); } @@ -1582,7 +1582,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) ZEPHIR_INIT_NVAR(&_31$$21); zephir_array_fetch(&_32$$21, ¶meters, ¶meterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 750); zephir_get_class(&_31$$21, &_32$$21, 0); - ZEPHIR_CALL_METHOD(&_33$$21, &reflectionClass, "getname", &_34, 146); + ZEPHIR_CALL_METHOD(&_33$$21, &reflectionClass, "getname", &_34, 152); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_35$$21); ZEPHIR_CONCAT_SSSVSVSVSVSVS(&_35$$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: ", &_31$$21, " , Class in defined function: ", &_33$$21, "."); @@ -1618,11 +1618,11 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&reflectionClass); object_init_ex(&reflectionClass, zephir_get_internal_ce(SL("reflectionclass"))); - ZEPHIR_CALL_METHOD(NULL, &reflectionClass, "__construct", &_17, 144, &className); + ZEPHIR_CALL_METHOD(NULL, &reflectionClass, "__construct", &_17, 150, &className); zephir_check_call_status(); _37$$24 = Z_TYPE_P(&roleObject) != IS_NULL; if (_37$$24) { - ZEPHIR_CALL_METHOD(&_38$$24, &reflectionClass, "isinstance", &_20, 145, &roleObject); + ZEPHIR_CALL_METHOD(&_38$$24, &reflectionClass, "isinstance", &_20, 151, &roleObject); zephir_check_call_status(); _37$$24 = zephir_is_true(&_38$$24); } @@ -1639,7 +1639,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) } _40$$24 = Z_TYPE_P(&componentObject) != IS_NULL; if (_40$$24) { - ZEPHIR_CALL_METHOD(&_41$$24, &reflectionClass, "isinstance", &_20, 145, &componentObject); + ZEPHIR_CALL_METHOD(&_41$$24, &reflectionClass, "isinstance", &_20, 151, &componentObject); zephir_check_call_status(); _40$$24 = zephir_is_true(&_41$$24); } @@ -1662,7 +1662,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) _45$$24 = _43$$24; if (_45$$24) { zephir_array_fetch(&_47$$24, ¶meters, ¶meterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 743); - ZEPHIR_CALL_METHOD(&_46$$24, &reflectionClass, "isinstance", &_20, 145, &_47$$24); + ZEPHIR_CALL_METHOD(&_46$$24, &reflectionClass, "isinstance", &_20, 151, &_47$$24); zephir_check_call_status(); _45$$24 = !zephir_is_true(&_46$$24); } @@ -1672,7 +1672,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) ZEPHIR_INIT_NVAR(&_49$$27); zephir_array_fetch(&_50$$27, ¶meters, ¶meterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 750); zephir_get_class(&_49$$27, &_50$$27, 0); - ZEPHIR_CALL_METHOD(&_51$$27, &reflectionClass, "getname", &_34, 146); + ZEPHIR_CALL_METHOD(&_51$$27, &reflectionClass, "getname", &_34, 152); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_52$$27); ZEPHIR_CONCAT_SSSVSVSVSVSVS(&_52$$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: ", &_49$$27, " , Class in defined function: ", &_51$$27, "."); @@ -1891,12 +1891,12 @@ 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, 135, &_0, &roleName, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 141, &_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, 135, &_2, &componentName, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 141, &_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); @@ -2092,7 +2092,7 @@ 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, 136, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 142, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -2108,7 +2108,7 @@ 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, 136, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 142, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_2$$6, "next", NULL, 0); @@ -2159,7 +2159,7 @@ 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, 136, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 142, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -2175,7 +2175,7 @@ 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, 136, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 142, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_12$$14, "next", NULL, 0); diff --git a/ext/phalcon/annotations/adapter/abstractadapter.zep.c b/ext/phalcon/annotations/adapter/abstractadapter.zep.c index dda01ae4fb..d2cf703d1a 100644 --- a/ext/phalcon/annotations/adapter/abstractadapter.zep.c +++ b/ext/phalcon/annotations/adapter/abstractadapter.zep.c @@ -431,7 +431,7 @@ PHP_METHOD(Phalcon_Annotations_Adapter_AbstractAdapter, setReader) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(reader, zephir_get_internal_ce(SL("phalcon\\annotations\\readerinterface"))) + Z_PARAM_OBJECT_OF_CLASS(reader, phalcon_annotations_readerinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/annotations/adapter/apcu.zep.c b/ext/phalcon/annotations/adapter/apcu.zep.c index 8766d603a5..8b15837413 100644 --- a/ext/phalcon/annotations/adapter/apcu.zep.c +++ b/ext/phalcon/annotations/adapter/apcu.zep.c @@ -142,7 +142,7 @@ 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, 0, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_fetch", NULL, 103, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -168,7 +168,7 @@ PHP_METHOD(Phalcon_Annotations_Adapter_Apcu, write) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(key) - Z_PARAM_OBJECT_OF_CLASS(data, zephir_get_internal_ce(SL("phalcon\\annotations\\reflection"))) + Z_PARAM_OBJECT_OF_CLASS(data, phalcon_annotations_reflection_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -192,7 +192,7 @@ 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, 0, &_0, data, &_3); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_store", NULL, 104, &_0, data, &_3); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/annotations/adapter/memory.zep.c b/ext/phalcon/annotations/adapter/memory.zep.c index 3a69f54478..42f51577f7 100644 --- a/ext/phalcon/annotations/adapter/memory.zep.c +++ b/ext/phalcon/annotations/adapter/memory.zep.c @@ -105,7 +105,7 @@ PHP_METHOD(Phalcon_Annotations_Adapter_Memory, write) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(key) - Z_PARAM_OBJECT_OF_CLASS(data, zephir_get_internal_ce(SL("phalcon\\annotations\\reflection"))) + Z_PARAM_OBJECT_OF_CLASS(data, phalcon_annotations_reflection_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/annotations/adapter/stream.zep.c b/ext/phalcon/annotations/adapter/stream.zep.c index 108f36aad1..5284fb8017 100644 --- a/ext/phalcon/annotations/adapter/stream.zep.c +++ b/ext/phalcon/annotations/adapter/stream.zep.c @@ -154,33 +154,33 @@ 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, 123); + ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 129); 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, 124, &version, &_4, &_5); + ZEPHIR_CALL_FUNCTION(&_6, "version_compare", NULL, 130, &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_5__closure_ce, SL("__invoke")); ZVAL_LONG(&_8$$5, 2); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 125, &_7$$5, &_8$$5); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 131, &_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_6__closure_ce, SL("__invoke")); ZVAL_LONG(&_10$$6, 2); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 125, &_9$$6, &_10$$6); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 131, &_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, 126); + ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 132); 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); @@ -213,7 +213,7 @@ PHP_METHOD(Phalcon_Annotations_Adapter_Stream, write) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(key) - Z_PARAM_OBJECT_OF_CLASS(data, zephir_get_internal_ce(SL("phalcon\\annotations\\reflection"))) + Z_PARAM_OBJECT_OF_CLASS(data, phalcon_annotations_reflection_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/annotations/annotation.zep.c b/ext/phalcon/annotations/annotation.zep.c index 32419295af..17ee67169b 100644 --- a/ext/phalcon/annotations/annotation.zep.c +++ b/ext/phalcon/annotations/annotation.zep.c @@ -276,7 +276,7 @@ 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, 147, &_3$$8); + ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_4, 153, &_3$$8); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); if (zephir_array_isset_string_fetch(&name, &item, SL("name"), 0)) { @@ -297,7 +297,7 @@ 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, 147, &_5$$11); + ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_4, 153, &_5$$11); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); if (zephir_array_isset_string_fetch(&name, &item, SL("name"), 0)) { @@ -314,7 +314,7 @@ 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, 148, &expr); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 154, &expr); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/annotations/annotationsfactory.zep.c b/ext/phalcon/annotations/annotationsfactory.zep.c index 75786d8cae..54f500edcf 100644 --- a/ext/phalcon/annotations/annotationsfactory.zep.c +++ b/ext/phalcon/annotations/annotationsfactory.zep.c @@ -136,7 +136,7 @@ PHP_METHOD(Phalcon_Annotations_AnnotationsFactory, load) array_init(&_2); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "options"); - ZEPHIR_CALL_METHOD(&options, &_1, "__invoke", NULL, 149, config, &_3, &_2); + ZEPHIR_CALL_METHOD(&options, &_1, "__invoke", NULL, 155, config, &_3, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "newinstance", NULL, 0, &name, &options); zephir_check_call_status(); diff --git a/ext/phalcon/annotations/collection.zep.c b/ext/phalcon/annotations/collection.zep.c index 5c2d484221..748bee3800 100644 --- a/ext/phalcon/annotations/collection.zep.c +++ b/ext/phalcon/annotations/collection.zep.c @@ -110,7 +110,7 @@ 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, 148, &annotationData); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", &_3, 154, &annotationData); zephir_check_call_status(); zephir_array_append(&annotations, &_2$$3, PH_SEPARATE, "phalcon/Annotations/Collection.zep", 55); } ZEND_HASH_FOREACH_END(); @@ -127,7 +127,7 @@ 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, 148, &annotationData); + ZEPHIR_CALL_METHOD(NULL, &_4$$4, "__construct", &_3, 154, &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); diff --git a/ext/phalcon/annotations/reader.zep.c b/ext/phalcon/annotations/reader.zep.c index d6774e2b8f..f6e4943561 100644 --- a/ext/phalcon/annotations/reader.zep.c +++ b/ext/phalcon/annotations/reader.zep.c @@ -110,15 +110,15 @@ 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, 144, &className); + ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 150, &className); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&comment, &reflection, "getdoccomment", NULL, 150); + ZEPHIR_CALL_METHOD(&comment, &reflection, "getdoccomment", NULL, 156); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) { ZEPHIR_INIT_VAR(&classAnnotations); - ZEPHIR_CALL_METHOD(&_0$$3, &reflection, "getfilename", NULL, 151); + ZEPHIR_CALL_METHOD(&_0$$3, &reflection, "getfilename", NULL, 157); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, &reflection, "getstartline", NULL, 152); + ZEPHIR_CALL_METHOD(&_1$$3, &reflection, "getstartline", NULL, 158); zephir_check_call_status(); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&classAnnotations, &comment, &_0$$3, &_1$$3); zephir_check_call_status(); @@ -126,7 +126,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_array_update_string(&annotations, SL("class"), &classAnnotations, PH_COPY | PH_SEPARATE); } } - ZEPHIR_CALL_METHOD(&constants, &reflection, "getconstants", NULL, 153); + ZEPHIR_CALL_METHOD(&constants, &reflection, "getconstants", NULL, 159); zephir_check_call_status(); if (zephir_fast_count_int(&constants)) { line = 1; @@ -140,13 +140,13 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) { ZEPHIR_INIT_NVAR(&constant); ZVAL_COPY(&constant, _2$$5); - ZEPHIR_CALL_METHOD(&constantReflection, &reflection, "getreflectionconstant", &_4, 154, &constant); + ZEPHIR_CALL_METHOD(&constantReflection, &reflection, "getreflectionconstant", &_4, 160, &constant); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&comment, &constantReflection, "getdoccomment", NULL, 0); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) { ZEPHIR_INIT_NVAR(&constantAnnotations); - ZEPHIR_CALL_METHOD(&_5$$7, &reflection, "getfilename", NULL, 151); + ZEPHIR_CALL_METHOD(&_5$$7, &reflection, "getfilename", NULL, 157); zephir_check_call_status(); ZVAL_LONG(&_6$$7, line); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&constantAnnotations, &comment, &_5$$7, &_6$$7); @@ -167,13 +167,13 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) } ZEPHIR_CALL_METHOD(&constant, &arrayKeys, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&constantReflection, &reflection, "getreflectionconstant", &_4, 154, &constant); + ZEPHIR_CALL_METHOD(&constantReflection, &reflection, "getreflectionconstant", &_4, 160, &constant); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&comment, &constantReflection, "getdoccomment", NULL, 0); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) { ZEPHIR_INIT_NVAR(&constantAnnotations); - ZEPHIR_CALL_METHOD(&_7$$10, &reflection, "getfilename", NULL, 151); + ZEPHIR_CALL_METHOD(&_7$$10, &reflection, "getfilename", NULL, 157); zephir_check_call_status(); ZVAL_LONG(&_8$$10, line); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&constantAnnotations, &comment, &_7$$10, &_8$$10); @@ -191,7 +191,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_array_update_string(&annotations, SL("constants"), &anotationsConstants, PH_COPY | PH_SEPARATE); } } - ZEPHIR_CALL_METHOD(&properties, &reflection, "getproperties", NULL, 155); + ZEPHIR_CALL_METHOD(&properties, &reflection, "getproperties", NULL, 161); zephir_check_call_status(); if (zephir_fast_count_int(&properties)) { line = 1; @@ -207,7 +207,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) { ZEPHIR_INIT_NVAR(&propertyAnnotations); - ZEPHIR_CALL_METHOD(&_11$$15, &reflection, "getfilename", NULL, 151); + ZEPHIR_CALL_METHOD(&_11$$15, &reflection, "getfilename", NULL, 157); zephir_check_call_status(); ZVAL_LONG(&_12$$15, line); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&propertyAnnotations, &comment, &_11$$15, &_12$$15); @@ -234,7 +234,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) { ZEPHIR_INIT_NVAR(&propertyAnnotations); - ZEPHIR_CALL_METHOD(&_14$$18, &reflection, "getfilename", NULL, 151); + ZEPHIR_CALL_METHOD(&_14$$18, &reflection, "getfilename", NULL, 157); zephir_check_call_status(); ZVAL_LONG(&_15$$18, line); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&propertyAnnotations, &comment, &_14$$18, &_15$$18); @@ -254,7 +254,7 @@ 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, 156); + ZEPHIR_CALL_METHOD(&methods, &reflection, "getmethods", NULL, 162); zephir_check_call_status(); if (0 == ZEPHIR_IS_EMPTY(&methods)) { ZEPHIR_INIT_VAR(&annotationsMethods); diff --git a/ext/phalcon/application/abstractapplication.zep.c b/ext/phalcon/application/abstractapplication.zep.c index 3da014bda2..72c85b74be 100644 --- a/ext/phalcon/application/abstractapplication.zep.c +++ b/ext/phalcon/application/abstractapplication.zep.c @@ -73,7 +73,7 @@ PHP_METHOD(Phalcon_Application_AbstractApplication, __construct) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 1) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, phalcon_di_diinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -295,7 +295,7 @@ PHP_METHOD(Phalcon_Application_AbstractApplication, setEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/assets/collection.zep.c b/ext/phalcon/assets/collection.zep.c index 184b7be9ef..6f884e0486 100644 --- a/ext/phalcon/assets/collection.zep.c +++ b/ext/phalcon/assets/collection.zep.c @@ -115,7 +115,7 @@ PHP_METHOD(Phalcon_Assets_Collection, add) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(asset, zephir_get_internal_ce(SL("phalcon\\assets\\assetinterface"))) + Z_PARAM_OBJECT_OF_CLASS(asset, phalcon_assets_assetinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -124,7 +124,7 @@ PHP_METHOD(Phalcon_Assets_Collection, add) zephir_fetch_params(1, 1, 0, &asset); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 157, asset); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 163, asset); zephir_check_call_status(); RETURN_THIS(); } @@ -213,7 +213,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addCss) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processadd", NULL, 158, &_0, &path, isLocal, &_1, &attributes, &version, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processadd", NULL, 164, &_0, &path, isLocal, &_1, &attributes, &version, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -232,7 +232,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addFilter) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(filter, zephir_get_internal_ce(SL("phalcon\\assets\\filterinterface"))) + Z_PARAM_OBJECT_OF_CLASS(filter, phalcon_assets_filterinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -260,7 +260,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addInline) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(code, zephir_get_internal_ce(SL("phalcon\\assets\\inline"))) + Z_PARAM_OBJECT_OF_CLASS(code, phalcon_assets_inline_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -269,7 +269,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addInline) zephir_fetch_params(1, 1, 0, &code); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 157, code); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 163, code); zephir_check_call_status(); RETURN_THIS(); } @@ -329,7 +329,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addInlineCss) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 159, &_0, &content, &_1, &attributes); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 165, &_0, &content, &_1, &attributes); zephir_check_call_status(); RETURN_MM(); } @@ -389,7 +389,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addInlineJs) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 159, &_0, &content, &_1, &attributes); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 165, &_0, &content, &_1, &attributes); zephir_check_call_status(); RETURN_MM(); } @@ -478,7 +478,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addJs) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processadd", NULL, 158, &_0, &path, isLocal, &_1, &attributes, &version, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processadd", NULL, 164, &_0, &path, isLocal, &_1, &attributes, &version, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -746,7 +746,7 @@ PHP_METHOD(Phalcon_Assets_Collection, has) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(asset, zephir_get_internal_ce(SL("phalcon\\assets\\assetinterface"))) + Z_PARAM_OBJECT_OF_CLASS(asset, phalcon_assets_assetinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1183,7 +1183,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addAsset) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(asset, zephir_get_internal_ce(SL("phalcon\\assets\\assetinterface"))) + Z_PARAM_OBJECT_OF_CLASS(asset, phalcon_assets_assetinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1286,7 +1286,7 @@ 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, 160, &attributes); + ZEPHIR_CALL_METHOD(&attrs, this_ptr, "processattributes", NULL, 166, &attributes); zephir_check_call_status(); if (Z_TYPE_P(isLocal) != IS_NULL) { ZEPHIR_INIT_NVAR(&flag); @@ -1375,7 +1375,7 @@ 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, 160, &attributes); + ZEPHIR_CALL_METHOD(&attrs, this_ptr, "processattributes", NULL, 166, &attributes); zephir_check_call_status(); ZEPHIR_INIT_VAR(&asset); zephir_fetch_safe_class(&_1, &name); diff --git a/ext/phalcon/assets/manager.zep.c b/ext/phalcon/assets/manager.zep.c index b67eeaa778..95e6059f69 100644 --- a/ext/phalcon/assets/manager.zep.c +++ b/ext/phalcon/assets/manager.zep.c @@ -78,7 +78,7 @@ PHP_METHOD(Phalcon_Assets_Manager, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(tagFactory, zephir_get_internal_ce(SL("phalcon\\html\\tagfactory"))) + Z_PARAM_OBJECT_OF_CLASS(tagFactory, phalcon_html_tagfactory_ce) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); @@ -117,7 +117,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addAsset) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(asset, zephir_get_internal_ce(SL("phalcon\\assets\\asset"))) + Z_PARAM_OBJECT_OF_CLASS(asset, phalcon_assets_asset_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -154,7 +154,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addAssetByType) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(type) - Z_PARAM_OBJECT_OF_CLASS(asset, zephir_get_internal_ce(SL("phalcon\\assets\\asset"))) + Z_PARAM_OBJECT_OF_CLASS(asset, phalcon_assets_asset_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -172,7 +172,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addAssetByType) } - ZEPHIR_CALL_METHOD(&collection, this_ptr, "checkandcreatecollection", NULL, 161, &type); + ZEPHIR_CALL_METHOD(&collection, this_ptr, "checkandcreatecollection", NULL, 167, &type); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &collection, "add", NULL, 0, asset); zephir_check_call_status(); @@ -277,7 +277,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addCss) } else { ZVAL_BOOL(&_3, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 162, &path, &_1, &_2, &attributes, &version, &_3); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 168, &path, &_1, &_2, &attributes, &version, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); ZVAL_STRING(&_4, "css"); @@ -303,7 +303,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addInlineCode) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(code, zephir_get_internal_ce(SL("phalcon\\assets\\inline"))) + Z_PARAM_OBJECT_OF_CLASS(code, phalcon_assets_inline_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -340,7 +340,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addInlineCodeByType) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(type) - Z_PARAM_OBJECT_OF_CLASS(code, zephir_get_internal_ce(SL("phalcon\\assets\\inline"))) + Z_PARAM_OBJECT_OF_CLASS(code, phalcon_assets_inline_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -358,7 +358,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addInlineCodeByType) } - ZEPHIR_CALL_METHOD(&collection, this_ptr, "checkandcreatecollection", NULL, 161, &type); + ZEPHIR_CALL_METHOD(&collection, this_ptr, "checkandcreatecollection", NULL, 167, &type); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &collection, "addinline", NULL, 0, code); zephir_check_call_status(); @@ -421,7 +421,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addInlineCss) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 163, &content, &_1, &attributes); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 169, &content, &_1, &attributes); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "css"); @@ -486,7 +486,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addInlineJs) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 164, &content, &_1, &attributes); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 170, &content, &_1, &attributes); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "js"); @@ -598,7 +598,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addJs) } else { ZVAL_BOOL(&_3, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 165, &path, &_1, &_2, &attributes, &version, &_3); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 171, &path, &_1, &_2, &attributes, &version, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); ZVAL_STRING(&_4, "js"); @@ -634,7 +634,7 @@ PHP_METHOD(Phalcon_Assets_Manager, collection) zephir_get_strval(&name, name_param); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 161, &name); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 167, &name); zephir_check_call_status(); RETURN_MM(); } @@ -858,7 +858,7 @@ PHP_METHOD(Phalcon_Assets_Manager, getCss) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "css"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 161, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 167, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -882,7 +882,7 @@ PHP_METHOD(Phalcon_Assets_Manager, getJs) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "js"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 161, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 167, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -1048,7 +1048,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(collection, zephir_get_internal_ce(SL("phalcon\\assets\\collection"))) + Z_PARAM_OBJECT_OF_CLASS(collection, phalcon_assets_collection_ce) Z_PARAM_STR(type) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1132,7 +1132,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_FUNCTION(&_5$$8, "is_dir", NULL, 127, &completeTargetPath); + ZEPHIR_CALL_FUNCTION(&_5$$8, "is_dir", NULL, 133, &completeTargetPath); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_5$$8)) { ZEPHIR_INIT_VAR(&_6$$10); @@ -1221,13 +1221,13 @@ 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, 166, collection, &_20$$21, &_21$$21); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 172, 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, 167, &callback, &_23$$21, &prefixedPath, &_24$$21); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 173, &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)) { @@ -1304,12 +1304,12 @@ 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, 166, collection, &_30$$36, &_31$$36); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 172, 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, 167, &callback, &_32$$36, &prefixedPath, &_34$$36); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 173, &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)) { @@ -1398,13 +1398,13 @@ 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, 166, collection, &_45$$49, &_46$$49); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 172, 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, 167, &callback, &_47$$49, &prefixedPath, &_48$$49); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 173, &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)) { @@ -1481,12 +1481,12 @@ 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, 166, collection, &_53$$64, &_54$$64); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 172, 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, 167, &callback, &_55$$64, &prefixedPath, &_56$$64); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 173, &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)) { @@ -1508,13 +1508,13 @@ 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, 166, collection, &_58$$67, &completeTargetPath); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 172, 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, 167, &callback, &_59$$67, &prefixedPath, &_60$$67); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 173, &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)) { @@ -1631,7 +1631,7 @@ PHP_METHOD(Phalcon_Assets_Manager, outputInline) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(collection, zephir_get_internal_ce(SL("phalcon\\assets\\collection"))) + Z_PARAM_OBJECT_OF_CLASS(collection, phalcon_assets_collection_ce) Z_PARAM_ZVAL(type) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1974,7 +1974,7 @@ PHP_METHOD(Phalcon_Assets_Manager, set) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(name) - Z_PARAM_OBJECT_OF_CLASS(collection, zephir_get_internal_ce(SL("phalcon\\assets\\collection"))) + Z_PARAM_OBJECT_OF_CLASS(collection, phalcon_assets_collection_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2091,7 +2091,7 @@ PHP_METHOD(Phalcon_Assets_Manager, calculatePrefixedPath) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(3, 3) - Z_PARAM_OBJECT_OF_CLASS(collection, zephir_get_internal_ce(SL("phalcon\\assets\\collection"))) + Z_PARAM_OBJECT_OF_CLASS(collection, phalcon_assets_collection_ce) Z_PARAM_STR(path) Z_PARAM_STR(filePath) ZEND_PARSE_PARAMETERS_END(); @@ -2240,7 +2240,7 @@ 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, 168, parameters, &_0, &_1, &_2, &_3); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processparameters", NULL, 174, parameters, &_0, &_1, &_2, &_3); zephir_check_call_status(); RETURN_MM(); } @@ -2361,7 +2361,7 @@ 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, 168, parameters, &_0, &_1, &_2, &_3); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processparameters", NULL, 174, parameters, &_0, &_1, &_2, &_3); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/autoload/loader.zep.c b/ext/phalcon/autoload/loader.zep.c index 32a4425210..473a0f4b91 100644 --- a/ext/phalcon/autoload/loader.zep.c +++ b/ext/phalcon/autoload/loader.zep.c @@ -357,7 +357,7 @@ 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, 169, directories, &dirSeparator); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkdirectories", NULL, 175, 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); @@ -382,7 +382,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, addNamespace) } ZEPHIR_INIT_VAR(&_7); zephir_fast_array_merge(&_7, &source, &target); - ZEPHIR_CALL_FUNCTION(&_2, "array_unique", NULL, 170, &_7); + ZEPHIR_CALL_FUNCTION(&_2, "array_unique", NULL, 176, &_7); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("namespaces"), &nsName, &_2); RETURN_THIS(); @@ -433,40 +433,40 @@ 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, 171, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 177, &_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, 172, &className); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "autoloadcheckclasses", NULL, 178, &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, 171, &_4); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 177, &_4); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_5, this_ptr, "autoloadchecknamespaces", NULL, 173, &className); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "autoloadchecknamespaces", NULL, 179, &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, 171, &_6); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 177, &_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, 174, &_8, &className, &_9); + ZEPHIR_CALL_METHOD(&_7, this_ptr, "autoloadcheckdirectories", NULL, 180, &_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, 171, &_10); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 177, &_10); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "loader:afterCheckClass"); @@ -713,7 +713,7 @@ 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, 175, &_1$$3, &__$true, &_3$$3); + ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_register", NULL, 181, &_1$$3, &__$true, &_3$$3); zephir_check_call_status(); if (1) { zephir_update_property_zval(this_ptr, ZEND_STRL("isRegistered"), &__$true); @@ -863,7 +863,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, setDirectories) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 176, &directories, &_0, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 182, &directories, &_0, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -1069,7 +1069,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, setFiles) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 176, &files, &_0, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 182, &files, &_0, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -1141,7 +1141,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, setNamespaces) } ZEPHIR_INIT_NVAR(&directories); ZVAL_COPY(&directories, _1); - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "checkdirectories", &_6, 169, &directories, &dirSeparator); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "checkdirectories", &_6, 175, &directories, &dirSeparator); zephir_check_call_status(); ZEPHIR_CPY_WRT(&directories, &_5$$4); ZEPHIR_CALL_METHOD(NULL, this_ptr, "addnamespace", &_7, 0, &name, &directories); @@ -1160,7 +1160,7 @@ 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, 169, &directories, &dirSeparator); + ZEPHIR_CALL_METHOD(&_8$$5, this_ptr, "checkdirectories", &_6, 175, &directories, &dirSeparator); zephir_check_call_status(); ZEPHIR_CPY_WRT(&directories, &_8$$5); ZEPHIR_CALL_METHOD(NULL, this_ptr, "addnamespace", &_7, 0, &name, &directories); @@ -1204,7 +1204,7 @@ 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, 177, &_1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_unregister", NULL, 183, &_1$$3); zephir_check_call_status(); if (0) { zephir_update_property_zval(this_ptr, ZEND_STRL("isRegistered"), &__$true); @@ -1250,7 +1250,7 @@ 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, 178, &_0, &file); + ZEPHIR_CALL_FUNCTION(&_1, "call_user_func", NULL, 184, &_0, &file); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&_1)) { ZEPHIR_INIT_VAR(&_2$$3); @@ -1259,7 +1259,7 @@ 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, 171, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 177, &_3$$3); zephir_check_call_status(); if (zephir_require_once_zval(&file) == FAILURE) { RETURN_MM_NULL(); @@ -1268,7 +1268,7 @@ 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, 171, &_4); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 177, &_4); zephir_check_call_status(); RETURN_MM_BOOL(0); } @@ -1441,7 +1441,7 @@ 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, 171, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 177, &_3$$3); zephir_check_call_status(); RETURN_MM_BOOL(1); } @@ -1556,7 +1556,7 @@ 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, 171, &_11$$6); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 177, &_11$$6); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -1586,7 +1586,7 @@ 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, 171, &_15$$9); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 177, &_15$$9); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -1631,7 +1631,7 @@ 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, 171, &_21$$13); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 177, &_21$$13); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -1661,7 +1661,7 @@ 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, 171, &_24$$16); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 177, &_24$$16); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -1758,13 +1758,13 @@ 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, 174, &directories, &fileName); + ZEPHIR_CALL_METHOD(&_8$$3, this_ptr, "autoloadcheckdirectories", &_9, 180, &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, 171, &_11$$5); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 177, &_11$$5); zephir_check_call_status(); RETURN_MM_BOOL(1); } @@ -1793,13 +1793,13 @@ 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, 174, &directories, &fileName); + ZEPHIR_CALL_METHOD(&_16$$6, this_ptr, "autoloadcheckdirectories", &_9, 180, &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, 171, &_18$$8); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 177, &_18$$8); zephir_check_call_status(); RETURN_MM_BOOL(1); } diff --git a/ext/phalcon/cache/abstractcache.zep.c b/ext/phalcon/cache/abstractcache.zep.c index 0a440d3206..341181f32d 100644 --- a/ext/phalcon/cache/abstractcache.zep.c +++ b/ext/phalcon/cache/abstractcache.zep.c @@ -60,7 +60,7 @@ PHP_METHOD(Phalcon_Cache_AbstractCache, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(adapter, zephir_get_internal_ce(SL("phalcon\\cache\\adapter\\adapterinterface"))) + Z_PARAM_OBJECT_OF_CLASS(adapter, phalcon_cache_adapter_adapterinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/cache/adapter/weak.zep.c b/ext/phalcon/cache/adapter/weak.zep.c new file mode 100644 index 0000000000..7136dc652a --- /dev/null +++ b/ext/phalcon/cache/adapter/weak.zep.c @@ -0,0 +1,35 @@ + +#ifdef HAVE_CONFIG_H +#include "../../../ext_config.h" +#endif + +#include +#include "../../../php_ext.h" +#include "../../../ext.h" + +#include +#include +#include + +#include "kernel/main.h" + + +/** + * 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. + */ +/** +* WeakCache implementation based on WeakReference +*/ +ZEPHIR_INIT_CLASS(Phalcon_Cache_Adapter_Weak) +{ + ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Cache\\Adapter, Weak, phalcon, cache_adapter_weak, phalcon_storage_adapter_weak_ce, NULL, 0); + + zend_class_implements(phalcon_cache_adapter_weak_ce, 1, phalcon_cache_adapter_adapterinterface_ce); + return SUCCESS; +} + diff --git a/ext/phalcon/cache/adapter/weak.zep.h b/ext/phalcon/cache/adapter/weak.zep.h new file mode 100644 index 0000000000..d4e5dd4a0b --- /dev/null +++ b/ext/phalcon/cache/adapter/weak.zep.h @@ -0,0 +1,5 @@ + +extern zend_class_entry *phalcon_cache_adapter_weak_ce; + +ZEPHIR_INIT_CLASS(Phalcon_Cache_Adapter_Weak); + diff --git a/ext/phalcon/cache/adapterfactory.zep.c b/ext/phalcon/cache/adapterfactory.zep.c index 2e0845b24b..0f5e02cb41 100644 --- a/ext/phalcon/cache/adapterfactory.zep.c +++ b/ext/phalcon/cache/adapterfactory.zep.c @@ -62,7 +62,7 @@ PHP_METHOD(Phalcon_Cache_AdapterFactory, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\storage\\serializerfactory"))) + Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_storage_serializerfactory_ce) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(services) ZEND_PARSE_PARAMETERS_END(); @@ -192,12 +192,13 @@ PHP_METHOD(Phalcon_Cache_AdapterFactory, getServices) - zephir_create_array(return_value, 5, 0); + zephir_create_array(return_value, 6, 0); add_assoc_stringl_ex(return_value, SL("apcu"), SL("Phalcon\\Cache\\Adapter\\Apcu")); add_assoc_stringl_ex(return_value, SL("libmemcached"), SL("Phalcon\\Cache\\Adapter\\Libmemcached")); add_assoc_stringl_ex(return_value, SL("memory"), SL("Phalcon\\Cache\\Adapter\\Memory")); add_assoc_stringl_ex(return_value, SL("redis"), SL("Phalcon\\Cache\\Adapter\\Redis")); add_assoc_stringl_ex(return_value, SL("stream"), SL("Phalcon\\Cache\\Adapter\\Stream")); + add_assoc_stringl_ex(return_value, SL("weak"), SL("Phalcon\\Cache\\Adapter\\Weak")); return; } diff --git a/ext/phalcon/cache/cachefactory.zep.c b/ext/phalcon/cache/cachefactory.zep.c index b07609c8f2..9d3ade37f6 100644 --- a/ext/phalcon/cache/cachefactory.zep.c +++ b/ext/phalcon/cache/cachefactory.zep.c @@ -55,7 +55,7 @@ PHP_METHOD(Phalcon_Cache_CacheFactory, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\cache\\adapterfactory"))) + Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_cache_adapterfactory_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -215,7 +215,7 @@ 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, 179, &adapter); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 185, &adapter); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/cli/console.zep.c b/ext/phalcon/cli/console.zep.c index 61c72a02aa..115a01b52f 100644 --- a/ext/phalcon/cli/console.zep.c +++ b/ext/phalcon/cli/console.zep.c @@ -425,7 +425,7 @@ 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, 180, &arg, &_3$$5, &_4$$5); + ZEPHIR_CALL_FUNCTION(&_5$$5, "strncmp", &_6, 186, &arg, &_3$$5, &_4$$5); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_5$$5, 0)) { ZEPHIR_INIT_NVAR(&_7$$6); @@ -457,7 +457,7 @@ 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, 180, &arg, &_18$$9, &_19$$9); + ZEPHIR_CALL_FUNCTION(&_20$$9, "strncmp", &_6, 186, &arg, &_18$$9, &_19$$9); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_20$$9, 0)) { ZVAL_LONG(&_21$$10, 1); @@ -487,7 +487,7 @@ 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, 180, &arg, &_23$$14, &_24$$14); + ZEPHIR_CALL_FUNCTION(&_25$$14, "strncmp", &_6, 186, &arg, &_23$$14, &_24$$14); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_25$$14, 0)) { ZEPHIR_INIT_NVAR(&_26$$15); @@ -519,7 +519,7 @@ 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, 180, &arg, &_37$$18, &_38$$18); + ZEPHIR_CALL_FUNCTION(&_39$$18, "strncmp", &_6, 186, &arg, &_37$$18, &_38$$18); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_39$$18, 0)) { ZVAL_LONG(&_40$$19, 1); diff --git a/ext/phalcon/cli/router.zep.c b/ext/phalcon/cli/router.zep.c index 6746b71d4b..32be41145e 100644 --- a/ext/phalcon/cli/router.zep.c +++ b/ext/phalcon/cli/router.zep.c @@ -153,7 +153,7 @@ 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, 181, &_2$$3, &_1$$3); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 187, &_2$$3, &_1$$3); zephir_check_call_status(); zephir_array_append(&routes, &_0$$3, PH_SEPARATE, "phalcon/Cli/Router.zep", 119); ZEPHIR_INIT_NVAR(&_2$$3); @@ -165,7 +165,7 @@ 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, 181, &_4$$3, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 187, &_4$$3, &_3$$3); zephir_check_call_status(); zephir_array_append(&routes, &_2$$3, PH_SEPARATE, "phalcon/Cli/Router.zep", 128); } @@ -223,7 +223,7 @@ 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, 181, &pattern, paths); + ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 187, &pattern, paths); zephir_check_call_status(); zephir_update_property_array_append(this_ptr, SL("routes"), &route); RETURN_CCTOR(&route); diff --git a/ext/phalcon/cli/task.zep.c b/ext/phalcon/cli/task.zep.c index ba9b15198c..366803c071 100644 --- a/ext/phalcon/cli/task.zep.c +++ b/ext/phalcon/cli/task.zep.c @@ -106,7 +106,7 @@ PHP_METHOD(Phalcon_Cli_Task, setEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/config/adapter/grouped.zep.c b/ext/phalcon/config/adapter/grouped.zep.c index f7ca35413a..2b8fa3a3e1 100644 --- a/ext/phalcon/config/adapter/grouped.zep.c +++ b/ext/phalcon/config/adapter/grouped.zep.c @@ -185,9 +185,9 @@ 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, 182); + ZEPHIR_CALL_METHOD(NULL, &_7$$6, "__construct", &_8, 188); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_9$$6, &_7$$6, "load", &_10, 183, &configName); + ZEPHIR_CALL_METHOD(&_9$$6, &_7$$6, "load", &_10, 189, &configName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "merge", &_5, 0, &_9$$6); zephir_check_call_status(); @@ -226,9 +226,9 @@ PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) } else { ZEPHIR_INIT_NVAR(&_19$$10); object_init_ex(&_19$$10, phalcon_config_configfactory_ce); - ZEPHIR_CALL_METHOD(NULL, &_19$$10, "__construct", &_8, 182); + ZEPHIR_CALL_METHOD(NULL, &_19$$10, "__construct", &_8, 188); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_20$$10, &_19$$10, "load", &_10, 183, &configInstance); + ZEPHIR_CALL_METHOD(&_20$$10, &_19$$10, "load", &_10, 189, &configInstance); zephir_check_call_status(); ZEPHIR_CPY_WRT(&configInstance, &_20$$10); } @@ -261,9 +261,9 @@ PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) if (ZEPHIR_IS_IDENTICAL(&_22$$13, &defaultAdapter)) { ZEPHIR_INIT_NVAR(&_23$$14); object_init_ex(&_23$$14, phalcon_config_configfactory_ce); - ZEPHIR_CALL_METHOD(NULL, &_23$$14, "__construct", &_8, 182); + ZEPHIR_CALL_METHOD(NULL, &_23$$14, "__construct", &_8, 188); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_24$$14, &_23$$14, "load", &_10, 183, &configName); + ZEPHIR_CALL_METHOD(&_24$$14, &_23$$14, "load", &_10, 189, &configName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "merge", &_5, 0, &_24$$14); zephir_check_call_status(); @@ -302,9 +302,9 @@ PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) } else { ZEPHIR_INIT_NVAR(&_31$$18); object_init_ex(&_31$$18, phalcon_config_configfactory_ce); - ZEPHIR_CALL_METHOD(NULL, &_31$$18, "__construct", &_8, 182); + ZEPHIR_CALL_METHOD(NULL, &_31$$18, "__construct", &_8, 188); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_32$$18, &_31$$18, "load", &_10, 183, &configInstance); + ZEPHIR_CALL_METHOD(&_32$$18, &_31$$18, "load", &_10, 189, &configInstance); zephir_check_call_status(); ZEPHIR_CPY_WRT(&configInstance, &_32$$18); } diff --git a/ext/phalcon/config/adapter/ini.zep.c b/ext/phalcon/config/adapter/ini.zep.c index 56e3ebae0b..81948cffe8 100644 --- a/ext/phalcon/config/adapter/ini.zep.c +++ b/ext/phalcon/config/adapter/ini.zep.c @@ -542,7 +542,7 @@ 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, 184, &path, &castValue); + ZEPHIR_CALL_METHOD(&result, this_ptr, "parseinistring", NULL, 190, &path, &castValue); zephir_check_call_status(); zephir_create_array(return_value, 1, 0); zephir_array_update_zval(return_value, &key, &result, PH_COPY); @@ -592,7 +592,7 @@ 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, 185, &filename, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("parse_ini_file", NULL, 191, &filename, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/config/adapter/json.zep.c b/ext/phalcon/config/adapter/json.zep.c index c185c2958c..583e5e3f7d 100644 --- a/ext/phalcon/config/adapter/json.zep.c +++ b/ext/phalcon/config/adapter/json.zep.c @@ -19,8 +19,6 @@ #include "kernel/exception.h" #include "kernel/operators.h" #include "kernel/object.h" -#include "kernel/string.h" -#include "kernel/concat.h" /** @@ -66,7 +64,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Json, __construct) zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zephir_fcall_cache_entry *_0 = NULL; - zval *filePath_param = NULL, _1, _2, _3; + zval *filePath_param = NULL, _1, _2, _3, _4; zval filePath; zval *this_ptr = getThis(); @@ -74,6 +72,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Json, __construct) 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) @@ -95,97 +94,20 @@ 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, 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(); - ZEPHIR_MM_RESTORE(); -} - -/** - * @todo This will be removed when traits are introduced - */ -PHP_METHOD(Phalcon_Config_Adapter_Json, decode) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long depth, options, ZEPHIR_LAST_CALL_STATUS; - zend_bool associative; - zval *data_param = NULL, *associative_param = NULL, *depth_param = NULL, *options_param = NULL, decoded, _0, _1, _2, _3, _4$$3, _5$$3, _6$$3; - zval data; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&data); - ZVAL_UNDEF(&decoded); - 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, 4) - Z_PARAM_STR(data) - Z_PARAM_OPTIONAL - Z_PARAM_BOOL(associative) - Z_PARAM_LONG(depth) - Z_PARAM_LONG(options) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 3, &data_param, &associative_param, &depth_param, &options_param); - if (UNEXPECTED(Z_TYPE_P(data_param) != IS_STRING && Z_TYPE_P(data_param) != IS_NULL)) { - zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'data' must be of the type string")); - RETURN_MM_NULL(); - } - if (EXPECTED(Z_TYPE_P(data_param) == IS_STRING)) { - zephir_get_strval(&data, data_param); - } else { - ZEPHIR_INIT_VAR(&data); - } - if (!associative_param) { - associative = 0; - } else { - associative = zephir_get_boolval(associative_param); - } - if (!depth_param) { - depth = 512; - } else { - depth = zephir_get_intval(depth_param); - } - if (!options_param) { - options = 0; - } else { - options = zephir_get_intval(options_param); + ZEPHIR_INIT_VAR(&_1); + object_init_ex(&_1, phalcon_support_helper_json_decode_ce); + if (zephir_has_constructor(&_1)) { + ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 0); + zephir_check_call_status(); } - - ZVAL_BOOL(&_0, (associative ? 1 : 0)); - ZVAL_LONG(&_1, depth); - 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, 187); + ZEPHIR_INIT_VAR(&_3); + zephir_file_get_contents(&_3, &filePath); + ZVAL_BOOL(&_4, 1); + ZEPHIR_CALL_METHOD(&_2, &_1, "__invoke", NULL, 192, &_3, &_4); 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, 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, 189, &_6$$3); - zephir_check_call_status(); - zephir_throw_exception_debug(&_4$$3, "phalcon/Config/Adapter/Json.zep", 68); - ZEPHIR_MM_RESTORE(); - return; - } - RETURN_CCTOR(&decoded); + ZEPHIR_CALL_PARENT(NULL, phalcon_config_adapter_json_ce, getThis(), "__construct", &_0, 0, &_2); + zephir_check_call_status(); + ZEPHIR_MM_RESTORE(); } diff --git a/ext/phalcon/config/adapter/json.zep.h b/ext/phalcon/config/adapter/json.zep.h index bfdcca5299..40f0ef22f0 100644 --- a/ext/phalcon/config/adapter/json.zep.h +++ b/ext/phalcon/config/adapter/json.zep.h @@ -4,21 +4,12 @@ extern zend_class_entry *phalcon_config_adapter_json_ce; ZEPHIR_INIT_CLASS(Phalcon_Config_Adapter_Json); PHP_METHOD(Phalcon_Config_Adapter_Json, __construct); -PHP_METHOD(Phalcon_Config_Adapter_Json, decode); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_config_adapter_json___construct, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, filePath, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_config_adapter_json_decode, 0, 0, 1) - ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, associative, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, depth, IS_LONG, 0) - ZEND_ARG_TYPE_INFO(0, options, IS_LONG, 0) -ZEND_END_ARG_INFO() - ZEPHIR_INIT_FUNCS(phalcon_config_adapter_json_method_entry) { PHP_ME(Phalcon_Config_Adapter_Json, __construct, arginfo_phalcon_config_adapter_json___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) - PHP_ME(Phalcon_Config_Adapter_Json, decode, arginfo_phalcon_config_adapter_json_decode, ZEND_ACC_PRIVATE) PHP_FE_END }; diff --git a/ext/phalcon/config/adapter/yaml.zep.c b/ext/phalcon/config/adapter/yaml.zep.c index ea76df564d..b89a338219 100644 --- a/ext/phalcon/config/adapter/yaml.zep.c +++ b/ext/phalcon/config/adapter/yaml.zep.c @@ -207,7 +207,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Yaml, phpYamlParseFile) ZEPHIR_MAKE_REF(ndocs); - ZEPHIR_RETURN_CALL_FUNCTION("yaml_parse_file", NULL, 190, filename, pos, ndocs, callbacks); + ZEPHIR_RETURN_CALL_FUNCTION("yaml_parse_file", NULL, 193, filename, pos, ndocs, callbacks); ZEPHIR_UNREF(ndocs); zephir_check_call_status(); RETURN_MM(); @@ -235,7 +235,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Yaml, phpExtensionLoaded) zephir_get_strval(&name, name_param); - ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 191, &name); + ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 194, &name); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/config/configfactory.zep.c b/ext/phalcon/config/configfactory.zep.c index 29efffb351..60e49170ac 100644 --- a/ext/phalcon/config/configfactory.zep.c +++ b/ext/phalcon/config/configfactory.zep.c @@ -335,7 +335,7 @@ 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, 192, config); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkconfigarray", NULL, 195, config); zephir_check_call_status(); RETVAL_ZVAL(config, 1, 0); RETURN_MM(); diff --git a/ext/phalcon/datamapper/pdo/connection.zep.c b/ext/phalcon/datamapper/pdo/connection.zep.c index 9addcc5ccf..2ea11e7202 100644 --- a/ext/phalcon/datamapper/pdo/connection.zep.c +++ b/ext/phalcon/datamapper/pdo/connection.zep.c @@ -101,7 +101,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Connection, __construct) Z_PARAM_STR_OR_NULL(password) Z_PARAM_ARRAY(options) Z_PARAM_ARRAY(queries) - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(profiler, zephir_get_internal_ce(SL("phalcon\\datamapper\\pdo\\profiler\\profilerinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(profiler, phalcon_datamapper_pdo_profiler_profilerinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -154,7 +154,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Connection, __construct) zephir_array_fetch_long(&_2$$3, &parts, 0, PH_NOISY | PH_READONLY, "phalcon/DataMapper/Pdo/Connection.zep", 67); ZEPHIR_INIT_VAR(&_3$$3); ZEPHIR_CONCAT_SVS(&_3$$3, "Driver not supported [", &_2$$3, "]"); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 189, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 196, &_3$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/DataMapper/Pdo/Connection.zep", 68); ZEPHIR_MM_RESTORE(); @@ -176,7 +176,7 @@ 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, 193); + ZEPHIR_CALL_METHOD(NULL, profiler, "__construct", NULL, 197); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, this_ptr, "setprofiler", NULL, 0, profiler); diff --git a/ext/phalcon/datamapper/pdo/connection/abstractconnection.zep.c b/ext/phalcon/datamapper/pdo/connection/abstractconnection.zep.c index b691a5040c..77f9e611c0 100644 --- a/ext/phalcon/datamapper/pdo/connection/abstractconnection.zep.c +++ b/ext/phalcon/datamapper/pdo/connection/abstractconnection.zep.c @@ -1692,7 +1692,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Connection_AbstractConnection, setProfiler) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(profiler, zephir_get_internal_ce(SL("phalcon\\datamapper\\pdo\\profiler\\profilerinterface"))) + Z_PARAM_OBJECT_OF_CLASS(profiler, phalcon_datamapper_pdo_profiler_profilerinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/datamapper/pdo/connection/decorated.zep.c b/ext/phalcon/datamapper/pdo/connection/decorated.zep.c index 45e4ed4a61..88f7063c71 100644 --- a/ext/phalcon/datamapper/pdo/connection/decorated.zep.c +++ b/ext/phalcon/datamapper/pdo/connection/decorated.zep.c @@ -69,7 +69,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Connection_Decorated, __construct) ZEND_PARSE_PARAMETERS_START(1, 2) Z_PARAM_OBJECT_OF_CLASS(pdo, php_pdo_get_dbh_ce()) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(profiler, zephir_get_internal_ce(SL("phalcon\\datamapper\\pdo\\profiler\\profilerinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(profiler, phalcon_datamapper_pdo_profiler_profilerinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -88,7 +88,7 @@ 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, 193); + ZEPHIR_CALL_METHOD(NULL, profiler, "__construct", NULL, 197); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, this_ptr, "setprofiler", NULL, 0, profiler); diff --git a/ext/phalcon/datamapper/pdo/connectionlocator.zep.c b/ext/phalcon/datamapper/pdo/connectionlocator.zep.c index 4bccb51a11..c057e02cdc 100644 --- a/ext/phalcon/datamapper/pdo/connectionlocator.zep.c +++ b/ext/phalcon/datamapper/pdo/connectionlocator.zep.c @@ -99,7 +99,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_ConnectionLocator, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 3) - Z_PARAM_OBJECT_OF_CLASS(master, zephir_get_internal_ce(SL("phalcon\\datamapper\\pdo\\connection\\connectioninterface"))) + Z_PARAM_OBJECT_OF_CLASS(master, phalcon_datamapper_pdo_connection_connectioninterface_ce) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(read) Z_PARAM_ARRAY(write) @@ -322,7 +322,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_ConnectionLocator, setMaster) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(callableObject, zephir_get_internal_ce(SL("phalcon\\datamapper\\pdo\\connection\\connectioninterface"))) + Z_PARAM_OBJECT_OF_CLASS(callableObject, phalcon_datamapper_pdo_connection_connectioninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -468,7 +468,7 @@ 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, 194, &collection); + ZEPHIR_CALL_FUNCTION(&requested, "array_rand", NULL, 198, &collection); zephir_check_call_status(); } if (!(zephir_array_isset(&collection, &requested))) { diff --git a/ext/phalcon/datamapper/pdo/profiler/profiler.zep.c b/ext/phalcon/datamapper/pdo/profiler/profiler.zep.c index 2e3ba5e426..a47d4dc6da 100644 --- a/ext/phalcon/datamapper/pdo/profiler/profiler.zep.c +++ b/ext/phalcon/datamapper/pdo/profiler/profiler.zep.c @@ -17,10 +17,6 @@ #include "kernel/fcall.h" #include "kernel/object.h" #include "kernel/array.h" -#include "kernel/string.h" -#include "kernel/exception.h" -#include "ext/spl/spl_exceptions.h" -#include "kernel/concat.h" /** @@ -63,6 +59,10 @@ ZEPHIR_INIT_CLASS(Phalcon_DataMapper_Pdo_Profiler_Profiler) * @var LoggerInterface */ zend_declare_property_null(phalcon_datamapper_pdo_profiler_profiler_ce, SL("logger"), ZEND_ACC_PROTECTED); + /** + * @var Encode + */ + zend_declare_property_null(phalcon_datamapper_pdo_profiler_profiler_ce, SL("encode"), ZEND_ACC_PRIVATE); phalcon_datamapper_pdo_profiler_profiler_ce->create_object = zephir_init_properties_Phalcon_DataMapper_Pdo_Profiler_Profiler; zend_class_implements(phalcon_datamapper_pdo_profiler_profiler_ce, 1, phalcon_datamapper_pdo_profiler_profilerinterface_ce); @@ -89,7 +89,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("phalcon\\logger\\loggerinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(logger, phalcon_logger_loggerinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -121,6 +121,14 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, __construct) 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_INIT_NVAR(&_0); + object_init_ex(&_0, phalcon_support_helper_json_encode_ce); + if (zephir_has_constructor(&_0)) { + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 0); + zephir_check_call_status(); + } + + zephir_update_property_zval(this_ptr, ZEND_STRL("encode"), &_0); ZEPHIR_MM_RESTORE(); } @@ -135,7 +143,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, finish) zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval values; - zval *statement_param = NULL, *values_param = NULL, __$true, ex, finish, _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; + zval *statement_param = NULL, *values_param = NULL, __$true, ex, finish, _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; zval statement; zval *this_ptr = getThis(); @@ -158,6 +166,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, finish) ZVAL_UNDEF(&_12$$3); ZVAL_UNDEF(&_13$$3); ZVAL_UNDEF(&_14$$3); + ZVAL_UNDEF(&_15$$3); ZVAL_UNDEF(&values); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; @@ -190,15 +199,15 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, finish) object_init_ex(&ex, phalcon_datamapper_pdo_exception_exception_ce); ZEPHIR_CALL_METHOD(NULL, &ex, "__construct", NULL, 29); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&finish, "hrtime", NULL, 195, &__$true); + ZEPHIR_CALL_FUNCTION(&finish, "hrtime", NULL, 199, &__$true); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, &ex, "gettraceasstring", NULL, 196); + ZEPHIR_CALL_METHOD(&_1$$3, &ex, "gettraceasstring", NULL, 200); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "backtrace"); zephir_update_property_array(this_ptr, SL("context"), &_2$$3, &_1$$3); zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("context"), PH_NOISY_CC | PH_READONLY); - zephir_array_fetch_string(&_4$$3, &_3$$3, SL("start"), PH_NOISY | PH_READONLY, "phalcon/DataMapper/Pdo/Profiler/Profiler.zep", 85); + zephir_array_fetch_string(&_4$$3, &_3$$3, SL("start"), PH_NOISY | PH_READONLY, "phalcon/DataMapper/Pdo/Profiler/Profiler.zep", 91); ZEPHIR_INIT_VAR(&_5$$3); zephir_sub_function(&_5$$3, &finish, &_4$$3); ZEPHIR_INIT_VAR(&_6$$3); @@ -215,21 +224,22 @@ 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, 197, &values); + zephir_read_property(&_9$$3, this_ptr, ZEND_STRL("encode"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(&_5$$3, &_9$$3, "__invoke", NULL, 0, &values); zephir_check_call_status(); } - ZEPHIR_INIT_VAR(&_9$$3); - ZVAL_STRING(&_9$$3, "values"); - zephir_update_property_array(this_ptr, SL("context"), &_9$$3, &_5$$3); - zephir_read_property(&_10$$3, this_ptr, ZEND_STRL("logger"), PH_NOISY_CC | PH_READONLY); - zephir_read_property(&_11$$3, this_ptr, ZEND_STRL("logLevel"), PH_NOISY_CC | PH_READONLY); - zephir_read_property(&_12$$3, this_ptr, ZEND_STRL("logFormat"), PH_NOISY_CC | PH_READONLY); - zephir_read_property(&_13$$3, this_ptr, ZEND_STRL("context"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, &_10$$3, "log", NULL, 0, &_11$$3, &_12$$3, &_13$$3); + ZEPHIR_INIT_VAR(&_10$$3); + ZVAL_STRING(&_10$$3, "values"); + zephir_update_property_array(this_ptr, SL("context"), &_10$$3, &_5$$3); + zephir_read_property(&_11$$3, this_ptr, ZEND_STRL("logger"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_12$$3, this_ptr, ZEND_STRL("logLevel"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_13$$3, this_ptr, ZEND_STRL("logFormat"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_14$$3, this_ptr, ZEND_STRL("context"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(NULL, &_11$$3, "log", NULL, 0, &_12$$3, &_13$$3, &_14$$3); zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_14$$3); - array_init(&_14$$3); - zephir_update_property_zval(this_ptr, ZEND_STRL("context"), &_14$$3); + ZEPHIR_INIT_VAR(&_15$$3); + array_init(&_15$$3); + zephir_update_property_zval(this_ptr, ZEND_STRL("context"), &_15$$3); } ZEPHIR_MM_RESTORE(); } @@ -426,7 +436,7 @@ 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, 195, &__$true); + ZEPHIR_CALL_FUNCTION(&_2$$3, "hrtime", NULL, 199, &__$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); @@ -434,71 +444,6 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, start) ZEPHIR_MM_RESTORE(); } -/** - * @todo This will be removed when traits are introduced - */ -PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, 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, 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, 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(&_3$$3, "phalcon/DataMapper/Pdo/Profiler/Profiler.zep", 209); - ZEPHIR_MM_RESTORE(); - return; - } - RETURN_CCTOR(&encoded); -} - zend_object *zephir_init_properties_Phalcon_DataMapper_Pdo_Profiler_Profiler(zend_class_entry *class_type) { zval _0, _1$$3; diff --git a/ext/phalcon/datamapper/pdo/profiler/profiler.zep.h b/ext/phalcon/datamapper/pdo/profiler/profiler.zep.h index b5a08fe8c9..6aaf038823 100644 --- a/ext/phalcon/datamapper/pdo/profiler/profiler.zep.h +++ b/ext/phalcon/datamapper/pdo/profiler/profiler.zep.h @@ -13,7 +13,6 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, setActive); PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, setLogFormat); PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, setLogLevel); PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, start); -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) @@ -59,12 +58,6 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_ ZEND_ARG_TYPE_INFO(0, method, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_profiler_encode, 0, 1, IS_STRING, 0) - ZEND_ARG_INFO(0, data) - ZEND_ARG_TYPE_INFO(0, options, IS_LONG, 0) - ZEND_ARG_TYPE_INFO(0, depth, IS_LONG, 0) -ZEND_END_ARG_INFO() - ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_datamapper_pdo_profiler_profiler_zephir_init_properties_phalcon_datamapper_pdo_profiler_profiler, 0, 0, 0) ZEND_END_ARG_INFO() @@ -79,6 +72,5 @@ ZEPHIR_INIT_FUNCS(phalcon_datamapper_pdo_profiler_profiler_method_entry) { PHP_ME(Phalcon_DataMapper_Pdo_Profiler_Profiler, setLogFormat, arginfo_phalcon_datamapper_pdo_profiler_profiler_setlogformat, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_DataMapper_Pdo_Profiler_Profiler, setLogLevel, arginfo_phalcon_datamapper_pdo_profiler_profiler_setloglevel, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_DataMapper_Pdo_Profiler_Profiler, start, arginfo_phalcon_datamapper_pdo_profiler_profiler_start, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_DataMapper_Pdo_Profiler_Profiler, encode, arginfo_phalcon_datamapper_pdo_profiler_profiler_encode, ZEND_ACC_PRIVATE) PHP_FE_END }; diff --git a/ext/phalcon/datamapper/query/abstractquery.zep.c b/ext/phalcon/datamapper/query/abstractquery.zep.c index 078868a389..e7bf6b1818 100644 --- a/ext/phalcon/datamapper/query/abstractquery.zep.c +++ b/ext/phalcon/datamapper/query/abstractquery.zep.c @@ -78,8 +78,8 @@ PHP_METHOD(Phalcon_DataMapper_Query_AbstractQuery, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\datamapper\\pdo\\connection"))) - Z_PARAM_OBJECT_OF_CLASS(bind, zephir_get_internal_ce(SL("phalcon\\datamapper\\query\\bind"))) + Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_datamapper_pdo_connection_ce) + Z_PARAM_OBJECT_OF_CLASS(bind, phalcon_datamapper_query_bind_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/datamapper/query/delete.zep.c b/ext/phalcon/datamapper/query/delete.zep.c index dc51f9f8f5..dacd970f91 100644 --- a/ext/phalcon/datamapper/query/delete.zep.c +++ b/ext/phalcon/datamapper/query/delete.zep.c @@ -66,8 +66,8 @@ PHP_METHOD(Phalcon_DataMapper_Query_Delete, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\datamapper\\pdo\\connection"))) - Z_PARAM_OBJECT_OF_CLASS(bind, zephir_get_internal_ce(SL("phalcon\\datamapper\\query\\bind"))) + Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_datamapper_pdo_connection_ce) + Z_PARAM_OBJECT_OF_CLASS(bind, phalcon_datamapper_query_bind_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/datamapper/query/insert.zep.c b/ext/phalcon/datamapper/query/insert.zep.c index 0667a66903..b9fde72bea 100644 --- a/ext/phalcon/datamapper/query/insert.zep.c +++ b/ext/phalcon/datamapper/query/insert.zep.c @@ -67,8 +67,8 @@ PHP_METHOD(Phalcon_DataMapper_Query_Insert, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\datamapper\\pdo\\connection"))) - Z_PARAM_OBJECT_OF_CLASS(bind, zephir_get_internal_ce(SL("phalcon\\datamapper\\query\\bind"))) + Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_datamapper_pdo_connection_ce) + Z_PARAM_OBJECT_OF_CLASS(bind, phalcon_datamapper_query_bind_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -333,7 +333,7 @@ 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, 198); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 201); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_4, this_ptr, "buildreturning", NULL, 0); zephir_check_call_status(); diff --git a/ext/phalcon/datamapper/query/queryfactory.zep.c b/ext/phalcon/datamapper/query/queryfactory.zep.c index a94191c361..cf5f4dc587 100644 --- a/ext/phalcon/datamapper/query/queryfactory.zep.c +++ b/ext/phalcon/datamapper/query/queryfactory.zep.c @@ -128,7 +128,7 @@ PHP_METHOD(Phalcon_DataMapper_Query_QueryFactory, newDelete) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\datamapper\\pdo\\connection"))) + Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_datamapper_pdo_connection_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -140,7 +140,7 @@ 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, 199, connection, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 202, connection, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -164,7 +164,7 @@ PHP_METHOD(Phalcon_DataMapper_Query_QueryFactory, newInsert) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\datamapper\\pdo\\connection"))) + Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_datamapper_pdo_connection_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -176,7 +176,7 @@ 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, 200, connection, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 203, connection, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -205,7 +205,7 @@ PHP_METHOD(Phalcon_DataMapper_Query_QueryFactory, newSelect) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\datamapper\\pdo\\connection"))) + Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_datamapper_pdo_connection_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -251,7 +251,7 @@ PHP_METHOD(Phalcon_DataMapper_Query_QueryFactory, newUpdate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\datamapper\\pdo\\connection"))) + Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_datamapper_pdo_connection_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -263,7 +263,7 @@ 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, 201, connection, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 204, connection, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/datamapper/query/select.zep.c b/ext/phalcon/datamapper/query/select.zep.c index 49232ccafe..6b39c44e50 100644 --- a/ext/phalcon/datamapper/query/select.zep.c +++ b/ext/phalcon/datamapper/query/select.zep.c @@ -920,7 +920,7 @@ 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, 202, &_0, &_1); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 205, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -1043,9 +1043,9 @@ 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, 203); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 206); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "buildfrom", NULL, 204); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "buildfrom", NULL, 207); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6); ZVAL_STRING(&_6, "WHERE"); diff --git a/ext/phalcon/datamapper/query/update.zep.c b/ext/phalcon/datamapper/query/update.zep.c index a59d00390a..25295f7777 100644 --- a/ext/phalcon/datamapper/query/update.zep.c +++ b/ext/phalcon/datamapper/query/update.zep.c @@ -66,8 +66,8 @@ PHP_METHOD(Phalcon_DataMapper_Query_Update, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\datamapper\\pdo\\connection"))) - Z_PARAM_OBJECT_OF_CLASS(bind, zephir_get_internal_ce(SL("phalcon\\datamapper\\query\\bind"))) + Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_datamapper_pdo_connection_ce) + Z_PARAM_OBJECT_OF_CLASS(bind, phalcon_datamapper_query_bind_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -293,7 +293,7 @@ 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, 205); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 208); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5); ZVAL_STRING(&_5, "WHERE"); diff --git a/ext/phalcon/db/adapter/abstractadapter.zep.c b/ext/phalcon/db/adapter/abstractadapter.zep.c index b1cf8d3c28..929fe8dc20 100644 --- a/ext/phalcon/db/adapter/abstractadapter.zep.c +++ b/ext/phalcon/db/adapter/abstractadapter.zep.c @@ -210,7 +210,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, addColumn) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) + Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -266,7 +266,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, addForeignKey) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(reference, zephir_get_internal_ce(SL("phalcon\\db\\referenceinterface"))) + Z_PARAM_OBJECT_OF_CLASS(reference, phalcon_db_referenceinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -322,7 +322,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, addIndex) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(index, zephir_get_internal_ce(SL("phalcon\\db\\indexinterface"))) + Z_PARAM_OBJECT_OF_CLASS(index, phalcon_db_indexinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -378,7 +378,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, addPrimaryKey) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(index, zephir_get_internal_ce(SL("phalcon\\db\\indexinterface"))) + Z_PARAM_OBJECT_OF_CLASS(index, phalcon_db_indexinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1858,7 +1858,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getColumnDefinition) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) + Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2756,9 +2756,9 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, modifyColumn) ZEND_PARSE_PARAMETERS_START(3, 4) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) + Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(currentColumn, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(currentColumn, phalcon_db_columninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2919,7 +2919,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, setEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2942,7 +2942,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, setDialect) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(dialect, zephir_get_internal_ce(SL("phalcon\\db\\dialectinterface"))) + Z_PARAM_OBJECT_OF_CLASS(dialect, phalcon_db_dialectinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/db/adapter/pdo/mysql.zep.c b/ext/phalcon/db/adapter/pdo/mysql.zep.c index 02fd958bc9..d3955be56d 100644 --- a/ext/phalcon/db/adapter/pdo/mysql.zep.c +++ b/ext/phalcon/db/adapter/pdo/mysql.zep.c @@ -142,7 +142,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, addForeignKey) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(reference, zephir_get_internal_ce(SL("phalcon\\db\\referenceinterface"))) + Z_PARAM_OBJECT_OF_CLASS(reference, phalcon_db_referenceinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -666,7 +666,7 @@ 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, 206, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_63$$3, "__construct", &_64, 209, &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); @@ -968,7 +968,7 @@ 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, 206, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_124$$49, "__construct", &_64, 209, &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); diff --git a/ext/phalcon/db/adapter/pdo/postgresql.zep.c b/ext/phalcon/db/adapter/pdo/postgresql.zep.c index a45897d646..50586a1b2e 100644 --- a/ext/phalcon/db/adapter/pdo/postgresql.zep.c +++ b/ext/phalcon/db/adapter/pdo/postgresql.zep.c @@ -788,7 +788,7 @@ 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, 206, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_61$$3, "__construct", &_62, 209, &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); @@ -1087,7 +1087,7 @@ 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, 206, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_118$$41, "__construct", &_62, 209, &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); @@ -1487,9 +1487,9 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Postgresql, modifyColumn) ZEND_PARSE_PARAMETERS_START(3, 4) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) + Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(currentColumn, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(currentColumn, phalcon_db_columninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/db/adapter/pdo/sqlite.zep.c b/ext/phalcon/db/adapter/pdo/sqlite.zep.c index 8650bf7aab..b6e6d53b4e 100644 --- a/ext/phalcon/db/adapter/pdo/sqlite.zep.c +++ b/ext/phalcon/db/adapter/pdo/sqlite.zep.c @@ -453,7 +453,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) 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_CALL_METHOD(NULL, &_33$$3, "__construct", &_41, 209, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_33$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 307); ZEPHIR_CPY_WRT(&oldColumn, &columnName); @@ -618,7 +618,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) 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_CALL_METHOD(NULL, &_71$$28, "__construct", &_41, 209, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_71$$28, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 307); ZEPHIR_CPY_WRT(&oldColumn, &columnName); diff --git a/ext/phalcon/db/adapter/pdofactory.zep.c b/ext/phalcon/db/adapter/pdofactory.zep.c index 19477bce44..8b139a36c8 100644 --- a/ext/phalcon/db/adapter/pdofactory.zep.c +++ b/ext/phalcon/db/adapter/pdofactory.zep.c @@ -139,7 +139,7 @@ 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, 149, config, &_3, &_2); + ZEPHIR_CALL_METHOD(&options, &_1, "__invoke", NULL, 155, config, &_3, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "newinstance", NULL, 0, &name, &options); zephir_check_call_status(); diff --git a/ext/phalcon/db/dialect.zep.c b/ext/phalcon/db/dialect.zep.c index 573faf6c6a..16b60c5a04 100644 --- a/ext/phalcon/db/dialect.zep.c +++ b/ext/phalcon/db/dialect.zep.c @@ -1227,7 +1227,7 @@ PHP_METHOD(Phalcon_Db_Dialect, getColumnSize) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) + Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1258,7 +1258,7 @@ PHP_METHOD(Phalcon_Db_Dialect, getColumnSizeAndScale) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) + Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1290,7 +1290,7 @@ PHP_METHOD(Phalcon_Db_Dialect, checkColumnType) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) + Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1326,7 +1326,7 @@ PHP_METHOD(Phalcon_Db_Dialect, checkColumnTypeSql) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) + Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/db/dialect/mysql.zep.c b/ext/phalcon/db/dialect/mysql.zep.c index 80b4edb36b..8b0f3ee1f9 100644 --- a/ext/phalcon/db/dialect/mysql.zep.c +++ b/ext/phalcon/db/dialect/mysql.zep.c @@ -83,7 +83,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, addColumn) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) + Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -143,7 +143,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, addColumn) } _8$$5 = _7$$5; if (!(_8$$5)) { - ZEPHIR_CALL_FUNCTION(&_9$$5, "is_float", NULL, 207, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_9$$5, "is_float", NULL, 210, &defaultValue); zephir_check_call_status(); _8$$5 = zephir_is_true(&_9$$5); } @@ -154,7 +154,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, addColumn) } else { ZEPHIR_INIT_VAR(&_11$$7); ZVAL_STRING(&_11$$7, "\""); - ZEPHIR_CALL_FUNCTION(&_12$$7, "addcslashes", NULL, 208, &defaultValue, &_11$$7); + ZEPHIR_CALL_FUNCTION(&_12$$7, "addcslashes", NULL, 211, &defaultValue, &_11$$7); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_13$$7); ZEPHIR_CONCAT_SVS(&_13$$7, " DEFAULT \"", &_12$$7, "\""); @@ -219,7 +219,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, addForeignKey) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(reference, zephir_get_internal_ce(SL("phalcon\\db\\referenceinterface"))) + Z_PARAM_OBJECT_OF_CLASS(reference, phalcon_db_referenceinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -322,7 +322,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, addIndex) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(index, zephir_get_internal_ce(SL("phalcon\\db\\indexinterface"))) + Z_PARAM_OBJECT_OF_CLASS(index, phalcon_db_indexinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -397,7 +397,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, addPrimaryKey) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(index, zephir_get_internal_ce(SL("phalcon\\db\\indexinterface"))) + Z_PARAM_OBJECT_OF_CLASS(index, phalcon_db_indexinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -642,7 +642,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) } _11$$10 = _10$$10; if (!(_11$$10)) { - ZEPHIR_CALL_FUNCTION(&_12$$10, "is_float", &_13, 207, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_12$$10, "is_float", &_13, 210, &defaultValue); zephir_check_call_status(); _11$$10 = zephir_is_true(&_12$$10); } @@ -653,7 +653,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) } else { ZEPHIR_INIT_NVAR(&_15$$12); ZVAL_STRING(&_15$$12, "\""); - ZEPHIR_CALL_FUNCTION(&_16$$12, "addcslashes", &_17, 208, &defaultValue, &_15$$12); + ZEPHIR_CALL_FUNCTION(&_16$$12, "addcslashes", &_17, 211, &defaultValue, &_15$$12); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_18$$12); ZEPHIR_CONCAT_SVS(&_18$$12, " DEFAULT \"", &_16$$12, "\""); @@ -722,7 +722,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) } _30$$19 = _29$$19; if (!(_30$$19)) { - ZEPHIR_CALL_FUNCTION(&_31$$19, "is_float", &_13, 207, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_31$$19, "is_float", &_13, 210, &defaultValue); zephir_check_call_status(); _30$$19 = zephir_is_true(&_31$$19); } @@ -733,7 +733,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) } else { ZEPHIR_INIT_NVAR(&_33$$21); ZVAL_STRING(&_33$$21, "\""); - ZEPHIR_CALL_FUNCTION(&_34$$21, "addcslashes", &_17, 208, &defaultValue, &_33$$21); + ZEPHIR_CALL_FUNCTION(&_34$$21, "addcslashes", &_17, 211, &defaultValue, &_33$$21); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_35$$21); ZEPHIR_CONCAT_SVS(&_35$$21, " DEFAULT \"", &_34$$21, "\""); @@ -1615,7 +1615,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) + Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1635,7 +1635,7 @@ 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, 209, column); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "checkcolumnunsigned", NULL, 212, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2$$3); ZEPHIR_CONCAT_VV(&_2$$3, &_0$$3, &_1$$3); @@ -1697,7 +1697,7 @@ 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, 209, column); + ZEPHIR_CALL_METHOD(&_8$$18, this_ptr, "checkcolumnunsigned", NULL, 212, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_9$$18); ZEPHIR_CONCAT_VV(&_9$$18, &_7$$18, &_8$$18); @@ -1708,9 +1708,9 @@ 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, 210, column); + ZEPHIR_CALL_METHOD(&_10$$20, this_ptr, "checkcolumnsizeandscale", NULL, 213, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_11$$20, this_ptr, "checkcolumnunsigned", NULL, 209, column); + ZEPHIR_CALL_METHOD(&_11$$20, this_ptr, "checkcolumnunsigned", NULL, 212, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_12$$20); ZEPHIR_CONCAT_VV(&_12$$20, &_10$$20, &_11$$20); @@ -1730,9 +1730,9 @@ 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, 210, column); + ZEPHIR_CALL_METHOD(&_14$$24, this_ptr, "checkcolumnsizeandscale", NULL, 213, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_15$$24, this_ptr, "checkcolumnunsigned", NULL, 209, column); + ZEPHIR_CALL_METHOD(&_15$$24, this_ptr, "checkcolumnunsigned", NULL, 212, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_16$$24); ZEPHIR_CONCAT_VV(&_16$$24, &_14$$24, &_15$$24); @@ -1745,7 +1745,7 @@ 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, 209, column); + ZEPHIR_CALL_METHOD(&_18$$26, this_ptr, "checkcolumnunsigned", NULL, 212, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_19$$26); ZEPHIR_CONCAT_VV(&_19$$26, &_17$$26, &_18$$26); @@ -1782,7 +1782,7 @@ 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, 209, column); + ZEPHIR_CALL_METHOD(&_21$$36, this_ptr, "checkcolumnunsigned", NULL, 212, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_22$$36); ZEPHIR_CONCAT_VV(&_22$$36, &_20$$36, &_21$$36); @@ -1801,7 +1801,7 @@ 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, 209, column); + ZEPHIR_CALL_METHOD(&_24$$40, this_ptr, "checkcolumnunsigned", NULL, 212, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_25$$40); ZEPHIR_CONCAT_VV(&_25$$40, &_23$$40, &_24$$40); @@ -1852,7 +1852,7 @@ 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, 209, column); + ZEPHIR_CALL_METHOD(&_31$$52, this_ptr, "checkcolumnunsigned", NULL, 212, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_32$$52); ZEPHIR_CONCAT_VV(&_32$$52, &_30$$52, &_31$$52); @@ -1901,7 +1901,7 @@ 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, 208, &value$$61, &_39$$62); + ZEPHIR_CALL_FUNCTION(&_40$$62, "addcslashes", &_41, 211, &value$$61, &_39$$62); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_42$$62); ZEPHIR_CONCAT_SVS(&_42$$62, "\"", &_40$$62, "\", "); @@ -1920,7 +1920,7 @@ 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, 208, &value$$61, &_43$$63); + ZEPHIR_CALL_FUNCTION(&_44$$63, "addcslashes", &_41, 211, &value$$61, &_43$$63); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_45$$63); ZEPHIR_CONCAT_SVS(&_45$$63, "\"", &_44$$63, "\", "); @@ -1940,7 +1940,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } else { ZEPHIR_INIT_VAR(&_50$$64); ZVAL_STRING(&_50$$64, "\""); - ZEPHIR_CALL_FUNCTION(&_51$$64, "addcslashes", &_41, 208, &typeValues, &_50$$64); + ZEPHIR_CALL_FUNCTION(&_51$$64, "addcslashes", &_41, 211, &typeValues, &_50$$64); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_52$$64); ZEPHIR_CONCAT_SVS(&_52$$64, "(\"", &_51$$64, "\")"); @@ -2099,9 +2099,9 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, modifyColumn) ZEND_PARSE_PARAMETERS_START(3, 4) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) + Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(currentColumn, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(currentColumn, phalcon_db_columninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2187,7 +2187,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, modifyColumn) } _13$$8 = _12$$8; if (!(_13$$8)) { - ZEPHIR_CALL_FUNCTION(&_14$$8, "is_float", NULL, 207, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_14$$8, "is_float", NULL, 210, &defaultValue); zephir_check_call_status(); _13$$8 = zephir_is_true(&_14$$8); } @@ -2198,7 +2198,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, modifyColumn) } else { ZEPHIR_INIT_VAR(&_16$$10); ZVAL_STRING(&_16$$10, "\""); - ZEPHIR_CALL_FUNCTION(&_17$$10, "addcslashes", NULL, 208, &defaultValue, &_16$$10); + ZEPHIR_CALL_FUNCTION(&_17$$10, "addcslashes", NULL, 211, &defaultValue, &_16$$10); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_18$$10); ZEPHIR_CONCAT_SVS(&_18$$10, " DEFAULT \"", &_17$$10, "\""); @@ -2583,7 +2583,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, checkColumnSizeAndScale) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) + Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2630,7 +2630,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, checkColumnUnsigned) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) + Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/db/dialect/postgresql.zep.c b/ext/phalcon/db/dialect/postgresql.zep.c index 1af558ffb4..e1a5f44f11 100644 --- a/ext/phalcon/db/dialect/postgresql.zep.c +++ b/ext/phalcon/db/dialect/postgresql.zep.c @@ -74,7 +74,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Postgresql, addColumn) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) + Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -167,7 +167,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Postgresql, addForeignKey) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(reference, zephir_get_internal_ce(SL("phalcon\\db\\referenceinterface"))) + Z_PARAM_OBJECT_OF_CLASS(reference, phalcon_db_referenceinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -267,7 +267,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Postgresql, addIndex) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(index, zephir_get_internal_ce(SL("phalcon\\db\\indexinterface"))) + Z_PARAM_OBJECT_OF_CLASS(index, phalcon_db_indexinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -349,7 +349,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Postgresql, addPrimaryKey) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(index, zephir_get_internal_ce(SL("phalcon\\db\\indexinterface"))) + Z_PARAM_OBJECT_OF_CLASS(index, phalcon_db_indexinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1512,7 +1512,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Postgresql, getColumnDefinition) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) + Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1657,7 +1657,7 @@ 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, 208, &value$$38, &_10$$39); + ZEPHIR_CALL_FUNCTION(&_11$$39, "addcslashes", &_12, 211, &value$$38, &_10$$39); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_13$$39); ZEPHIR_CONCAT_SVS(&_13$$39, "'", &_11$$39, "', "); @@ -1676,7 +1676,7 @@ 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, 208, &value$$38, &_14$$40); + ZEPHIR_CALL_FUNCTION(&_15$$40, "addcslashes", &_12, 211, &value$$38, &_14$$40); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$40); ZEPHIR_CONCAT_SVS(&_16$$40, "'", &_15$$40, "', "); @@ -1696,7 +1696,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Postgresql, getColumnDefinition) } else { ZEPHIR_INIT_VAR(&_21$$41); ZVAL_STRING(&_21$$41, "\'"); - ZEPHIR_CALL_FUNCTION(&_22$$41, "addcslashes", &_12, 208, &typeValues, &_21$$41); + ZEPHIR_CALL_FUNCTION(&_22$$41, "addcslashes", &_12, 211, &typeValues, &_21$$41); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_23$$41); ZEPHIR_CONCAT_SVS(&_23$$41, "('", &_22$$41, "')"); @@ -1849,9 +1849,9 @@ PHP_METHOD(Phalcon_Db_Dialect_Postgresql, modifyColumn) ZEND_PARSE_PARAMETERS_START(3, 4) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) + Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(currentColumn, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(currentColumn, phalcon_db_columninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2258,7 +2258,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Postgresql, castDefault) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) + Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2305,7 +2305,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Postgresql, castDefault) } else { ZEPHIR_INIT_VAR(&_7$$6); ZVAL_STRING(&_7$$6, "\'"); - ZEPHIR_CALL_FUNCTION(&_8$$6, "addcslashes", NULL, 208, &defaultValue, &_7$$6); + ZEPHIR_CALL_FUNCTION(&_8$$6, "addcslashes", NULL, 211, &defaultValue, &_7$$6); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_9$$6); ZEPHIR_CONCAT_SVS(&_9$$6, "'", &_8$$6, "'"); diff --git a/ext/phalcon/db/dialect/sqlite.zep.c b/ext/phalcon/db/dialect/sqlite.zep.c index 3584c75969..a35e44a2f3 100644 --- a/ext/phalcon/db/dialect/sqlite.zep.c +++ b/ext/phalcon/db/dialect/sqlite.zep.c @@ -78,7 +78,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, addColumn) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) + Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -129,7 +129,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, addColumn) } else { ZEPHIR_INIT_VAR(&_7$$5); ZVAL_STRING(&_7$$5, "\""); - ZEPHIR_CALL_FUNCTION(&_8$$5, "addcslashes", NULL, 208, &defaultValue, &_7$$5); + ZEPHIR_CALL_FUNCTION(&_8$$5, "addcslashes", NULL, 211, &defaultValue, &_7$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_9$$5); ZEPHIR_CONCAT_SVS(&_9$$5, " DEFAULT \"", &_8$$5, "\""); @@ -169,7 +169,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, addForeignKey) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(reference, zephir_get_internal_ce(SL("phalcon\\db\\referenceinterface"))) + Z_PARAM_OBJECT_OF_CLASS(reference, phalcon_db_referenceinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -229,7 +229,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, addIndex) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(index, zephir_get_internal_ce(SL("phalcon\\db\\indexinterface"))) + Z_PARAM_OBJECT_OF_CLASS(index, phalcon_db_indexinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -307,7 +307,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, addPrimaryKey) ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(index, zephir_get_internal_ce(SL("phalcon\\db\\indexinterface"))) + Z_PARAM_OBJECT_OF_CLASS(index, phalcon_db_indexinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -533,7 +533,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, createTable) } else { ZEPHIR_INIT_NVAR(&_13$$12); ZVAL_STRING(&_13$$12, "\""); - ZEPHIR_CALL_FUNCTION(&_14$$12, "addcslashes", &_15, 208, &defaultValue, &_13$$12); + ZEPHIR_CALL_FUNCTION(&_14$$12, "addcslashes", &_15, 211, &defaultValue, &_13$$12); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$12); ZEPHIR_CONCAT_SVS(&_16$$12, " DEFAULT \"", &_14$$12, "\""); @@ -597,7 +597,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, createTable) } else { ZEPHIR_INIT_NVAR(&_26$$20); ZVAL_STRING(&_26$$20, "\""); - ZEPHIR_CALL_FUNCTION(&_27$$20, "addcslashes", &_15, 208, &defaultValue, &_26$$20); + ZEPHIR_CALL_FUNCTION(&_27$$20, "addcslashes", &_15, 211, &defaultValue, &_26$$20); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_28$$20); ZEPHIR_CONCAT_SVS(&_28$$20, " DEFAULT \"", &_27$$20, "\""); @@ -1458,7 +1458,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, getColumnDefinition) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) + Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1614,7 +1614,7 @@ 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, 208, &value$$40, &_10$$41); + ZEPHIR_CALL_FUNCTION(&_11$$41, "addcslashes", &_12, 211, &value$$40, &_10$$41); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_13$$41); ZEPHIR_CONCAT_SVS(&_13$$41, "\"", &_11$$41, "\", "); @@ -1633,7 +1633,7 @@ 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, 208, &value$$40, &_14$$42); + ZEPHIR_CALL_FUNCTION(&_15$$42, "addcslashes", &_12, 211, &value$$40, &_14$$42); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$42); ZEPHIR_CONCAT_SVS(&_16$$42, "\"", &_15$$42, "\", "); @@ -1653,7 +1653,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, getColumnDefinition) } else { ZEPHIR_INIT_VAR(&_21$$43); ZVAL_STRING(&_21$$43, "\""); - ZEPHIR_CALL_FUNCTION(&_22$$43, "addcslashes", &_12, 208, &typeValues, &_21$$43); + ZEPHIR_CALL_FUNCTION(&_22$$43, "addcslashes", &_12, 211, &typeValues, &_21$$43); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_23$$43); ZEPHIR_CONCAT_SVS(&_23$$43, "(\"", &_22$$43, "\")"); @@ -1837,9 +1837,9 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, modifyColumn) ZEND_PARSE_PARAMETERS_START(3, 4) Z_PARAM_STR(tableName) Z_PARAM_STR(schemaName) - Z_PARAM_OBJECT_OF_CLASS(column, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) + Z_PARAM_OBJECT_OF_CLASS(column, phalcon_db_columninterface_ce) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(currentColumn, zephir_get_internal_ce(SL("phalcon\\db\\columninterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(currentColumn, phalcon_db_columninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/db/profiler.zep.c b/ext/phalcon/db/profiler.zep.c index 10d73e0e0c..131ce9144c 100644 --- a/ext/phalcon/db/profiler.zep.c +++ b/ext/phalcon/db/profiler.zep.c @@ -267,15 +267,15 @@ PHP_METHOD(Phalcon_Db_Profiler, startProfile) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlstatement", NULL, 211, &sqlStatement); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlstatement", NULL, 214, &sqlStatement); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlvariables", NULL, 212, &sqlVariables); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlvariables", NULL, 215, &sqlVariables); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlbindtypes", NULL, 213, &sqlBindTypes); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlbindtypes", NULL, 216, &sqlBindTypes); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_0, "hrtime", NULL, 195, &__$true); + ZEPHIR_CALL_FUNCTION(&_0, "hrtime", NULL, 199, &__$true); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setinitialtime", NULL, 214, &_0); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setinitialtime", NULL, 217, &_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); @@ -307,7 +307,7 @@ PHP_METHOD(Phalcon_Db_Profiler, stopProfile) zephir_read_property(&_0, this_ptr, ZEND_STRL("activeProfile"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&activeProfile, &_0); - ZEPHIR_CALL_FUNCTION(&_1, "hrtime", NULL, 195, &__$true); + ZEPHIR_CALL_FUNCTION(&_1, "hrtime", NULL, 199, &__$true); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setfinaltime", NULL, 0, &_1); zephir_check_call_status(); diff --git a/ext/phalcon/db/result/pdoresult.zep.c b/ext/phalcon/db/result/pdoresult.zep.c index 0328774118..f39c5f0f34 100644 --- a/ext/phalcon/db/result/pdoresult.zep.c +++ b/ext/phalcon/db/result/pdoresult.zep.c @@ -112,7 +112,7 @@ PHP_METHOD(Phalcon_Db_Result_PdoResult, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 5) - Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\db\\adapter\\adapterinterface"))) + Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_db_adapter_adapterinterface_ce) Z_PARAM_OBJECT_OF_CLASS(result, zephir_get_internal_ce(SL("pdostatement"))) Z_PARAM_OPTIONAL Z_PARAM_ZVAL_OR_NULL(sqlStatement) diff --git a/ext/phalcon/di/abstractinjectionaware.zep.c b/ext/phalcon/di/abstractinjectionaware.zep.c index 826bdc908b..50d6d32e6e 100644 --- a/ext/phalcon/di/abstractinjectionaware.zep.c +++ b/ext/phalcon/di/abstractinjectionaware.zep.c @@ -65,7 +65,7 @@ PHP_METHOD(Phalcon_Di_AbstractInjectionAware, setDI) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/di/di.zep.c b/ext/phalcon/di/di.zep.c index fe0a83c3ce..1992b1116b 100644 --- a/ext/phalcon/di/di.zep.c +++ b/ext/phalcon/di/di.zep.c @@ -684,7 +684,7 @@ PHP_METHOD(Phalcon_Di_Di, loadFromConfig) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(config, zephir_get_internal_ce(SL("phalcon\\config\\configinterface"))) + Z_PARAM_OBJECT_OF_CLASS(config, phalcon_config_configinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1097,7 +1097,7 @@ PHP_METHOD(Phalcon_Di_Di, register) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(provider, zephir_get_internal_ce(SL("phalcon\\di\\serviceproviderinterface"))) + Z_PARAM_OBJECT_OF_CLASS(provider, phalcon_di_serviceproviderinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1248,7 +1248,7 @@ PHP_METHOD(Phalcon_Di_Di, setDefault) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1271,7 +1271,7 @@ PHP_METHOD(Phalcon_Di_Di, setInternalEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1298,7 +1298,7 @@ PHP_METHOD(Phalcon_Di_Di, setService) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(name) - Z_PARAM_OBJECT_OF_CLASS(rawDefinition, zephir_get_internal_ce(SL("phalcon\\di\\serviceinterface"))) + Z_PARAM_OBJECT_OF_CLASS(rawDefinition, phalcon_di_serviceinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/di/injectable.zep.c b/ext/phalcon/di/injectable.zep.c index 9b0b4b97cb..7b99f0ec20 100644 --- a/ext/phalcon/di/injectable.zep.c +++ b/ext/phalcon/di/injectable.zep.c @@ -61,7 +61,7 @@ */ ZEPHIR_INIT_CLASS(Phalcon_Di_Injectable) { - ZEPHIR_REGISTER_CLASS(Phalcon\\Di, Injectable, phalcon, di_injectable, phalcon_di_injectable_method_entry, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); + ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Di, Injectable, phalcon, di_injectable, zend_standard_class_def, phalcon_di_injectable_method_entry, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); /** * Dependency Injector @@ -217,7 +217,7 @@ PHP_METHOD(Phalcon_Di_Injectable, getDI) 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_di_exception_ce, "A dependency injection container is required to access internal services", "phalcon/Di/Injectable.zep", 125); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_di_exception_ce, "A dependency injection container is required to access internal services", "phalcon/Di/Injectable.zep", 126); return; } ZEPHIR_CALL_METHOD(NULL, this_ptr, "setdi", NULL, 0, &container); @@ -238,7 +238,7 @@ PHP_METHOD(Phalcon_Di_Injectable, setDI) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/di/service.zep.c b/ext/phalcon/di/service.zep.c index d4d2a8b5fd..17094a8ae1 100644 --- a/ext/phalcon/di/service.zep.c +++ b/ext/phalcon/di/service.zep.c @@ -216,7 +216,7 @@ PHP_METHOD(Phalcon_Di_Service, resolve) ZEND_PARSE_PARAMETERS_START(0, 2) Z_PARAM_OPTIONAL Z_PARAM_ZVAL_OR_NULL(parameters) - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, phalcon_di_diinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -295,7 +295,7 @@ PHP_METHOD(Phalcon_Di_Service, resolve) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&instance, &builder, "build", NULL, 215, container, &definition, parameters); + ZEPHIR_CALL_METHOD(&instance, &builder, "build", NULL, 218, container, &definition, parameters); zephir_check_call_status(); } else { found = 0; diff --git a/ext/phalcon/di/service/builder.zep.c b/ext/phalcon/di/service/builder.zep.c index 6aa19db329..cfe6c086e9 100644 --- a/ext/phalcon/di/service/builder.zep.c +++ b/ext/phalcon/di/service/builder.zep.c @@ -117,7 +117,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 3) - Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) Z_PARAM_ARRAY(definition) Z_PARAM_OPTIONAL Z_PARAM_ZVAL_OR_NULL(parameters) @@ -152,7 +152,7 @@ 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, 216, container, &arguments); + ZEPHIR_CALL_METHOD(&_0$$8, this_ptr, "buildparameters", NULL, 219, container, &arguments); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&instance); ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params(&instance, &className, &_0$$8); @@ -228,7 +228,7 @@ 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, 216, container, &arguments); + ZEPHIR_CALL_METHOD(&_14$$18, this_ptr, "buildparameters", NULL, 219, container, &arguments); zephir_check_call_status(); ZEPHIR_CALL_USER_FUNC_ARRAY(&_13$$18, &methodCall, &_14$$18); zephir_check_call_status(); @@ -296,7 +296,7 @@ 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, 216, container, &arguments); + ZEPHIR_CALL_METHOD(&_25$$24, this_ptr, "buildparameters", NULL, 219, container, &arguments); zephir_check_call_status(); ZEPHIR_CALL_USER_FUNC_ARRAY(&_24$$24, &methodCall, &_25$$24); zephir_check_call_status(); @@ -370,7 +370,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_37$$28, this_ptr, "buildparameter", &_38, 217, container, &propertyPosition, &propertyValue); + ZEPHIR_CALL_METHOD(&_37$$28, this_ptr, "buildparameter", &_38, 220, container, &propertyPosition, &propertyValue); zephir_check_call_status(); zephir_update_property_zval_zval(&instance, &propertyName, &_37$$28); } ZEND_HASH_FOREACH_END(); @@ -422,7 +422,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_45$$32, this_ptr, "buildparameter", &_38, 217, container, &propertyPosition, &propertyValue); + ZEPHIR_CALL_METHOD(&_45$$32, this_ptr, "buildparameter", &_38, 220, container, &propertyPosition, &propertyValue); zephir_check_call_status(); zephir_update_property_zval_zval(&instance, &propertyName, &_45$$32); ZEPHIR_CALL_METHOD(NULL, ¶mCalls, "next", NULL, 0); @@ -473,7 +473,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, buildParameter) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(3, 3) - Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) Z_PARAM_LONG(position) Z_PARAM_ARRAY(argument) ZEND_PARSE_PARAMETERS_END(); @@ -603,7 +603,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, buildParameters) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) Z_PARAM_ARRAY(arguments) ZEND_PARSE_PARAMETERS_END(); #endif @@ -628,7 +628,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, buildParameters) } ZEPHIR_INIT_NVAR(&argument); ZVAL_COPY(&argument, _0); - ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "buildparameter", &_5, 217, container, &position, &argument); + ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "buildparameter", &_5, 220, container, &position, &argument); zephir_check_call_status(); zephir_array_append(&buildArguments, &_4$$3, PH_SEPARATE, "phalcon/Di/Service/Builder.zep", 298); } ZEND_HASH_FOREACH_END(); @@ -645,7 +645,7 @@ 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, 217, container, &position, &argument); + ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "buildparameter", &_5, 220, container, &position, &argument); zephir_check_call_status(); zephir_array_append(&buildArguments, &_6$$4, PH_SEPARATE, "phalcon/Di/Service/Builder.zep", 298); ZEPHIR_CALL_METHOD(NULL, &arguments, "next", NULL, 0); diff --git a/ext/phalcon/dispatcher/abstractdispatcher.zep.c b/ext/phalcon/dispatcher/abstractdispatcher.zep.c index e0a56e3aec..607f2dd197 100644 --- a/ext/phalcon/dispatcher/abstractdispatcher.zep.c +++ b/ext/phalcon/dispatcher/abstractdispatcher.zep.c @@ -1750,7 +1750,7 @@ PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, setEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1826,7 +1826,7 @@ PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, setModelBinder) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(modelBinder, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\binderinterface"))) + Z_PARAM_OBJECT_OF_CLASS(modelBinder, phalcon_mvc_model_binderinterface_ce) Z_PARAM_OPTIONAL Z_PARAM_ZVAL_OR_NULL(cache) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/phalcon/encryption/crypt.zep.c b/ext/phalcon/encryption/crypt.zep.c index 8020a518fd..d47dd1a007 100644 --- a/ext/phalcon/encryption/crypt.zep.c +++ b/ext/phalcon/encryption/crypt.zep.c @@ -165,7 +165,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, __construct) Z_PARAM_OPTIONAL Z_PARAM_STR(cipher) Z_PARAM_BOOL(useSigning) - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(padFactory, zephir_get_internal_ce(SL("phalcon\\encryption\\crypt\\padfactory"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(padFactory, phalcon_encryption_crypt_padfactory_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -194,7 +194,7 @@ 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, 218); + ZEPHIR_CALL_METHOD(NULL, padFactory, "__construct", NULL, 221); zephir_check_call_status(); } zephir_update_property_zval(this_ptr, ZEND_STRL("padFactory"), padFactory); @@ -303,14 +303,14 @@ 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, 219); + ZEPHIR_CALL_METHOD(&mode, this_ptr, "getmode", NULL, 222); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 220, &mode); + ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 223, &mode); zephir_check_call_status(); ZVAL_LONG(&_0, 0); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "8bit"); - ZEPHIR_CALL_FUNCTION(&iv, "mb_substr", NULL, 221, &input, &_0, &ivLength, &_1); + ZEPHIR_CALL_FUNCTION(&iv, "mb_substr", NULL, 224, &input, &_0, &ivLength, &_1); zephir_check_call_status(); ZEPHIR_INIT_VAR(&digest); ZVAL_STRING(&digest, ""); @@ -326,18 +326,18 @@ PHP_METHOD(Phalcon_Encryption_Crypt, decrypt) 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, 221, &input, &ivLength, &hashLength, &_2$$5); + ZEPHIR_CALL_FUNCTION(&digest, "mb_substr", NULL, 224, &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, 221, &input, &_4$$5, &__$null, &_2$$5); + ZEPHIR_CALL_FUNCTION(&cipherText, "mb_substr", NULL, 224, &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, 221, &input, &ivLength, &__$null, &_5$$6); + ZEPHIR_CALL_FUNCTION(&cipherText, "mb_substr", NULL, 224, &input, &ivLength, &__$null, &_5$$6); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&decrypted, this_ptr, "decryptgcmccmauth", NULL, 0, &mode, &cipherText, &decryptKey, &iv); @@ -348,7 +348,7 @@ 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, 222, &hashAlgorithm, &padded, &decryptKey, &__$true); + ZEPHIR_CALL_FUNCTION(&_8$$7, "hash_hmac", NULL, 225, &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); @@ -428,7 +428,7 @@ 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, 223, &input); + ZEPHIR_CALL_FUNCTION(&_5, "base64_decode", NULL, 226, &input); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "decrypt", NULL, 0, &_5, &key); zephir_check_call_status(); @@ -511,9 +511,9 @@ 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, 219); + ZEPHIR_CALL_METHOD(&mode, this_ptr, "getmode", NULL, 222); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 220, &mode); + ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 223, &mode); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&iv, this_ptr, "phpopensslrandompseudobytes", NULL, 0, &ivLength); zephir_check_call_status(); @@ -529,7 +529,7 @@ 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, 222, &_2$$6, &padded, &encryptKey, &__$true); + ZEPHIR_CALL_FUNCTION(&digest, "hash_hmac", NULL, 225, &_2$$6, &padded, &encryptKey, &__$true); zephir_check_call_status(); ZEPHIR_CONCAT_VVV(return_value, &iv, &digest, &encrypted); RETURN_MM(); @@ -594,7 +594,7 @@ 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, 224, &_0$$3); + ZEPHIR_CALL_FUNCTION(&_1$$3, "base64_encode", NULL, 227, &_0$$3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "+/"); @@ -609,7 +609,7 @@ 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, 224, &_5); + ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 227, &_5); zephir_check_call_status(); RETURN_MM(); } @@ -693,11 +693,11 @@ 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, 225); + ZEPHIR_RETURN_CALL_FUNCTION("hash_hmac_algos", NULL, 228); zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_RETURN_CALL_FUNCTION("hash_algos", NULL, 226); + ZEPHIR_RETURN_CALL_FUNCTION("hash_algos", NULL, 229); zephir_check_call_status(); RETURN_MM(); } @@ -783,7 +783,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, isValidDecryptLength) if (ZEPHIR_IS_FALSE_IDENTICAL(&length)) { RETURN_MM_BOOL(0); } - ZEPHIR_CALL_FUNCTION(&_1, "mb_strlen", NULL, 227, &input); + ZEPHIR_CALL_FUNCTION(&_1, "mb_strlen", NULL, 230, &input); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_LE(&length, &_1)); } @@ -914,7 +914,7 @@ 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, 228, &cipher); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getivlength", NULL, 231, &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); @@ -1128,7 +1128,7 @@ 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, 107, &_2$$5, &type, &cipher); + ZEPHIR_CALL_FUNCTION(&_3$$5, "sprintf", NULL, 113, &_2$$5, &type, &cipher); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$5, "__construct", NULL, 29, &_3$$5); zephir_check_call_status(); @@ -1205,10 +1205,10 @@ 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, 229, &_1, &mode); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkismode", NULL, 232, &_1, &mode); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - ZEPHIR_CALL_FUNCTION(&_3$$3, "mb_strlen", NULL, 227, &input); + ZEPHIR_CALL_FUNCTION(&_3$$3, "mb_strlen", NULL, 230, &input); zephir_check_call_status(); paddingSize = (blockSize - zephir_safe_mod_zval_long(&_3$$3, blockSize)); _4$$3 = paddingSize >= 256; @@ -1316,7 +1316,7 @@ 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, 229, &_3, &mode); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkismode", NULL, 232, &_3, &mode); zephir_check_call_status(); _1 = ZEPHIR_IS_TRUE_IDENTICAL(&_2); } @@ -1401,7 +1401,7 @@ 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, 229, &_1, &mode); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkismode", NULL, 232, &_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); @@ -1478,7 +1478,7 @@ 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, 229, &_2, &mode); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "checkismode", NULL, 232, &_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); @@ -1493,11 +1493,11 @@ 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, 230, &encrypted, &cipher, &decryptKey, &_4$$3, &iv, &authTag, &authData); + ZEPHIR_CALL_FUNCTION(&decrypted, "openssl_decrypt", NULL, 233, &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, 230, &cipherText, &cipher, &decryptKey, &_6$$4, &iv); + ZEPHIR_CALL_FUNCTION(&decrypted, "openssl_decrypt", NULL, 233, &cipherText, &cipher, &decryptKey, &_6$$4, &iv); zephir_check_call_status(); } if (ZEPHIR_IS_FALSE_IDENTICAL(&decrypted)) { @@ -1561,7 +1561,7 @@ 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, 229, &_3, &mode); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkismode", NULL, 232, &_3, &mode); zephir_check_call_status(); _1 = ZEPHIR_IS_TRUE_IDENTICAL(&_2); } @@ -1639,7 +1639,7 @@ 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, 229, &_2, &mode); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "checkismode", NULL, 232, &_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); @@ -1654,13 +1654,13 @@ 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, 231, &padded, &cipher, &encryptKey, &_4$$3, &iv, &authTag, &authData, &authTagLength); + ZEPHIR_CALL_FUNCTION(&encrypted, "openssl_encrypt", NULL, 234, &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, 231, &padded, &cipher, &encryptKey, &_5$$5, &iv); + ZEPHIR_CALL_FUNCTION(&encrypted, "openssl_encrypt", NULL, 234, &padded, &cipher, &encryptKey, &_5$$5, &iv); zephir_check_call_status(); } if (ZEPHIR_IS_FALSE_IDENTICAL(&encrypted)) { @@ -1705,7 +1705,7 @@ 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, 232, &__$true); + ZEPHIR_CALL_FUNCTION(&available, "openssl_get_cipher_methods", NULL, 235, &__$true); zephir_check_call_status(); ZEPHIR_INIT_VAR(&allowed); array_init(&allowed); @@ -1846,9 +1846,9 @@ 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, 233, &_1, &_3, &_2); + ZEPHIR_CALL_FUNCTION(&_4, "str_ireplace", NULL, 236, &_1, &_3, &_2); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getivlength", NULL, 228, &_4); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getivlength", NULL, 231, &_4); zephir_check_call_status(); RETURN_MM(); } @@ -1884,7 +1884,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, getIvLength) zephir_get_strval(&cipher, cipher_param); - ZEPHIR_CALL_FUNCTION(&length, "openssl_cipher_iv_length", NULL, 234, &cipher); + ZEPHIR_CALL_FUNCTION(&length, "openssl_cipher_iv_length", NULL, 237, &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); @@ -1919,7 +1919,7 @@ 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, 235, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "strrpos", NULL, 238, &_0, &_1); zephir_check_call_status(); ZEPHIR_INIT_VAR(&position); ZVAL_LONG(&position, zephir_get_intval(&_2)); @@ -1982,7 +1982,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, phpOpensslCipherIvLength) zephir_get_strval(&cipher, cipher_param); - ZEPHIR_RETURN_CALL_FUNCTION("openssl_cipher_iv_length", NULL, 234, &cipher); + ZEPHIR_RETURN_CALL_FUNCTION("openssl_cipher_iv_length", NULL, 237, &cipher); zephir_check_call_status(); RETURN_MM(); } @@ -2009,7 +2009,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, phpOpensslRandomPseudoBytes) ZVAL_LONG(&_0, length); - ZEPHIR_RETURN_CALL_FUNCTION("openssl_random_pseudo_bytes", NULL, 236, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("openssl_random_pseudo_bytes", NULL, 239, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/crypt/padding/ansi.zep.c b/ext/phalcon/encryption/crypt/padding/ansi.zep.c index 61363c1c02..dc45a04067 100644 --- a/ext/phalcon/encryption/crypt/padding/ansi.zep.c +++ b/ext/phalcon/encryption/crypt/padding/ansi.zep.c @@ -71,13 +71,13 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Ansi, pad) ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 237, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 240, &_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, 237, &_0); + ZEPHIR_CALL_FUNCTION(&_3, "chr", NULL, 240, &_0); zephir_check_call_status(); ZEPHIR_CONCAT_VV(return_value, &_2, &_3); RETURN_MM(); @@ -133,7 +133,7 @@ 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, 238, &last); + ZEPHIR_CALL_FUNCTION(&ord, "ord", NULL, 241, &last); zephir_check_call_status(); if (ZEPHIR_LE_LONG(&ord, blockSize)) { ZEPHIR_CPY_WRT(&paddingSize, &ord); @@ -141,7 +141,7 @@ 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, 237, &_2$$4); + ZEPHIR_CALL_FUNCTION(&_3$$4, "chr", NULL, 240, &_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); diff --git a/ext/phalcon/encryption/crypt/padding/iso10126.zep.c b/ext/phalcon/encryption/crypt/padding/iso10126.zep.c index 5008e604e9..e56845f7a9 100644 --- a/ext/phalcon/encryption/crypt/padding/iso10126.zep.c +++ b/ext/phalcon/encryption/crypt/padding/iso10126.zep.c @@ -91,15 +91,15 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Iso10126, pad) } ZEPHIR_INIT_NVAR(&counter); ZVAL_LONG(&counter, _1); - ZEPHIR_CALL_FUNCTION(&_3$$3, "rand", &_4, 239); + ZEPHIR_CALL_FUNCTION(&_3$$3, "rand", &_4, 242); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_5$$3, "chr", &_6, 237, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "chr", &_6, 240, &_3$$3); zephir_check_call_status(); zephir_concat_self(&padding, &_5$$3); } } ZVAL_LONG(&_7, paddingSize); - ZEPHIR_CALL_FUNCTION(&_8, "chr", &_6, 237, &_7); + ZEPHIR_CALL_FUNCTION(&_8, "chr", &_6, 240, &_7); zephir_check_call_status(); zephir_concat_self(&padding, &_8); RETURN_CCTOR(&padding); @@ -145,7 +145,7 @@ 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, 238, &last); + ZEPHIR_RETURN_CALL_FUNCTION("ord", NULL, 241, &last); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/crypt/padding/isoiek.zep.c b/ext/phalcon/encryption/crypt/padding/isoiek.zep.c index 15d9003083..4b79068edd 100644 --- a/ext/phalcon/encryption/crypt/padding/isoiek.zep.c +++ b/ext/phalcon/encryption/crypt/padding/isoiek.zep.c @@ -71,10 +71,10 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_IsoIek, pad) ZVAL_LONG(&_0, 0x80); - ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 237, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 240, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_FUNCTION(&_2, "chr", NULL, 237, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "chr", NULL, 240, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, (paddingSize - 1)); ZEPHIR_CALL_FUNCTION(&_3, "str_repeat", NULL, 1, &_2, &_0); @@ -123,7 +123,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_IsoIek, unpad) paddingSize = 0; - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 227, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 230, &input); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 84, &input); zephir_check_call_status(); @@ -133,7 +133,7 @@ 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, 237, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 240, &_2); zephir_check_call_status(); _0 = ZEPHIR_IS_IDENTICAL(&_1, &_3); } @@ -149,7 +149,7 @@ 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, 237, &_2); + ZEPHIR_CALL_FUNCTION(&_7, "chr", &_4, 240, &_2); zephir_check_call_status(); if (ZEPHIR_IS_EQUAL(&_6, &_7)) { paddingSize++; diff --git a/ext/phalcon/encryption/crypt/padding/pkcs7.zep.c b/ext/phalcon/encryption/crypt/padding/pkcs7.zep.c index 108f2a3ee7..8f26ca62de 100644 --- a/ext/phalcon/encryption/crypt/padding/pkcs7.zep.c +++ b/ext/phalcon/encryption/crypt/padding/pkcs7.zep.c @@ -68,7 +68,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Pkcs7, pad) ZVAL_LONG(&_0, paddingSize); - ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 237, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 240, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, paddingSize); ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", NULL, 1, &_1, &_0); @@ -116,17 +116,17 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Pkcs7, unpad) blockSize = zephir_get_intval(blockSize_param); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 227, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 230, &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, 238, &last); + ZEPHIR_CALL_FUNCTION(&ord, "ord", NULL, 241, &last); zephir_check_call_status(); if (ZEPHIR_LE_LONG(&ord, blockSize)) { ZEPHIR_CPY_WRT(&paddingSize, &ord); - ZEPHIR_CALL_FUNCTION(&_2$$3, "chr", NULL, 237, &paddingSize); + ZEPHIR_CALL_FUNCTION(&_2$$3, "chr", NULL, 240, &paddingSize); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&padding, "str_repeat", NULL, 1, &_2$$3, &paddingSize); zephir_check_call_status(); diff --git a/ext/phalcon/encryption/crypt/padding/space.zep.c b/ext/phalcon/encryption/crypt/padding/space.zep.c index f798a6d8c7..5bb1c1d5a6 100644 --- a/ext/phalcon/encryption/crypt/padding/space.zep.c +++ b/ext/phalcon/encryption/crypt/padding/space.zep.c @@ -112,7 +112,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Space, unpad) blockSize = zephir_get_intval(blockSize_param); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 227, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 230, &input); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 84, &input); zephir_check_call_status(); @@ -123,7 +123,7 @@ 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, 237, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 240, &_2); zephir_check_call_status(); _0 = ZEPHIR_IS_EQUAL(&_1, &_3); } diff --git a/ext/phalcon/encryption/crypt/padding/zero.zep.c b/ext/phalcon/encryption/crypt/padding/zero.zep.c index 3f9c784784..a54ebcdff6 100644 --- a/ext/phalcon/encryption/crypt/padding/zero.zep.c +++ b/ext/phalcon/encryption/crypt/padding/zero.zep.c @@ -68,7 +68,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Zero, pad) ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 237, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 240, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, paddingSize); ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", NULL, 1, &_1, &_0); @@ -113,7 +113,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Zero, unpad) blockSize = zephir_get_intval(blockSize_param); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 227, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 230, &input); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 84, &input); zephir_check_call_status(); @@ -124,7 +124,7 @@ 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, 237, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 240, &_2); zephir_check_call_status(); _0 = ZEPHIR_IS_EQUAL(&_1, &_3); } diff --git a/ext/phalcon/encryption/crypt/padfactory.zep.c b/ext/phalcon/encryption/crypt/padfactory.zep.c index 947d256574..faa6269e5c 100644 --- a/ext/phalcon/encryption/crypt/padfactory.zep.c +++ b/ext/phalcon/encryption/crypt/padfactory.zep.c @@ -173,7 +173,7 @@ 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, 149, &map, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(&_0, "__invoke", NULL, 155, &map, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/security.zep.c b/ext/phalcon/encryption/security.zep.c index a54f8dec80..709af18a41 100644 --- a/ext/phalcon/encryption/security.zep.c +++ b/ext/phalcon/encryption/security.zep.c @@ -146,8 +146,8 @@ PHP_METHOD(Phalcon_Encryption_Security, __construct) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 2) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(session, zephir_get_internal_ce(SL("phalcon\\session\\managerinterface"))) - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(request, zephir_get_internal_ce(SL("phalcon\\http\\requestinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(session, phalcon_session_managerinterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(request, phalcon_http_requestinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -227,7 +227,7 @@ PHP_METHOD(Phalcon_Encryption_Security, checkHash) if (_0) { RETURN_MM_BOOL(0); } - ZEPHIR_RETURN_CALL_FUNCTION("password_verify", NULL, 240, &password, &passwordHash); + ZEPHIR_RETURN_CALL_FUNCTION("password_verify", NULL, 243, &password, &passwordHash); zephir_check_call_status(); RETURN_MM(); } @@ -287,13 +287,13 @@ PHP_METHOD(Phalcon_Encryption_Security, checkToken) } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "processtokenkey", NULL, 241, &tokenKey); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "processtokenkey", NULL, 244, &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, 242, &tokenKey, tokenValue); + ZEPHIR_CALL_METHOD(&userToken, this_ptr, "processusertoken", NULL, 245, &tokenKey, tokenValue); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&knownToken, this_ptr, "getrequesttoken", NULL, 0); zephir_check_call_status(); @@ -371,14 +371,14 @@ PHP_METHOD(Phalcon_Encryption_Security, computeHmac) ZVAL_BOOL(&_0, (raw ? 1 : 0)); - ZEPHIR_CALL_FUNCTION(&hmac, "hash_hmac", NULL, 222, &algo, &data, &key, &_0); + ZEPHIR_CALL_FUNCTION(&hmac, "hash_hmac", NULL, 225, &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, 107, &_2$$3, &algo); + ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 113, &_2$$3, &algo); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_3$$3); zephir_check_call_status(); @@ -472,7 +472,7 @@ PHP_METHOD(Phalcon_Encryption_Security, getHashInformation) zephir_get_strval(&hash, hash_param); - ZEPHIR_RETURN_CALL_FUNCTION("password_get_info", NULL, 243, &hash); + ZEPHIR_RETURN_CALL_FUNCTION("password_get_info", NULL, 246, &hash); zephir_check_call_status(); RETURN_MM(); } @@ -790,11 +790,11 @@ PHP_METHOD(Phalcon_Encryption_Security, hash) } - ZEPHIR_CALL_METHOD(&cost, this_ptr, "processcost", NULL, 244, &options); + ZEPHIR_CALL_METHOD(&cost, this_ptr, "processcost", NULL, 247, &options); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "%02s"); - ZEPHIR_CALL_FUNCTION(&formatted, "sprintf", NULL, 107, &_0, &cost); + ZEPHIR_CALL_FUNCTION(&formatted, "sprintf", NULL, 113, &_0, &cost); zephir_check_call_status(); ZEPHIR_INIT_VAR(&prefix); ZVAL_STRING(&prefix, ""); @@ -824,14 +824,14 @@ 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, 107, &_2$$6, &formatted); + ZEPHIR_CALL_FUNCTION(&prefix, "sprintf", NULL, 113, &_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, 107, &_3$$7, &formatted); + ZEPHIR_CALL_FUNCTION(&prefix, "sprintf", NULL, 113, &_3$$7, &formatted); zephir_check_call_status(); break; } @@ -845,7 +845,7 @@ 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, 245, &password, &salt); + ZEPHIR_RETURN_CALL_FUNCTION("crypt", NULL, 248, &password, &salt); zephir_check_call_status(); RETURN_MM(); } @@ -853,11 +853,11 @@ 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, 246); + ZEPHIR_CALL_METHOD(&algorithm, this_ptr, "processalgorithm", NULL, 249); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&arguments, this_ptr, "processargonoptions", NULL, 247, &options); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "processargonoptions", NULL, 250, &options); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("password_hash", NULL, 248, &password, &algorithm, &arguments); + ZEPHIR_RETURN_CALL_FUNCTION("password_hash", NULL, 251, &password, &algorithm, &arguments); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/security/jwt/builder.zep.c b/ext/phalcon/encryption/security/jwt/builder.zep.c index 8e4baea9c8..45fa5defed 100644 --- a/ext/phalcon/encryption/security/jwt/builder.zep.c +++ b/ext/phalcon/encryption/security/jwt/builder.zep.c @@ -45,6 +45,10 @@ ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security_JWT_Builder) * @var CollectionInterface */ zend_declare_property_null(phalcon_encryption_security_jwt_builder_ce, SL("claims"), ZEND_ACC_PRIVATE); + /** + * @var Encode + */ + zend_declare_property_null(phalcon_encryption_security_jwt_builder_ce, SL("encode"), ZEND_ACC_PRIVATE); /** * @var CollectionInterface */ @@ -69,7 +73,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, __construct) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *signer, signer_sub, _0, _1, _2, _3; + zval *signer, signer_sub, _0, _1, _2, _3, _4; zval *this_ptr = getThis(); ZVAL_UNDEF(&signer_sub); @@ -77,10 +81,11 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, __construct) 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_OBJECT_OF_CLASS(signer, zephir_get_internal_ce(SL("phalcon\\encryption\\security\\jwt\\signer\\signerinterface"))) + Z_PARAM_OBJECT_OF_CLASS(signer, phalcon_encryption_security_jwt_signer_signerinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -92,13 +97,21 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, __construct) ZEPHIR_CALL_METHOD(NULL, this_ptr, "init", NULL, 0); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("signer"), signer); - zephir_read_property(&_0, this_ptr, ZEND_STRL("jose"), PH_NOISY_CC | PH_READONLY); - zephir_read_property(&_1, this_ptr, ZEND_STRL("signer"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_2, &_1, "getalgheader", NULL, 0); + ZEPHIR_INIT_VAR(&_0); + object_init_ex(&_0, phalcon_support_helper_json_encode_ce); + if (zephir_has_constructor(&_0)) { + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 0); + zephir_check_call_status(); + } + + zephir_update_property_zval(this_ptr, ZEND_STRL("encode"), &_0); + zephir_read_property(&_1, this_ptr, ZEND_STRL("jose"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_2, this_ptr, ZEND_STRL("signer"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(&_3, &_2, "getalgheader", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_3); - ZVAL_STRING(&_3, "alg"); - ZEPHIR_CALL_METHOD(NULL, &_0, "set", NULL, 0, &_3, &_2); + ZEPHIR_INIT_VAR(&_4); + ZVAL_STRING(&_4, "alg"); + ZEPHIR_CALL_METHOD(NULL, &_1, "set", NULL, 0, &_4, &_3); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -464,7 +477,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, getSubject) */ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, getToken) { - zval claims, encodedClaims, encodedHeaders, encodedSignature, headers, signature, signatureHash, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9; + zval claims, encodedClaims, encodedHeaders, encodedSignature, headers, signature, signatureHash, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); @@ -486,53 +499,57 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, getToken) ZVAL_UNDEF(&_7); ZVAL_UNDEF(&_8); ZVAL_UNDEF(&_9); + ZVAL_UNDEF(&_10); + ZVAL_UNDEF(&_11); ZEPHIR_MM_GROW(); zephir_read_property(&_0, this_ptr, ZEND_STRL("passphrase"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_EMPTY(&_0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid passphrase (empty)", "phalcon/Encryption/Security/JWT/Builder.zep", 192); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid passphrase (empty)", "phalcon/Encryption/Security/JWT/Builder.zep", 198); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "getclaims", NULL, 0); + zephir_read_property(&_1, this_ptr, ZEND_STRL("encode"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "getclaims", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "encode", NULL, 249, &_2); + ZEPHIR_CALL_METHOD(&_2, &_1, "__invoke", NULL, 0, &_3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&encodedClaims, this_ptr, "encodeurl", NULL, 250, &_1); + ZEPHIR_CALL_METHOD(&encodedClaims, this_ptr, "encodeurl", NULL, 252, &_2); 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_CALL_METHOD(&_4, this_ptr, "getclaims", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &claims, "__construct", NULL, 251, &_3, &encodedClaims); + ZEPHIR_CALL_METHOD(NULL, &claims, "__construct", NULL, 253, &_4, &encodedClaims); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_5, this_ptr, "getheaders", NULL, 0); + zephir_read_property(&_5, this_ptr, ZEND_STRL("encode"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(&_7, this_ptr, "getheaders", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "encode", NULL, 249, &_5); + ZEPHIR_CALL_METHOD(&_6, &_5, "__invoke", NULL, 0, &_7); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&encodedHeaders, this_ptr, "encodeurl", NULL, 250, &_4); + ZEPHIR_CALL_METHOD(&encodedHeaders, this_ptr, "encodeurl", NULL, 252, &_6); 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_CALL_METHOD(&_8, this_ptr, "getheaders", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &headers, "__construct", NULL, 251, &_6, &encodedHeaders); + ZEPHIR_CALL_METHOD(NULL, &headers, "__construct", NULL, 253, &_8, &encodedHeaders); zephir_check_call_status(); - zephir_read_property(&_7, this_ptr, ZEND_STRL("signer"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_INIT_VAR(&_8); - ZEPHIR_CONCAT_VSV(&_8, &encodedHeaders, ".", &encodedClaims); - 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_read_property(&_9, this_ptr, ZEND_STRL("signer"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_INIT_VAR(&_10); + ZEPHIR_CONCAT_VSV(&_10, &encodedHeaders, ".", &encodedClaims); + zephir_read_property(&_11, this_ptr, ZEND_STRL("passphrase"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(&signatureHash, &_9, "sign", NULL, 0, &_10, &_11); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&encodedSignature, this_ptr, "encodeurl", NULL, 250, &signatureHash); + ZEPHIR_CALL_METHOD(&encodedSignature, this_ptr, "encodeurl", NULL, 252, &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, 252, &signatureHash, &encodedSignature); + ZEPHIR_CALL_METHOD(NULL, &signature, "__construct", NULL, 254, &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, 253, &headers, &claims, &signature); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 255, &headers, &claims, &signature); zephir_check_call_status(); RETURN_MM(); } @@ -595,7 +612,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, setAudience) _0 = Z_TYPE_P(audience) != IS_ARRAY; } if (_0) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid Audience", "phalcon/Encryption/Security/JWT/Builder.zep", 242); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid Audience", "phalcon/Encryption/Security/JWT/Builder.zep", 248); return; } if (Z_TYPE_P(audience) == IS_STRING) { @@ -691,7 +708,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, setExpirationTime) ZEPHIR_INIT_VAR(&_0); zephir_time(&_0); if (ZEPHIR_GT_LONG(&_0, timestamp)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid Expiration Time", "phalcon/Encryption/Security/JWT/Builder.zep", 287); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid Expiration Time", "phalcon/Encryption/Security/JWT/Builder.zep", 293); return; } ZEPHIR_INIT_VAR(&_1); @@ -890,7 +907,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, setNotBefore) ZEPHIR_INIT_VAR(&_0); zephir_time(&_0); if (ZEPHIR_LT_LONG(&_0, timestamp)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid Not Before", "phalcon/Encryption/Security/JWT/Builder.zep", 361); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid Not Before", "phalcon/Encryption/Security/JWT/Builder.zep", 367); return; } ZEPHIR_INIT_VAR(&_1); @@ -999,7 +1016,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, setPassphrase) ZVAL_STRING(&_3, "/(?=^.{16,}$)((?=.*\\d)|(?=.*\\W+))(?![.\n])(?=.*[A-Z])(?=.*[a-z]).*$/"); zephir_preg_match(&_2, &_3, &passphrase, &_0, 0, 0 , 0 ); if (!(zephir_is_true(&_2))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid passphrase (too weak)", "phalcon/Encryption/Security/JWT/Builder.zep", 399); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid passphrase (too weak)", "phalcon/Encryption/Security/JWT/Builder.zep", 405); return; } zephir_update_property_zval(this_ptr, ZEND_STRL("passphrase"), &passphrase); @@ -1091,7 +1108,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, encodeUrl) } - ZEPHIR_CALL_FUNCTION(&_0, "base64_encode", NULL, 224, &input); + ZEPHIR_CALL_FUNCTION(&_0, "base64_encode", NULL, 227, &input); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "+/"); @@ -1108,68 +1125,3 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, encodeUrl) RETURN_CCTOR(&_4); } -/** - * @todo This will be removed when traits are introduced - */ -PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, 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, 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, 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(&_3$$3, "phalcon/Encryption/Security/JWT/Builder.zep", 446); - ZEPHIR_MM_RESTORE(); - return; - } - RETURN_CCTOR(&encoded); -} - diff --git a/ext/phalcon/encryption/security/jwt/builder.zep.h b/ext/phalcon/encryption/security/jwt/builder.zep.h index df688c7883..c1212f5db0 100644 --- a/ext/phalcon/encryption/security/jwt/builder.zep.h +++ b/ext/phalcon/encryption/security/jwt/builder.zep.h @@ -29,7 +29,6 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, setSubject); PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, setPassphrase); PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, setClaim); PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, encodeUrl); -PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, encode); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_encryption_security_jwt_builder___construct, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, signer, Phalcon\\Encryption\\Security\\JWT\\Signer\\SignerInterface, 0) @@ -124,12 +123,6 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_jwt_ ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_jwt_builder_encode, 0, 1, IS_STRING, 0) - ZEND_ARG_INFO(0, data) - ZEND_ARG_TYPE_INFO(0, options, IS_LONG, 0) - ZEND_ARG_TYPE_INFO(0, depth, IS_LONG, 0) -ZEND_END_ARG_INFO() - ZEPHIR_INIT_FUNCS(phalcon_encryption_security_jwt_builder_method_entry) { PHP_ME(Phalcon_Encryption_Security_JWT_Builder, __construct, arginfo_phalcon_encryption_security_jwt_builder___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) PHP_ME(Phalcon_Encryption_Security_JWT_Builder, init, arginfo_phalcon_encryption_security_jwt_builder_init, ZEND_ACC_PUBLIC) @@ -161,6 +154,5 @@ ZEPHIR_INIT_FUNCS(phalcon_encryption_security_jwt_builder_method_entry) { PHP_ME(Phalcon_Encryption_Security_JWT_Builder, setPassphrase, arginfo_phalcon_encryption_security_jwt_builder_setpassphrase, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Encryption_Security_JWT_Builder, setClaim, arginfo_phalcon_encryption_security_jwt_builder_setclaim, ZEND_ACC_PROTECTED) PHP_ME(Phalcon_Encryption_Security_JWT_Builder, encodeUrl, arginfo_phalcon_encryption_security_jwt_builder_encodeurl, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Encryption_Security_JWT_Builder, encode, arginfo_phalcon_encryption_security_jwt_builder_encode, ZEND_ACC_PRIVATE) PHP_FE_END }; diff --git a/ext/phalcon/encryption/security/jwt/signer/hmac.zep.c b/ext/phalcon/encryption/security/jwt/signer/hmac.zep.c index 3e7b9cf5a9..c1810ca2ba 100644 --- a/ext/phalcon/encryption/security/jwt/signer/hmac.zep.c +++ b/ext/phalcon/encryption/security/jwt/signer/hmac.zep.c @@ -177,7 +177,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Signer_Hmac, sign) } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethash", NULL, 254, &payload, &passphrase); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethash", NULL, 256, &payload, &passphrase); zephir_check_call_status(); RETURN_MM(); } @@ -220,7 +220,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Signer_Hmac, verify) zephir_get_strval(&passphrase, passphrase_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "gethash", NULL, 254, &payload, &passphrase); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "gethash", NULL, 256, &payload, &passphrase); zephir_check_call_status(); RETURN_MM_BOOL(zephir_hash_equals(&source, &_0)); } @@ -262,7 +262,7 @@ 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, 222, &_0, &payload, &passphrase, &__$true); + ZEPHIR_RETURN_CALL_FUNCTION("hash_hmac", NULL, 225, &_0, &payload, &passphrase, &__$true); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/security/jwt/token/parser.zep.c b/ext/phalcon/encryption/security/jwt/token/parser.zep.c index c2dfc8e7f4..d152917235 100644 --- a/ext/phalcon/encryption/security/jwt/token/parser.zep.c +++ b/ext/phalcon/encryption/security/jwt/token/parser.zep.c @@ -12,15 +12,14 @@ #include #include "kernel/main.h" -#include "kernel/fcall.h" +#include "kernel/operators.h" #include "kernel/memory.h" +#include "kernel/fcall.h" +#include "kernel/object.h" #include "kernel/array.h" #include "ext/spl/spl_exceptions.h" #include "kernel/exception.h" -#include "kernel/operators.h" -#include "kernel/object.h" #include "kernel/string.h" -#include "kernel/concat.h" /** @@ -42,9 +41,54 @@ ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security_JWT_Token_Parser) { ZEPHIR_REGISTER_CLASS(Phalcon\\Encryption\\Security\\JWT\\Token, Parser, phalcon, encryption_security_jwt_token_parser, phalcon_encryption_security_jwt_token_parser_method_entry, 0); + /** + * @var Decode + */ + zend_declare_property_null(phalcon_encryption_security_jwt_token_parser_ce, SL("decode"), ZEND_ACC_PRIVATE); return SUCCESS; } +PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, __construct) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *decode = NULL, decode_sub, __$null, service; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&decode_sub); + ZVAL_NULL(&__$null); + ZVAL_UNDEF(&service); +#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(decode, phalcon_support_helper_json_decode_ce) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 0, 1, &decode); + if (!decode) { + decode = &decode_sub; + decode = &__$null; + } + + + ZEPHIR_CPY_WRT(&service, decode); + if (Z_TYPE_P(&service) == IS_NULL) { + ZEPHIR_INIT_NVAR(&service); + object_init_ex(&service, phalcon_support_helper_json_decode_ce); + if (zephir_has_constructor(&service)) { + ZEPHIR_CALL_METHOD(NULL, &service, "__construct", NULL, 0); + zephir_check_call_status(); + } + + } + zephir_update_property_zval(this_ptr, ZEND_STRL("decode"), &service); + ZEPHIR_MM_RESTORE(); +} + /** * Parse a token and return it * @@ -89,22 +133,22 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, parse) } - ZEPHIR_CALL_METHOD(&results, this_ptr, "parsetoken", NULL, 255, &token); + ZEPHIR_CALL_METHOD(&results, this_ptr, "parsetoken", NULL, 257, &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", 37); + zephir_array_fetch_long(&encodedHeaders, &results, 0, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 55); ZEPHIR_OBS_VAR(&encodedClaims); - zephir_array_fetch_long(&encodedClaims, &results, 1, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 38); + zephir_array_fetch_long(&encodedClaims, &results, 1, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 56); ZEPHIR_OBS_VAR(&encodedSignature); - zephir_array_fetch_long(&encodedSignature, &results, 2, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 39); - ZEPHIR_CALL_METHOD(&headers, this_ptr, "decodeheaders", NULL, 256, &encodedHeaders); + zephir_array_fetch_long(&encodedSignature, &results, 2, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 57); + ZEPHIR_CALL_METHOD(&headers, this_ptr, "decodeheaders", NULL, 258, &encodedHeaders); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&claims, this_ptr, "decodeclaims", NULL, 257, &encodedClaims); + ZEPHIR_CALL_METHOD(&claims, this_ptr, "decodeclaims", NULL, 259, &encodedClaims); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&signature, this_ptr, "decodesignature", NULL, 258, &headers, &encodedSignature); + ZEPHIR_CALL_METHOD(&signature, this_ptr, "decodesignature", NULL, 260, &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, 253, &headers, &claims, &signature); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 255, &headers, &claims, &signature); zephir_check_call_status(); RETURN_MM(); } @@ -118,11 +162,11 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, parse) */ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeClaims) { - zval _4$$4; - zend_bool _2; + zval _5$$4; + zend_bool _3; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *claims_param = NULL, decoded, _0, _1, _3, _5$$4; + zval *claims_param = NULL, decoded, _0, _1, _2, _4, _6$$4; zval claims; zval *this_ptr = getThis(); @@ -130,9 +174,10 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeClaims) ZVAL_UNDEF(&decoded); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_4); + ZVAL_UNDEF(&_6$$4); ZVAL_UNDEF(&_5$$4); - ZVAL_UNDEF(&_4$$4); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -146,31 +191,32 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeClaims) zephir_get_strval(&claims, claims_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "decodeurl", NULL, 259, &claims); + zephir_read_property(&_0, this_ptr, ZEND_STRL("decode"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "decodeurl", NULL, 261, &claims); zephir_check_call_status(); - ZVAL_BOOL(&_1, 1); - ZEPHIR_CALL_METHOD(&decoded, this_ptr, "decode", NULL, 260, &_0, &_1); + ZVAL_BOOL(&_2, 1); + ZEPHIR_CALL_METHOD(&decoded, &_0, "__invoke", NULL, 0, &_1, &_2); 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", 63); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Invalid Claims (not an array)", "phalcon/Encryption/Security/JWT/Token/Parser.zep", 81); return; } - _2 = zephir_array_isset_string(&decoded, SL("aud")); - if (_2) { - ZEPHIR_OBS_VAR(&_3); - zephir_array_fetch_string(&_3, &decoded, SL("aud"), PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 69); - _2 = Z_TYPE_P(&_3) != IS_ARRAY; + _3 = zephir_array_isset_string(&decoded, SL("aud")); + if (_3) { + ZEPHIR_OBS_VAR(&_4); + zephir_array_fetch_string(&_4, &decoded, SL("aud"), PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 87); + _3 = Z_TYPE_P(&_4) != IS_ARRAY; } - if (_2) { - ZEPHIR_INIT_VAR(&_4$$4); - zephir_create_array(&_4$$4, 1, 0); - ZEPHIR_OBS_VAR(&_5$$4); - zephir_array_fetch_string(&_5$$4, &decoded, SL("aud"), PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 70); - zephir_array_fast_append(&_4$$4, &_5$$4); - zephir_array_update_string(&decoded, SL("aud"), &_4$$4, PH_COPY | PH_SEPARATE); + if (_3) { + ZEPHIR_INIT_VAR(&_5$$4); + zephir_create_array(&_5$$4, 1, 0); + ZEPHIR_OBS_VAR(&_6$$4); + zephir_array_fetch_string(&_6$$4, &decoded, SL("aud"), PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 88); + zephir_array_fast_append(&_5$$4, &_6$$4); + zephir_array_update_string(&decoded, SL("aud"), &_5$$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, 251, &decoded, &claims); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 253, &decoded, &claims); zephir_check_call_status(); RETURN_MM(); } @@ -186,7 +232,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeHeaders) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *headers_param = NULL, decoded, _0, _1; + zval *headers_param = NULL, decoded, _0, _1, _2; zval headers; zval *this_ptr = getThis(); @@ -194,6 +240,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeHeaders) ZVAL_UNDEF(&decoded); 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) @@ -207,21 +254,22 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeHeaders) zephir_get_strval(&headers, headers_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "decodeurl", NULL, 259, &headers); + zephir_read_property(&_0, this_ptr, ZEND_STRL("decode"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "decodeurl", NULL, 261, &headers); zephir_check_call_status(); - ZVAL_BOOL(&_1, 1); - ZEPHIR_CALL_METHOD(&decoded, this_ptr, "decode", NULL, 260, &_0, &_1); + ZVAL_BOOL(&_2, 1); + ZEPHIR_CALL_METHOD(&decoded, &_0, "__invoke", NULL, 0, &_1, &_2); 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", 92); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Invalid Header (not an array)", "phalcon/Encryption/Security/JWT/Token/Parser.zep", 110); return; } if (!(zephir_array_isset_string(&decoded, SL("typ")))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Invalid Header (missing 'typ' element)", "phalcon/Encryption/Security/JWT/Token/Parser.zep", 98); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Invalid Header (missing 'typ' element)", "phalcon/Encryption/Security/JWT/Token/Parser.zep", 116); return; } object_init_ex(return_value, phalcon_encryption_security_jwt_token_item_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 251, &decoded, &headers); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 253, &decoded, &headers); zephir_check_call_status(); RETURN_MM(); } @@ -252,7 +300,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeSignature) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(headers, zephir_get_internal_ce(SL("phalcon\\encryption\\security\\jwt\\token\\item"))) + Z_PARAM_OBJECT_OF_CLASS(headers, phalcon_encryption_security_jwt_token_item_ce) Z_PARAM_STR(signature) ZEND_PARSE_PARAMETERS_END(); #endif @@ -276,11 +324,11 @@ 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, 259, &signature); + ZEPHIR_CALL_METHOD(&decoded, this_ptr, "decodeurl", NULL, 261, &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, 252, &decoded, &signature); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 254, &decoded, &signature); zephir_check_call_status(); RETURN_MM(); } @@ -325,96 +373,12 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, parseToken) ZEPHIR_INIT_VAR(&parts); zephir_fast_explode_str(&parts, SL("."), &token, LONG_MAX); if (zephir_fast_count_int(&parts) != 3) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Invalid JWT string (dots misalignment)", "phalcon/Encryption/Security/JWT/Token/Parser.zep", 144); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Invalid JWT string (dots misalignment)", "phalcon/Encryption/Security/JWT/Token/Parser.zep", 162); return; } RETURN_CCTOR(&parts); } -/** - * @todo This will be removed when traits are introduced - */ -PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decode) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long depth, options, ZEPHIR_LAST_CALL_STATUS; - zend_bool associative; - zval *data_param = NULL, *associative_param = NULL, *depth_param = NULL, *options_param = NULL, decoded, _0, _1, _2, _3, _4$$3, _5$$3, _6$$3; - zval data; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&data); - ZVAL_UNDEF(&decoded); - 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, 4) - Z_PARAM_STR(data) - Z_PARAM_OPTIONAL - Z_PARAM_BOOL(associative) - Z_PARAM_LONG(depth) - Z_PARAM_LONG(options) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 3, &data_param, &associative_param, &depth_param, &options_param); - if (UNEXPECTED(Z_TYPE_P(data_param) != IS_STRING && Z_TYPE_P(data_param) != IS_NULL)) { - zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'data' must be of the type string")); - RETURN_MM_NULL(); - } - if (EXPECTED(Z_TYPE_P(data_param) == IS_STRING)) { - zephir_get_strval(&data, data_param); - } else { - ZEPHIR_INIT_VAR(&data); - } - if (!associative_param) { - associative = 0; - } else { - associative = zephir_get_boolval(associative_param); - } - if (!depth_param) { - depth = 512; - } else { - depth = zephir_get_intval(depth_param); - } - if (!options_param) { - options = 0; - } else { - options = zephir_get_intval(options_param); - } - - - ZVAL_BOOL(&_0, (associative ? 1 : 0)); - ZVAL_LONG(&_1, depth); - 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, 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, 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, 189, &_6$$3); - zephir_check_call_status(); - zephir_throw_exception_debug(&_4$$3, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 167); - ZEPHIR_MM_RESTORE(); - return; - } - RETURN_CCTOR(&decoded); -} - /** * @todo This will be removed when traits are introduced */ @@ -470,7 +434,7 @@ 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, 223, &_5); + ZEPHIR_CALL_FUNCTION(&data, "base64_decode", NULL, 226, &_5); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&data)) { ZEPHIR_INIT_NVAR(&data); diff --git a/ext/phalcon/encryption/security/jwt/token/parser.zep.h b/ext/phalcon/encryption/security/jwt/token/parser.zep.h index 5709a371be..a151c6c937 100644 --- a/ext/phalcon/encryption/security/jwt/token/parser.zep.h +++ b/ext/phalcon/encryption/security/jwt/token/parser.zep.h @@ -3,14 +3,18 @@ extern zend_class_entry *phalcon_encryption_security_jwt_token_parser_ce; ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security_JWT_Token_Parser); +PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, __construct); PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, parse); PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeClaims); PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeHeaders); PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeSignature); PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, parseToken); -PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decode); PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeUrl); +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_parser___construct, 0, 0, 0) + ZEND_ARG_OBJ_INFO(0, decode, Phalcon\\Support\\Helper\\Json\\Decode, 1) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_parser_parse, 0, 1, Phalcon\\Encryption\\Security\\JWT\\Token\\Token, 0) ZEND_ARG_TYPE_INFO(0, token, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -32,24 +36,17 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_jwt_ ZEND_ARG_TYPE_INFO(0, token, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_parser_decode, 0, 0, 1) - ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, associative, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, depth, IS_LONG, 0) - ZEND_ARG_TYPE_INFO(0, options, IS_LONG, 0) -ZEND_END_ARG_INFO() - ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_parser_decodeurl, 0, 1, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0) ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_encryption_security_jwt_token_parser_method_entry) { + PHP_ME(Phalcon_Encryption_Security_JWT_Token_Parser, __construct, arginfo_phalcon_encryption_security_jwt_token_parser___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) PHP_ME(Phalcon_Encryption_Security_JWT_Token_Parser, parse, arginfo_phalcon_encryption_security_jwt_token_parser_parse, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Encryption_Security_JWT_Token_Parser, decodeClaims, arginfo_phalcon_encryption_security_jwt_token_parser_decodeclaims, ZEND_ACC_PRIVATE) PHP_ME(Phalcon_Encryption_Security_JWT_Token_Parser, decodeHeaders, arginfo_phalcon_encryption_security_jwt_token_parser_decodeheaders, ZEND_ACC_PRIVATE) PHP_ME(Phalcon_Encryption_Security_JWT_Token_Parser, decodeSignature, arginfo_phalcon_encryption_security_jwt_token_parser_decodesignature, ZEND_ACC_PRIVATE) PHP_ME(Phalcon_Encryption_Security_JWT_Token_Parser, parseToken, arginfo_phalcon_encryption_security_jwt_token_parser_parsetoken, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Encryption_Security_JWT_Token_Parser, decode, arginfo_phalcon_encryption_security_jwt_token_parser_decode, ZEND_ACC_PRIVATE) PHP_ME(Phalcon_Encryption_Security_JWT_Token_Parser, decodeUrl, arginfo_phalcon_encryption_security_jwt_token_parser_decodeurl, ZEND_ACC_PRIVATE) PHP_FE_END }; diff --git a/ext/phalcon/encryption/security/jwt/token/token.zep.c b/ext/phalcon/encryption/security/jwt/token/token.zep.c index 7849fe13b7..83dc2e8b8e 100644 --- a/ext/phalcon/encryption/security/jwt/token/token.zep.c +++ b/ext/phalcon/encryption/security/jwt/token/token.zep.c @@ -73,9 +73,9 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(3, 3) - Z_PARAM_OBJECT_OF_CLASS(headers, zephir_get_internal_ce(SL("phalcon\\encryption\\security\\jwt\\token\\item"))) - Z_PARAM_OBJECT_OF_CLASS(claims, zephir_get_internal_ce(SL("phalcon\\encryption\\security\\jwt\\token\\item"))) - Z_PARAM_OBJECT_OF_CLASS(signature, zephir_get_internal_ce(SL("phalcon\\encryption\\security\\jwt\\token\\signature"))) + Z_PARAM_OBJECT_OF_CLASS(headers, phalcon_encryption_security_jwt_token_item_ce) + Z_PARAM_OBJECT_OF_CLASS(claims, phalcon_encryption_security_jwt_token_item_ce) + Z_PARAM_OBJECT_OF_CLASS(signature, phalcon_encryption_security_jwt_token_signature_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -204,7 +204,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(validator, zephir_get_internal_ce(SL("phalcon\\encryption\\security\\jwt\\validator"))) + Z_PARAM_OBJECT_OF_CLASS(validator, phalcon_encryption_security_jwt_validator_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -314,7 +314,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, verify) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(signer, zephir_get_internal_ce(SL("phalcon\\encryption\\security\\jwt\\signer\\signerinterface"))) + Z_PARAM_OBJECT_OF_CLASS(signer, phalcon_encryption_security_jwt_signer_signerinterface_ce) Z_PARAM_STR(key) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/encryption/security/jwt/validator.zep.c b/ext/phalcon/encryption/security/jwt/validator.zep.c index c8163d6910..b57b4b6341 100644 --- a/ext/phalcon/encryption/security/jwt/validator.zep.c +++ b/ext/phalcon/encryption/security/jwt/validator.zep.c @@ -80,7 +80,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(token, zephir_get_internal_ce(SL("phalcon\\encryption\\security\\jwt\\token\\token"))) + Z_PARAM_OBJECT_OF_CLASS(token, phalcon_encryption_security_jwt_token_token_ce) Z_PARAM_OPTIONAL Z_PARAM_LONG(timeShift) ZEND_PARSE_PARAMETERS_END(); @@ -198,7 +198,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, setToken) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(token, zephir_get_internal_ce(SL("phalcon\\encryption\\security\\jwt\\token\\token"))) + Z_PARAM_OBJECT_OF_CLASS(token, phalcon_encryption_security_jwt_token_token_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -364,7 +364,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateExpiration) _7 = zephir_is_true(&_6); if (_7) { ZVAL_LONG(&_9, timestamp); - ZEPHIR_CALL_METHOD(&_8, this_ptr, "gettimestamp", NULL, 261, &_9); + ZEPHIR_CALL_METHOD(&_8, this_ptr, "gettimestamp", NULL, 262, &_9); zephir_check_call_status(); _7 = ZEPHIR_GT_LONG(&_8, tokenExpirationTime); } @@ -472,7 +472,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateIssuedAt) zephir_check_call_status(); tokenIssuedAt = zephir_get_intval(&_2); ZVAL_LONG(&_5, timestamp); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "gettimestamp", NULL, 261, &_5); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "gettimestamp", NULL, 262, &_5); zephir_check_call_status(); if (ZEPHIR_LE_LONG(&_4, tokenIssuedAt)) { ZEPHIR_INIT_ZVAL_NREF(_6$$3); @@ -586,7 +586,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateNotBefore) zephir_check_call_status(); tokenNotBefore = zephir_get_intval(&_2); ZVAL_LONG(&_5, timestamp); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "gettimestamp", NULL, 261, &_5); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "gettimestamp", NULL, 262, &_5); zephir_check_call_status(); if (ZEPHIR_LE_LONG(&_4, tokenNotBefore)) { ZEPHIR_INIT_ZVAL_NREF(_6$$3); @@ -624,7 +624,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateSignature) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(signer, zephir_get_internal_ce(SL("phalcon\\encryption\\security\\jwt\\signer\\signerinterface"))) + Z_PARAM_OBJECT_OF_CLASS(signer, phalcon_encryption_security_jwt_signer_signerinterface_ce) Z_PARAM_STR(passphrase) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/encryption/security/random.zep.c b/ext/phalcon/encryption/security/random.zep.c index 30ae17f949..bfe3c32f1e 100644 --- a/ext/phalcon/encryption/security/random.zep.c +++ b/ext/phalcon/encryption/security/random.zep.c @@ -259,7 +259,7 @@ 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, 224, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 227, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -327,7 +327,7 @@ 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, 224, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "base64_encode", NULL, 227, &_0); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "+/"); @@ -400,7 +400,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Random, bytes) len = 16; } ZVAL_LONG(&_0, len); - ZEPHIR_RETURN_CALL_FUNCTION("random_bytes", NULL, 262, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("random_bytes", NULL, 263, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -453,7 +453,7 @@ 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, 263, &_2, &_0); + ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 264, &_2, &_0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&_3); ZEPHIR_RETURN_CALL_FUNCTION("array_shift", NULL, 21, &_3); @@ -503,7 +503,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Random, number) } ZVAL_LONG(&_0, 0); ZVAL_LONG(&_1, len); - ZEPHIR_RETURN_CALL_FUNCTION("random_int", NULL, 264, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("random_int", NULL, 265, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -555,7 +555,7 @@ 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, 263, &_2, &_0); + ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 264, &_2, &_0); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&ary, "array_values", NULL, 14, &_3); zephir_check_call_status(); @@ -570,7 +570,7 @@ 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, 265, &ary, &_7); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 266, &ary, &_7); ZEPHIR_UNREF(&ary); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_7); @@ -636,7 +636,7 @@ 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, 263, &_1, &_0); + ZEPHIR_CALL_FUNCTION(&bytes, "unpack", NULL, 264, &_1, &_0); zephir_check_call_status(); zephir_is_iterable(&bytes, 0, "phalcon/Encryption/Security/Random.zep", 351); if (Z_TYPE_P(&bytes) == IS_ARRAY) { diff --git a/ext/phalcon/events/abstracteventsaware.zep.c b/ext/phalcon/events/abstracteventsaware.zep.c index e8edbd91a6..bab4ff9f05 100644 --- a/ext/phalcon/events/abstracteventsaware.zep.c +++ b/ext/phalcon/events/abstracteventsaware.zep.c @@ -68,7 +68,7 @@ PHP_METHOD(Phalcon_Events_AbstractEventsAware, setEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/events/manager.zep.c b/ext/phalcon/events/manager.zep.c index 029e96b638..36caac1851 100644 --- a/ext/phalcon/events/manager.zep.c +++ b/ext/phalcon/events/manager.zep.c @@ -137,7 +137,7 @@ PHP_METHOD(Phalcon_Events_Manager, attach) } ZVAL_LONG(&_2$$4, 1); - ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "setextractflags", NULL, 266, &_2$$4); + ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "setextractflags", NULL, 267, &_2$$4); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("events"), &eventType, &priorityQueue); } @@ -146,7 +146,7 @@ PHP_METHOD(Phalcon_Events_Manager, attach) priority = 100; } ZVAL_LONG(&_4, priority); - ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "insert", NULL, 267, handler, &_4); + ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "insert", NULL, 268, handler, &_4); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -259,7 +259,7 @@ PHP_METHOD(Phalcon_Events_Manager, detach) } ZVAL_LONG(&_2$$4, 1); - ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "setextractflags", NULL, 266, &_2$$4); + ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "setextractflags", NULL, 267, &_2$$4); zephir_check_call_status(); ZVAL_LONG(&_2$$4, 3); ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "setextractflags", NULL, 0, &_2$$4); @@ -280,7 +280,7 @@ 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", 134); zephir_array_fetch_string(&_8$$6, &data, SL("priority"), PH_NOISY | PH_READONLY, "phalcon/Events/Manager.zep", 136); - ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "insert", &_9, 267, &_7$$6, &_8$$6); + ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "insert", &_9, 268, &_7$$6, &_8$$6); zephir_check_call_status(); } } @@ -488,19 +488,19 @@ PHP_METHOD(Phalcon_Events_Manager, fire) } else { ZVAL_BOOL(&_4, 0); } - ZEPHIR_CALL_METHOD(NULL, &event, "__construct", NULL, 268, &eventName, source, data, &_4); + ZEPHIR_CALL_METHOD(NULL, &event, "__construct", NULL, 269, &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, 269, &fireEvents, &event); + ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", NULL, 270, &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, 269, &fireEvents, &event); + ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", NULL, 270, &fireEvents, &event); zephir_check_call_status(); } } @@ -539,7 +539,7 @@ PHP_METHOD(Phalcon_Events_Manager, fireQueue) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_OBJECT_OF_CLASS(queue, spl_ce_SplPriorityQueue) - Z_PARAM_OBJECT_OF_CLASS(event, zephir_get_internal_ce(SL("phalcon\\events\\eventinterface"))) + Z_PARAM_OBJECT_OF_CLASS(event, phalcon_events_eventinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/filter/filter.zep.c b/ext/phalcon/filter/filter.zep.c index cba7c413ca..4c684f330d 100644 --- a/ext/phalcon/filter/filter.zep.c +++ b/ext/phalcon/filter/filter.zep.c @@ -265,7 +265,7 @@ 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", 125); - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "createinstance", NULL, 270, &definition); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "createinstance", NULL, 271, &definition); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("services"), &name, &_5$$4); } @@ -354,7 +354,7 @@ PHP_METHOD(Phalcon_Filter_Filter, sanitize) } else { ZVAL_BOOL(&_0$$3, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarraysanitizers", NULL, 271, sanitizers, value, &_0$$3); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarraysanitizers", NULL, 272, sanitizers, value, &_0$$3); zephir_check_call_status(); RETURN_MM(); } @@ -363,11 +363,11 @@ PHP_METHOD(Phalcon_Filter_Filter, sanitize) _1 = !noRecursive; } if (_1) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarrayvalues", NULL, 272, value, sanitizers); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarrayvalues", NULL, 273, value, sanitizers); zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "sanitizer", NULL, 273, value, sanitizers); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "sanitizer", NULL, 274, value, sanitizers); zephir_check_call_status(); RETURN_MM(); } @@ -583,7 +583,7 @@ PHP_METHOD(Phalcon_Filter_Filter, processArraySanitizers) } ZEPHIR_INIT_NVAR(&sanitizer); ZVAL_COPY(&sanitizer, _0); - ZEPHIR_CALL_METHOD(&split, this_ptr, "splitsanitizerparameters", &_4, 274, &sanitizerKey, &sanitizer); + ZEPHIR_CALL_METHOD(&split, this_ptr, "splitsanitizerparameters", &_4, 275, &sanitizerKey, &sanitizer); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&sanitizerName); zephir_array_fetch_long(&sanitizerName, &split, 0, PH_NOISY, "phalcon/Filter/Filter.zep", 281); @@ -595,11 +595,11 @@ PHP_METHOD(Phalcon_Filter_Filter, processArraySanitizers) } else { ZVAL_BOOL(&_6$$5, 0); } - ZEPHIR_CALL_METHOD(&_5$$5, this_ptr, "processvalueisarray", &_7, 275, value, &sanitizerName, &sanitizerParams, &_6$$5); + ZEPHIR_CALL_METHOD(&_5$$5, this_ptr, "processvalueisarray", &_7, 276, value, &sanitizerName, &sanitizerParams, &_6$$5); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_5$$5); } else { - ZEPHIR_CALL_METHOD(&_8$$6, this_ptr, "processvalueisnotarray", &_9, 276, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_8$$6, this_ptr, "processvalueisnotarray", &_9, 277, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_8$$6); } @@ -617,7 +617,7 @@ 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, 274, &sanitizerKey, &sanitizer); + ZEPHIR_CALL_METHOD(&split, this_ptr, "splitsanitizerparameters", &_4, 275, &sanitizerKey, &sanitizer); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&sanitizerName); zephir_array_fetch_long(&sanitizerName, &split, 0, PH_NOISY, "phalcon/Filter/Filter.zep", 281); @@ -629,11 +629,11 @@ PHP_METHOD(Phalcon_Filter_Filter, processArraySanitizers) } else { ZVAL_BOOL(&_11$$8, 0); } - ZEPHIR_CALL_METHOD(&_10$$8, this_ptr, "processvalueisarray", &_7, 275, value, &sanitizerName, &sanitizerParams, &_11$$8); + ZEPHIR_CALL_METHOD(&_10$$8, this_ptr, "processvalueisarray", &_7, 276, value, &sanitizerName, &sanitizerParams, &_11$$8); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_10$$8); } else { - ZEPHIR_CALL_METHOD(&_12$$9, this_ptr, "processvalueisnotarray", &_9, 276, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_12$$9, this_ptr, "processvalueisnotarray", &_9, 277, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_12$$9); } @@ -715,7 +715,7 @@ PHP_METHOD(Phalcon_Filter_Filter, processArrayValues) } ZEPHIR_INIT_NVAR(&itemValue); ZVAL_COPY(&itemValue, _0); - ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "sanitizer", &_5, 273, &itemValue, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "sanitizer", &_5, 274, &itemValue, &sanitizerName, &sanitizerParams); zephir_check_call_status(); zephir_array_update_zval(&arrayValues, &itemKey, &_4$$3, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -732,7 +732,7 @@ 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, 273, &itemValue, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "sanitizer", &_5, 274, &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); @@ -863,11 +863,11 @@ PHP_METHOD(Phalcon_Filter_Filter, processValueIsArray) if (noRecursive) { - ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "sanitizer", NULL, 273, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "sanitizer", NULL, 274, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_0$$3); } else { - ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "processarrayvalues", NULL, 272, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "processarrayvalues", NULL, 273, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_1$$4); } @@ -914,7 +914,7 @@ PHP_METHOD(Phalcon_Filter_Filter, processValueIsNotArray) if (Z_TYPE_P(value) != IS_ARRAY) { - ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "sanitizer", NULL, 273, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "sanitizer", NULL, 274, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_0$$3); } diff --git a/ext/phalcon/filter/filterfactory.zep.c b/ext/phalcon/filter/filterfactory.zep.c index b9d1721b48..3407021a26 100644 --- a/ext/phalcon/filter/filterfactory.zep.c +++ b/ext/phalcon/filter/filterfactory.zep.c @@ -59,7 +59,7 @@ 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, 277, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 278, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/absint.zep.c b/ext/phalcon/filter/sanitize/absint.zep.c index 890ecbb1be..19f9c8f74d 100644 --- a/ext/phalcon/filter/sanitize/absint.zep.c +++ b/ext/phalcon/filter/sanitize/absint.zep.c @@ -66,10 +66,10 @@ PHP_METHOD(Phalcon_Filter_Sanitize_AbsInt, __invoke) ZVAL_LONG(&_0, 519); - ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 278, input, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 279, input, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, zephir_get_intval(&_1)); - ZEPHIR_RETURN_CALL_FUNCTION("abs", NULL, 279, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("abs", NULL, 280, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/email.zep.c b/ext/phalcon/filter/sanitize/email.zep.c index e14ee246ba..3358941b1c 100644 --- a/ext/phalcon/filter/sanitize/email.zep.c +++ b/ext/phalcon/filter/sanitize/email.zep.c @@ -66,7 +66,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_Email, __invoke) ZVAL_LONG(&_0, 517); ZVAL_LONG(&_1, 1048576); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 278, input, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 279, input, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/floatval.zep.c b/ext/phalcon/filter/sanitize/floatval.zep.c index 37e8ced42b..75ed8cb378 100644 --- a/ext/phalcon/filter/sanitize/floatval.zep.c +++ b/ext/phalcon/filter/sanitize/floatval.zep.c @@ -72,7 +72,7 @@ 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, 278, input, &_1, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 279, input, &_1, &_0); zephir_check_call_status(); RETURN_MM_DOUBLE(zephir_get_doubleval(&_2)); } diff --git a/ext/phalcon/filter/sanitize/intval.zep.c b/ext/phalcon/filter/sanitize/intval.zep.c index 1b7056308b..713467512d 100644 --- a/ext/phalcon/filter/sanitize/intval.zep.c +++ b/ext/phalcon/filter/sanitize/intval.zep.c @@ -66,7 +66,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_IntVal, __invoke) ZVAL_LONG(&_0, 519); - ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 278, input, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 279, input, &_0); zephir_check_call_status(); RETURN_MM_LONG(zephir_get_intval(&_1)); } diff --git a/ext/phalcon/filter/sanitize/lower.zep.c b/ext/phalcon/filter/sanitize/lower.zep.c index b219169f94..d1617980a1 100644 --- a/ext/phalcon/filter/sanitize/lower.zep.c +++ b/ext/phalcon/filter/sanitize/lower.zep.c @@ -83,11 +83,11 @@ PHP_METHOD(Phalcon_Filter_Sanitize_Lower, __invoke) ZVAL_LONG(&_0$$3, 1); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "UTF-8"); - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_case", NULL, 11, &input, &_0$$3, &_1$$3); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_case", NULL, 12, &input, &_0$$3, &_1$$3); zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 280, &input); + ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 281, &input); zephir_check_call_status(); zephir_fast_strtolower(return_value, &_2); RETURN_MM(); diff --git a/ext/phalcon/filter/sanitize/special.zep.c b/ext/phalcon/filter/sanitize/special.zep.c index 293595dbff..a385fd928b 100644 --- a/ext/phalcon/filter/sanitize/special.zep.c +++ b/ext/phalcon/filter/sanitize/special.zep.c @@ -64,7 +64,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_Special, __invoke) ZVAL_LONG(&_0, 515); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 278, input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 279, input, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/specialfull.zep.c b/ext/phalcon/filter/sanitize/specialfull.zep.c index 93ec691b8b..ed381b828a 100644 --- a/ext/phalcon/filter/sanitize/specialfull.zep.c +++ b/ext/phalcon/filter/sanitize/specialfull.zep.c @@ -64,7 +64,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_SpecialFull, __invoke) ZVAL_LONG(&_0, 522); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 278, input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 279, input, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/stringval.zep.c b/ext/phalcon/filter/sanitize/stringval.zep.c index b1f4bba8d1..343fd0f299 100644 --- a/ext/phalcon/filter/sanitize/stringval.zep.c +++ b/ext/phalcon/filter/sanitize/stringval.zep.c @@ -73,7 +73,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_StringVal, __invoke) ZVAL_LONG(&_0, flags); - ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 281, &input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 282, &input, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/stringvallegacy.zep.c b/ext/phalcon/filter/sanitize/stringvallegacy.zep.c index 7ecfbe8c60..84d7e18dab 100644 --- a/ext/phalcon/filter/sanitize/stringvallegacy.zep.c +++ b/ext/phalcon/filter/sanitize/stringvallegacy.zep.c @@ -83,7 +83,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_StringValLegacy, __invoke) } if (_0) { ZVAL_LONG(&_2$$3, 513); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 278, input, &_2$$3); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 279, input, &_2$$3); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/striptags.zep.c b/ext/phalcon/filter/sanitize/striptags.zep.c index 8362bb8ff5..4e4425e464 100644 --- a/ext/phalcon/filter/sanitize/striptags.zep.c +++ b/ext/phalcon/filter/sanitize/striptags.zep.c @@ -75,7 +75,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_Striptags, __invoke) } - ZEPHIR_RETURN_CALL_FUNCTION("strip_tags", NULL, 282, &input); + ZEPHIR_RETURN_CALL_FUNCTION("strip_tags", NULL, 283, &input); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/upper.zep.c b/ext/phalcon/filter/sanitize/upper.zep.c index 0da8e49add..f894032d98 100644 --- a/ext/phalcon/filter/sanitize/upper.zep.c +++ b/ext/phalcon/filter/sanitize/upper.zep.c @@ -83,11 +83,11 @@ PHP_METHOD(Phalcon_Filter_Sanitize_Upper, __invoke) ZVAL_LONG(&_0$$3, 0); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "UTF-8"); - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_case", NULL, 11, &input, &_0$$3, &_1$$3); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_case", NULL, 12, &input, &_0$$3, &_1$$3); zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 280, &input); + ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 281, &input); zephir_check_call_status(); zephir_fast_strtoupper(return_value, &_2); RETURN_MM(); diff --git a/ext/phalcon/filter/sanitize/upperwords.zep.c b/ext/phalcon/filter/sanitize/upperwords.zep.c index d9bd4e7628..fac1480a1f 100644 --- a/ext/phalcon/filter/sanitize/upperwords.zep.c +++ b/ext/phalcon/filter/sanitize/upperwords.zep.c @@ -82,13 +82,13 @@ PHP_METHOD(Phalcon_Filter_Sanitize_UpperWords, __invoke) ZVAL_LONG(&_0$$3, 2); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "UTF-8"); - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_case", NULL, 11, &input, &_0$$3, &_1$$3); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_case", NULL, 12, &input, &_0$$3, &_1$$3); zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 280, &input); + ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 281, &input); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ucwords", NULL, 283, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("ucwords", NULL, 284, &_2); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/url.zep.c b/ext/phalcon/filter/sanitize/url.zep.c index 4ec57d8838..9478222d82 100644 --- a/ext/phalcon/filter/sanitize/url.zep.c +++ b/ext/phalcon/filter/sanitize/url.zep.c @@ -64,7 +64,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_Url, __invoke) ZVAL_LONG(&_0, 518); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 278, input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 279, input, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/validation.zep.c b/ext/phalcon/filter/validation.zep.c index d4a720f53e..4e2016cfb3 100644 --- a/ext/phalcon/filter/validation.zep.c +++ b/ext/phalcon/filter/validation.zep.c @@ -159,7 +159,7 @@ PHP_METHOD(Phalcon_Filter_Validation, add) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_ZVAL(field) - Z_PARAM_OBJECT_OF_CLASS(validator, zephir_get_internal_ce(SL("phalcon\\filter\\validation\\validatorinterface"))) + Z_PARAM_OBJECT_OF_CLASS(validator, phalcon_filter_validation_validatorinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -229,7 +229,7 @@ PHP_METHOD(Phalcon_Filter_Validation, appendMessage) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(message, zephir_get_internal_ce(SL("phalcon\\messages\\messageinterface"))) + Z_PARAM_OBJECT_OF_CLASS(message, phalcon_messages_messageinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -246,7 +246,7 @@ 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, 284, message); + ZEPHIR_CALL_METHOD(NULL, &messages, "appendmessage", NULL, 285, message); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("messages"), &messages); RETURN_THIS(); @@ -647,7 +647,7 @@ 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, 285, &entity, &field); + ZEPHIR_CALL_FUNCTION(&_7$$13, "property_exists", NULL, 286, &entity, &field); zephir_check_call_status(); if ((zephir_method_exists(&entity, &method) == SUCCESS)) { ZEPHIR_CALL_METHOD_ZVAL(NULL, &entity, &method, NULL, 0, &value); @@ -689,7 +689,7 @@ PHP_METHOD(Phalcon_Filter_Validation, rule) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_ZVAL(field) - Z_PARAM_OBJECT_OF_CLASS(validator, zephir_get_internal_ce(SL("phalcon\\filter\\validation\\validatorinterface"))) + Z_PARAM_OBJECT_OF_CLASS(validator, phalcon_filter_validation_validatorinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1311,7 +1311,7 @@ PHP_METHOD(Phalcon_Filter_Validation, preChecking) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_ZVAL(field) - Z_PARAM_OBJECT_OF_CLASS(validator, zephir_get_internal_ce(SL("phalcon\\filter\\validation\\validatorinterface"))) + Z_PARAM_OBJECT_OF_CLASS(validator, phalcon_filter_validation_validatorinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1329,7 +1329,7 @@ PHP_METHOD(Phalcon_Filter_Validation, preChecking) { ZEPHIR_INIT_NVAR(&singleField); ZVAL_COPY(&singleField, _0$$3); - ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "prechecking", &_3, 286, &singleField, validator); + ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "prechecking", &_3, 287, &singleField, validator); zephir_check_call_status(); zephir_array_append(&results, &_2$$4, PH_SEPARATE, "phalcon/Filter/Validation.zep", 607); if (zephir_fast_in_array(&__$false, &results)) { @@ -1348,7 +1348,7 @@ 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, 286, &singleField, validator); + ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "prechecking", &_3, 287, &singleField, validator); zephir_check_call_status(); zephir_array_append(&results, &_4$$6, PH_SEPARATE, "phalcon/Filter/Validation.zep", 607); if (zephir_fast_in_array(&__$false, &results)) { diff --git a/ext/phalcon/filter/validation/abstractvalidator.zep.c b/ext/phalcon/filter/validation/abstractvalidator.zep.c index 2e458c61dc..67330d2355 100644 --- a/ext/phalcon/filter/validation/abstractvalidator.zep.c +++ b/ext/phalcon/filter/validation/abstractvalidator.zep.c @@ -550,7 +550,7 @@ PHP_METHOD(Phalcon_Filter_Validation_AbstractValidator, prepareLabel) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_STR(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -670,7 +670,7 @@ PHP_METHOD(Phalcon_Filter_Validation_AbstractValidator, messageFactory) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 3) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(replacements) diff --git a/ext/phalcon/filter/validation/abstractvalidatorcomposite.zep.c b/ext/phalcon/filter/validation/abstractvalidatorcomposite.zep.c index a953cebea0..0657f38044 100644 --- a/ext/phalcon/filter/validation/abstractvalidatorcomposite.zep.c +++ b/ext/phalcon/filter/validation/abstractvalidatorcomposite.zep.c @@ -81,7 +81,7 @@ PHP_METHOD(Phalcon_Filter_Validation_AbstractValidatorComposite, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/filter/validation/validator/alnum.zep.c b/ext/phalcon/filter/validation/validator/alnum.zep.c index 586f883fe5..ef57bf166f 100644 --- a/ext/phalcon/filter/validation/validator/alnum.zep.c +++ b/ext/phalcon/filter/validation/validator/alnum.zep.c @@ -134,7 +134,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Alnum, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -152,7 +152,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Alnum, validate) RETURN_MM_BOOL(1); } zephir_cast_to_string(&_1, &value); - ZEPHIR_CALL_FUNCTION(&_2, "ctype_alnum", NULL, 287, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "ctype_alnum", NULL, 288, &_1); zephir_check_call_status(); if (!(zephir_is_true(&_2))) { ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "messagefactory", NULL, 0, validation, field); diff --git a/ext/phalcon/filter/validation/validator/alpha.zep.c b/ext/phalcon/filter/validation/validator/alpha.zep.c index 65c5a2c43e..5e8a7df752 100644 --- a/ext/phalcon/filter/validation/validator/alpha.zep.c +++ b/ext/phalcon/filter/validation/validator/alpha.zep.c @@ -138,7 +138,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Alpha, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/filter/validation/validator/between.zep.c b/ext/phalcon/filter/validation/validator/between.zep.c index 6abcfc7472..514e98574e 100644 --- a/ext/phalcon/filter/validation/validator/between.zep.c +++ b/ext/phalcon/filter/validation/validator/between.zep.c @@ -152,7 +152,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Between, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/filter/validation/validator/callback.zep.c b/ext/phalcon/filter/validation/validator/callback.zep.c index 5fae0f6124..e0ce7af5f0 100644 --- a/ext/phalcon/filter/validation/validator/callback.zep.c +++ b/ext/phalcon/filter/validation/validator/callback.zep.c @@ -144,7 +144,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Callback, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -165,7 +165,7 @@ 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, 178, &callback, &data); + ZEPHIR_CALL_FUNCTION(&returnedValue, "call_user_func", NULL, 184, &callback, &data); zephir_check_call_status(); _1$$3 = Z_TYPE_P(&returnedValue) == IS_OBJECT; if (_1$$3) { diff --git a/ext/phalcon/filter/validation/validator/confirmation.zep.c b/ext/phalcon/filter/validation/validator/confirmation.zep.c index 0daad2c118..e6c567245f 100644 --- a/ext/phalcon/filter/validation/validator/confirmation.zep.c +++ b/ext/phalcon/filter/validation/validator/confirmation.zep.c @@ -150,7 +150,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Confirmation, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -174,7 +174,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Confirmation, validate) zephir_check_call_status(); zephir_cast_to_string(&_3, &value); zephir_cast_to_string(&_4, &valueWith); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "compare", NULL, 288, &_3, &_4); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "compare", NULL, 289, &_3, &_4); zephir_check_call_status(); if (!(zephir_is_true(&_2))) { ZEPHIR_INIT_VAR(&_5$$4); @@ -257,7 +257,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Confirmation, compare) zephir_check_call_status(); zephir_get_strval(&b, &_5$$3); } - ZEPHIR_CALL_FUNCTION(&_6, "strcmp", NULL, 289, &a, &b); + ZEPHIR_CALL_FUNCTION(&_6, "strcmp", NULL, 290, &a, &b); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_LONG_IDENTICAL(&_6, 0)); } diff --git a/ext/phalcon/filter/validation/validator/creditcard.zep.c b/ext/phalcon/filter/validation/validator/creditcard.zep.c index bc9a82cf1b..ffaeae2bb3 100644 --- a/ext/phalcon/filter/validation/validator/creditcard.zep.c +++ b/ext/phalcon/filter/validation/validator/creditcard.zep.c @@ -134,7 +134,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_CreditCard, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -152,7 +152,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_CreditCard, validate) RETURN_MM_BOOL(1); } zephir_cast_to_string(&_1, &value); - ZEPHIR_CALL_METHOD(&valid, this_ptr, "verifybyluhnalgorithm", NULL, 290, &_1); + ZEPHIR_CALL_METHOD(&valid, this_ptr, "verifybyluhnalgorithm", NULL, 291, &_1); zephir_check_call_status(); if (!(zephir_is_true(&valid))) { ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "messagefactory", NULL, 0, validation, field); @@ -212,7 +212,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_CreditCard, verifyByLuhnAlgorithm zephir_check_call_status(); zephir_get_arrval(&_1, &_0); ZEPHIR_CPY_WRT(&digits, &_1); - ZEPHIR_CALL_FUNCTION(&_3, "array_reverse", NULL, 291, &digits); + ZEPHIR_CALL_FUNCTION(&_3, "array_reverse", NULL, 292, &digits); zephir_check_call_status(); zephir_is_iterable(&_3, 0, "phalcon/Filter/Validation/Validator/CreditCard.zep", 109); if (Z_TYPE_P(&_3) == IS_ARRAY) { @@ -264,7 +264,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_CreditCard, verifyByLuhnAlgorithm ZEPHIR_INIT_NVAR(&position); ZEPHIR_CALL_FUNCTION(&_10, "str_split", NULL, 84, &hash); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&result, "array_sum", NULL, 292, &_10); + ZEPHIR_CALL_FUNCTION(&result, "array_sum", NULL, 293, &_10); zephir_check_call_status(); RETURN_MM_BOOL((zephir_safe_mod_zval_long(&result, 10) == 0)); } diff --git a/ext/phalcon/filter/validation/validator/date.zep.c b/ext/phalcon/filter/validation/validator/date.zep.c index 74bd42cbbb..e616e46d2a 100644 --- a/ext/phalcon/filter/validation/validator/date.zep.c +++ b/ext/phalcon/filter/validation/validator/date.zep.c @@ -142,7 +142,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Date, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -171,7 +171,7 @@ 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, 293, &value, &format); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "checkdate", NULL, 294, &value, &format); zephir_check_call_status(); if (!(zephir_is_true(&_3))) { ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "messagefactory", NULL, 0, validation, field); diff --git a/ext/phalcon/filter/validation/validator/digit.zep.c b/ext/phalcon/filter/validation/validator/digit.zep.c index d3766111a5..2187dede17 100644 --- a/ext/phalcon/filter/validation/validator/digit.zep.c +++ b/ext/phalcon/filter/validation/validator/digit.zep.c @@ -135,7 +135,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Digit, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -155,7 +155,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Digit, validate) _1 = Z_TYPE_P(&value) == IS_LONG; if (!(_1)) { zephir_cast_to_string(&_2, &value); - ZEPHIR_CALL_FUNCTION(&_3, "ctype_digit", NULL, 294, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "ctype_digit", NULL, 295, &_2); zephir_check_call_status(); _1 = zephir_is_true(&_3); } diff --git a/ext/phalcon/filter/validation/validator/email.zep.c b/ext/phalcon/filter/validation/validator/email.zep.c index 9f5cd83ec8..00ee862133 100644 --- a/ext/phalcon/filter/validation/validator/email.zep.c +++ b/ext/phalcon/filter/validation/validator/email.zep.c @@ -133,7 +133,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Email, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -151,7 +151,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Email, validate) RETURN_MM_BOOL(1); } ZVAL_LONG(&_1, 274); - ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 278, &value, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 279, &value, &_1); zephir_check_call_status(); if (!(zephir_is_true(&_2))) { ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "messagefactory", NULL, 0, validation, field); diff --git a/ext/phalcon/filter/validation/validator/exclusionin.zep.c b/ext/phalcon/filter/validation/validator/exclusionin.zep.c index d9d0bf8e6b..e6fc892ae7 100644 --- a/ext/phalcon/filter/validation/validator/exclusionin.zep.c +++ b/ext/phalcon/filter/validation/validator/exclusionin.zep.c @@ -156,7 +156,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_ExclusionIn, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -207,7 +207,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_ExclusionIn, validate) return; } } - ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 295, &value, &domain, &strict); + ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 296, &value, &domain, &strict); zephir_check_call_status(); if (zephir_is_true(&_5)) { ZEPHIR_INIT_VAR(&replacePairs); diff --git a/ext/phalcon/filter/validation/validator/file.zep.c b/ext/phalcon/filter/validation/validator/file.zep.c index 12751bb27c..509396b041 100644 --- a/ext/phalcon/filter/validation/validator/file.zep.c +++ b/ext/phalcon/filter/validation/validator/file.zep.c @@ -242,21 +242,21 @@ 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, 149, &options, &_0$$3); + ZEPHIR_CALL_METHOD(&messageFileEmpty, &helper, "__invoke", NULL, 155, &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, 149, &options, &_1$$4); + ZEPHIR_CALL_METHOD(&messageIniSize, &helper, "__invoke", NULL, 155, &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, 149, &options, &_2$$5); + ZEPHIR_CALL_METHOD(&messageValid, &helper, "__invoke", NULL, 155, &options, &_2$$5); zephir_check_call_status(); zephir_array_unset_string(&options, SL("messageValid"), PH_SEPARATE); } @@ -303,11 +303,11 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) 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, 149, &options, &_16$$7); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 155, &options, &_16$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$7); ZVAL_STRING(&_16$$7, "includedMinSize"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 149, &options, &_16$$7); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 155, &options, &_16$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_min_ce); @@ -316,18 +316,18 @@ 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, 296, &_17$$7); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_18, 297, &_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, 149, &options, &_19$$8); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 155, &options, &_19$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_19$$8); ZVAL_STRING(&_19$$8, "includedSize"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 149, &options, &_19$$8); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 155, &options, &_19$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_max_ce); @@ -336,7 +336,7 @@ 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, 297, &_20$$8); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_21, 298, &_20$$8); zephir_check_call_status(); zephir_array_unset_string(&options, SL("maxSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageSize"), PH_SEPARATE); @@ -344,7 +344,7 @@ 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, 149, &options, &_22$$9); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 155, &options, &_22$$9); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_equal_ce); @@ -352,14 +352,14 @@ 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, 298, &_23$$9); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_24, 299, &_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, 149, &options, &_25$$10); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 155, &options, &_25$$10); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_mimetype_ce); @@ -367,18 +367,18 @@ 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, 299, &_26$$10); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_27, 300, &_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, 149, &options, &_28$$11); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 155, &options, &_28$$11); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_28$$11); ZVAL_STRING(&_28$$11, "includedMaxResolution"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 149, &options, &_28$$11); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 155, &options, &_28$$11); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_max_ce); @@ -387,7 +387,7 @@ 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, 300, &_29$$11); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_30, 301, &_29$$11); zephir_check_call_status(); zephir_array_unset_string(&options, SL("maxResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMaxResolution"), PH_SEPARATE); @@ -395,11 +395,11 @@ 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, 149, &options, &_31$$12); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 155, &options, &_31$$12); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_31$$12); ZVAL_STRING(&_31$$12, "includedMinResolution"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 149, &options, &_31$$12); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 155, &options, &_31$$12); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_min_ce); @@ -408,7 +408,7 @@ 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, 301, &_32$$12); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 302, &_32$$12); zephir_check_call_status(); zephir_array_unset_string(&options, SL("minResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMinResolution"), PH_SEPARATE); @@ -416,7 +416,7 @@ 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, 149, &options, &_34$$13); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 155, &options, &_34$$13); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_equal_ce); @@ -424,7 +424,7 @@ 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, 302, &_35$$13); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 303, &_35$$13); zephir_check_call_status(); zephir_array_unset_string(&options, SL("equalResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageEqualResolution"), PH_SEPARATE); @@ -432,15 +432,15 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) continue; } if (Z_TYPE_P(&messageFileEmpty) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagefileempty", &_37, 303, &messageFileEmpty); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagefileempty", &_37, 304, &messageFileEmpty); zephir_check_call_status(); } if (Z_TYPE_P(&messageIniSize) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessageinisize", &_38, 304, &messageIniSize); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessageinisize", &_38, 305, &messageIniSize); zephir_check_call_status(); } if (Z_TYPE_P(&messageValid) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagevalid", &_39, 305, &messageValid); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagevalid", &_39, 306, &messageValid); zephir_check_call_status(); } zephir_update_property_array_append(this_ptr, SL("validators"), &validator); @@ -489,11 +489,11 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) 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, 149, &options, &_48$$19); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 155, &options, &_48$$19); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_48$$19); ZVAL_STRING(&_48$$19, "includedMinSize"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 149, &options, &_48$$19); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 155, &options, &_48$$19); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_min_ce); @@ -502,18 +502,18 @@ 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, 302, &_49$$19); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 303, &_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, 149, &options, &_50$$20); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 155, &options, &_50$$20); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_50$$20); ZVAL_STRING(&_50$$20, "includedSize"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 149, &options, &_50$$20); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 155, &options, &_50$$20); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_max_ce); @@ -522,7 +522,7 @@ 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, 302, &_51$$20); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 303, &_51$$20); zephir_check_call_status(); zephir_array_unset_string(&options, SL("maxSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageSize"), PH_SEPARATE); @@ -530,7 +530,7 @@ 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, 149, &options, &_52$$21); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 155, &options, &_52$$21); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_equal_ce); @@ -538,14 +538,14 @@ 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, 302, &_53$$21); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 303, &_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, 149, &options, &_54$$22); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 155, &options, &_54$$22); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_mimetype_ce); @@ -553,18 +553,18 @@ 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, 302, &_55$$22); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 303, &_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, 149, &options, &_56$$23); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 155, &options, &_56$$23); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_56$$23); ZVAL_STRING(&_56$$23, "includedMaxResolution"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 149, &options, &_56$$23); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 155, &options, &_56$$23); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_max_ce); @@ -573,7 +573,7 @@ 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, 302, &_57$$23); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 303, &_57$$23); zephir_check_call_status(); zephir_array_unset_string(&options, SL("maxResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMaxResolution"), PH_SEPARATE); @@ -581,11 +581,11 @@ 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, 149, &options, &_58$$24); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 155, &options, &_58$$24); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_58$$24); ZVAL_STRING(&_58$$24, "includedMinResolution"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 149, &options, &_58$$24); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 155, &options, &_58$$24); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_min_ce); @@ -594,7 +594,7 @@ 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, 302, &_59$$24); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 303, &_59$$24); zephir_check_call_status(); zephir_array_unset_string(&options, SL("minResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMinResolution"), PH_SEPARATE); @@ -602,7 +602,7 @@ 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, 149, &options, &_60$$25); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 155, &options, &_60$$25); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_equal_ce); @@ -610,7 +610,7 @@ 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, 302, &_61$$25); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 303, &_61$$25); zephir_check_call_status(); zephir_array_unset_string(&options, SL("equalResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageEqualResolution"), PH_SEPARATE); @@ -618,15 +618,15 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) continue; } if (Z_TYPE_P(&messageFileEmpty) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagefileempty", &_37, 303, &messageFileEmpty); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagefileempty", &_37, 304, &messageFileEmpty); zephir_check_call_status(); } if (Z_TYPE_P(&messageIniSize) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessageinisize", &_38, 304, &messageIniSize); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessageinisize", &_38, 305, &messageIniSize); zephir_check_call_status(); } if (Z_TYPE_P(&messageValid) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagevalid", &_39, 305, &messageValid); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagevalid", &_39, 306, &messageValid); zephir_check_call_status(); } zephir_update_property_array_append(this_ptr, SL("validators"), &validator); diff --git a/ext/phalcon/filter/validation/validator/file/abstractfile.zep.c b/ext/phalcon/filter/validation/validator/file/abstractfile.zep.c index 4e629a2917..964f60368c 100644 --- a/ext/phalcon/filter/validation/validator/file/abstractfile.zep.c +++ b/ext/phalcon/filter/validation/validator/file/abstractfile.zep.c @@ -118,7 +118,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkUpload) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -176,7 +176,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkUploadIsE #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -257,7 +257,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkUploadIsV #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -336,7 +336,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkUploadMax #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -550,7 +550,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, isAllowEmpty) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_STR(field) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/filter/validation/validator/file/mimetype.zep.c b/ext/phalcon/filter/validation/validator/file/mimetype.zep.c index 240d77636c..5945ec2c6d 100644 --- a/ext/phalcon/filter/validation/validator/file/mimetype.zep.c +++ b/ext/phalcon/filter/validation/validator/file/mimetype.zep.c @@ -116,7 +116,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_MimeType, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -147,12 +147,12 @@ 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, 306, &_2$$6); + ZEPHIR_CALL_FUNCTION(&tmp, "finfo_open", NULL, 307, &_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, 307, &tmp, &_3$$6); + ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 308, &tmp, &_3$$6); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 308, &tmp); + ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 309, &tmp); zephir_check_call_status(); } else { ZEPHIR_OBS_NVAR(&mime); diff --git a/ext/phalcon/filter/validation/validator/file/resolution/equal.zep.c b/ext/phalcon/filter/validation/validator/file/resolution/equal.zep.c index 9d5c6c2c67..7f0e59ab96 100644 --- a/ext/phalcon/filter/validation/validator/file/resolution/equal.zep.c +++ b/ext/phalcon/filter/validation/validator/file/resolution/equal.zep.c @@ -151,7 +151,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Resolution_Equal, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -169,7 +169,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Resolution_Equal, validate) 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, 309, &_1); + ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 310, &_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); diff --git a/ext/phalcon/filter/validation/validator/file/resolution/max.zep.c b/ext/phalcon/filter/validation/validator/file/resolution/max.zep.c index b2e01a18ab..d344a114a1 100644 --- a/ext/phalcon/filter/validation/validator/file/resolution/max.zep.c +++ b/ext/phalcon/filter/validation/validator/file/resolution/max.zep.c @@ -160,7 +160,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Resolution_Max, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -180,7 +180,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Resolution_Max, validate) 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, 309, &_1); + ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 310, &_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); diff --git a/ext/phalcon/filter/validation/validator/file/resolution/min.zep.c b/ext/phalcon/filter/validation/validator/file/resolution/min.zep.c index 71fa7ea55a..2fa7a80877 100644 --- a/ext/phalcon/filter/validation/validator/file/resolution/min.zep.c +++ b/ext/phalcon/filter/validation/validator/file/resolution/min.zep.c @@ -160,7 +160,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Resolution_Min, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -180,7 +180,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Resolution_Min, validate) 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, 309, &_1); + ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 310, &_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); diff --git a/ext/phalcon/filter/validation/validator/file/size/equal.zep.c b/ext/phalcon/filter/validation/validator/file/size/equal.zep.c index b186b82eff..1e06724c21 100644 --- a/ext/phalcon/filter/validation/validator/file/size/equal.zep.c +++ b/ext/phalcon/filter/validation/validator/file/size/equal.zep.c @@ -154,7 +154,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Size_Equal, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/filter/validation/validator/file/size/max.zep.c b/ext/phalcon/filter/validation/validator/file/size/max.zep.c index b1a480b056..079a659bdd 100644 --- a/ext/phalcon/filter/validation/validator/file/size/max.zep.c +++ b/ext/phalcon/filter/validation/validator/file/size/max.zep.c @@ -159,7 +159,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Size_Max, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/filter/validation/validator/file/size/min.zep.c b/ext/phalcon/filter/validation/validator/file/size/min.zep.c index a5d4e57425..8f9ec53e1c 100644 --- a/ext/phalcon/filter/validation/validator/file/size/min.zep.c +++ b/ext/phalcon/filter/validation/validator/file/size/min.zep.c @@ -159,7 +159,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Size_Min, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/filter/validation/validator/identical.zep.c b/ext/phalcon/filter/validation/validator/identical.zep.c index eb7bcd4665..834832639b 100644 --- a/ext/phalcon/filter/validation/validator/identical.zep.c +++ b/ext/phalcon/filter/validation/validator/identical.zep.c @@ -147,7 +147,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Identical, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/filter/validation/validator/inclusionin.zep.c b/ext/phalcon/filter/validation/validator/inclusionin.zep.c index 2455b3ac43..d9affc22cf 100644 --- a/ext/phalcon/filter/validation/validator/inclusionin.zep.c +++ b/ext/phalcon/filter/validation/validator/inclusionin.zep.c @@ -150,7 +150,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_InclusionIn, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -201,7 +201,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_InclusionIn, validate) return; } } - ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 295, &value, &domain, &strict); + ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 296, &value, &domain, &strict); zephir_check_call_status(); if (!(zephir_is_true(&_5))) { ZEPHIR_INIT_VAR(&replacePairs); diff --git a/ext/phalcon/filter/validation/validator/ip.zep.c b/ext/phalcon/filter/validation/validator/ip.zep.c index 9989761738..ad3bb49fc9 100644 --- a/ext/phalcon/filter/validation/validator/ip.zep.c +++ b/ext/phalcon/filter/validation/validator/ip.zep.c @@ -172,7 +172,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Ip, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -240,7 +240,7 @@ 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, 278, &value, &_2, &options); + ZEPHIR_CALL_FUNCTION(&_11, "filter_var", NULL, 279, &value, &_2, &options); zephir_check_call_status(); if (!(zephir_is_true(&_11))) { ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "messagefactory", NULL, 0, validation, field); diff --git a/ext/phalcon/filter/validation/validator/numericality.zep.c b/ext/phalcon/filter/validation/validator/numericality.zep.c index cb293d0559..4a34729923 100644 --- a/ext/phalcon/filter/validation/validator/numericality.zep.c +++ b/ext/phalcon/filter/validation/validator/numericality.zep.c @@ -139,7 +139,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Numericality, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/filter/validation/validator/presenceof.zep.c b/ext/phalcon/filter/validation/validator/presenceof.zep.c index 7b1e270384..909ecfb6d7 100644 --- a/ext/phalcon/filter/validation/validator/presenceof.zep.c +++ b/ext/phalcon/filter/validation/validator/presenceof.zep.c @@ -132,7 +132,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_PresenceOf, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/filter/validation/validator/regex.zep.c b/ext/phalcon/filter/validation/validator/regex.zep.c index b24d7a4133..a4f26e3999 100644 --- a/ext/phalcon/filter/validation/validator/regex.zep.c +++ b/ext/phalcon/filter/validation/validator/regex.zep.c @@ -145,7 +145,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Regex, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/filter/validation/validator/stringlength.zep.c b/ext/phalcon/filter/validation/validator/stringlength.zep.c index 5bc34c2782..423ec383a7 100644 --- a/ext/phalcon/filter/validation/validator/stringlength.zep.c +++ b/ext/phalcon/filter/validation/validator/stringlength.zep.c @@ -205,7 +205,7 @@ 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, 310, &_8$$4); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_9, 311, &_8$$4); zephir_check_call_status(); zephir_array_unset_string(&options, SL("min"), PH_SEPARATE); zephir_array_unset_string(&options, SL("message"), PH_SEPARATE); @@ -234,7 +234,7 @@ 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, 311, &_10$$9); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 312, &_10$$9); zephir_check_call_status(); zephir_array_unset_string(&options, SL("max"), PH_SEPARATE); zephir_array_unset_string(&options, SL("message"), PH_SEPARATE); @@ -289,7 +289,7 @@ 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, 311, &_15$$16); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 312, &_15$$16); zephir_check_call_status(); zephir_array_unset_string(&options, SL("min"), PH_SEPARATE); zephir_array_unset_string(&options, SL("message"), PH_SEPARATE); @@ -318,7 +318,7 @@ 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, 311, &_16$$21); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 312, &_16$$21); zephir_check_call_status(); zephir_array_unset_string(&options, SL("max"), PH_SEPARATE); zephir_array_unset_string(&options, SL("message"), PH_SEPARATE); diff --git a/ext/phalcon/filter/validation/validator/stringlength/max.zep.c b/ext/phalcon/filter/validation/validator/stringlength/max.zep.c index ebafa6bcae..d565fe356b 100644 --- a/ext/phalcon/filter/validation/validator/stringlength/max.zep.c +++ b/ext/phalcon/filter/validation/validator/stringlength/max.zep.c @@ -159,7 +159,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength_Max, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -178,7 +178,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength_Max, validate) } if ((zephir_function_exists_ex(ZEND_STRL("mb_strlen")) == SUCCESS)) { zephir_cast_to_string(&_1$$4, &value); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 227, &_1$$4); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 230, &_1$$4); zephir_check_call_status(); } else { zephir_cast_to_string(&_2$$5, &value); diff --git a/ext/phalcon/filter/validation/validator/stringlength/min.zep.c b/ext/phalcon/filter/validation/validator/stringlength/min.zep.c index 536abb60ea..92a945c4e3 100644 --- a/ext/phalcon/filter/validation/validator/stringlength/min.zep.c +++ b/ext/phalcon/filter/validation/validator/stringlength/min.zep.c @@ -159,7 +159,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength_Min, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -178,7 +178,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength_Min, validate) } if ((zephir_function_exists_ex(ZEND_STRL("mb_strlen")) == SUCCESS)) { zephir_cast_to_string(&_1$$4, &value); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 227, &_1$$4); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 230, &_1$$4); zephir_check_call_status(); } else { zephir_cast_to_string(&_2$$5, &value); diff --git a/ext/phalcon/filter/validation/validator/uniqueness.zep.c b/ext/phalcon/filter/validation/validator/uniqueness.zep.c index 4b104117ef..bf6299a185 100644 --- a/ext/phalcon/filter/validation/validator/uniqueness.zep.c +++ b/ext/phalcon/filter/validation/validator/uniqueness.zep.c @@ -176,7 +176,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Uniqueness, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -301,7 +301,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Uniqueness, isUniqueness) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -648,7 +648,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Uniqueness, isUniquenessModel) 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, 312, &_11$$6, &_12$$6); + ZEPHIR_CALL_FUNCTION(&_13$$6, "range", &_14, 313, &_11$$6, &_12$$6); zephir_check_call_status(); _9$$6 = !ZEPHIR_IS_IDENTICAL(&_10$$6, &_13$$6); } @@ -1052,7 +1052,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Uniqueness, isUniquenessModel) 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, 312, &_89$$37, &_90$$37); + ZEPHIR_CALL_FUNCTION(&_91$$37, "range", &_14, 313, &_89$$37, &_90$$37); zephir_check_call_status(); _87$$37 = !ZEPHIR_IS_IDENTICAL(&_88$$37, &_91$$37); } diff --git a/ext/phalcon/filter/validation/validator/url.zep.c b/ext/phalcon/filter/validation/validator/url.zep.c index 7cf2939980..8ea3908957 100644 --- a/ext/phalcon/filter/validation/validator/url.zep.c +++ b/ext/phalcon/filter/validation/validator/url.zep.c @@ -138,7 +138,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Url, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_ce) Z_PARAM_ZVAL(field) ZEND_PARSE_PARAMETERS_END(); #endif @@ -159,11 +159,11 @@ 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, 278, &value, &_2$$4, &options); + ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 279, &value, &_2$$4, &options); zephir_check_call_status(); } else { ZVAL_LONG(&_3$$5, 273); - ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 278, &value, &_3$$5); + ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 279, &value, &_3$$5); zephir_check_call_status(); } if (!(zephir_is_true(&result))) { diff --git a/ext/phalcon/flash/abstractflash.zep.c b/ext/phalcon/flash/abstractflash.zep.c index 0a637f8f31..76cb89225f 100644 --- a/ext/phalcon/flash/abstractflash.zep.c +++ b/ext/phalcon/flash/abstractflash.zep.c @@ -117,8 +117,8 @@ PHP_METHOD(Phalcon_Flash_AbstractFlash, __construct) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 2) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(escaper, zephir_get_internal_ce(SL("phalcon\\html\\escaper\\escaperinterface"))) - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(session, zephir_get_internal_ce(SL("phalcon\\session\\managerinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(escaper, phalcon_html_escaper_escaperinterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(session, phalcon_session_managerinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -548,7 +548,7 @@ PHP_METHOD(Phalcon_Flash_AbstractFlash, setEscaperService) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(escaperService, zephir_get_internal_ce(SL("phalcon\\html\\escaper\\escaperinterface"))) + Z_PARAM_OBJECT_OF_CLASS(escaperService, phalcon_html_escaper_escaperinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/forms/element/abstractelement.zep.c b/ext/phalcon/forms/element/abstractelement.zep.c index 5e4b243621..69996a2b05 100644 --- a/ext/phalcon/forms/element/abstractelement.zep.c +++ b/ext/phalcon/forms/element/abstractelement.zep.c @@ -224,7 +224,7 @@ PHP_METHOD(Phalcon_Forms_Element_AbstractElement, addValidator) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(validator, zephir_get_internal_ce(SL("phalcon\\filter\\validation\\validatorinterface"))) + Z_PARAM_OBJECT_OF_CLASS(validator, phalcon_filter_validation_validatorinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -326,7 +326,7 @@ PHP_METHOD(Phalcon_Forms_Element_AbstractElement, appendMessage) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(message, zephir_get_internal_ce(SL("phalcon\\messages\\messageinterface"))) + Z_PARAM_OBJECT_OF_CLASS(message, phalcon_messages_messageinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -898,7 +898,7 @@ PHP_METHOD(Phalcon_Forms_Element_AbstractElement, setForm) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(form, zephir_get_internal_ce(SL("phalcon\\forms\\form"))) + Z_PARAM_OBJECT_OF_CLASS(form, phalcon_forms_form_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -950,7 +950,7 @@ PHP_METHOD(Phalcon_Forms_Element_AbstractElement, setMessages) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(messages, zephir_get_internal_ce(SL("phalcon\\messages\\messages"))) + Z_PARAM_OBJECT_OF_CLASS(messages, phalcon_messages_messages_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1010,7 +1010,7 @@ PHP_METHOD(Phalcon_Forms_Element_AbstractElement, setTagFactory) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(tagFactory, zephir_get_internal_ce(SL("phalcon\\html\\tagfactory"))) + Z_PARAM_OBJECT_OF_CLASS(tagFactory, phalcon_html_tagfactory_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/forms/form.zep.c b/ext/phalcon/forms/form.zep.c index 8f2b028c1f..1738c3d6c9 100644 --- a/ext/phalcon/forms/form.zep.c +++ b/ext/phalcon/forms/form.zep.c @@ -186,7 +186,7 @@ PHP_METHOD(Phalcon_Forms_Form, add) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 3) - Z_PARAM_OBJECT_OF_CLASS(element, zephir_get_internal_ce(SL("phalcon\\forms\\element\\elementinterface"))) + Z_PARAM_OBJECT_OF_CLASS(element, phalcon_forms_element_elementinterface_ce) Z_PARAM_OPTIONAL Z_PARAM_STR_OR_NULL(position) Z_PARAM_BOOL_OR_NULL(type, is_null_true) @@ -1430,7 +1430,7 @@ 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, 313); + ZEPHIR_CALL_METHOD(NULL, &validation, "__construct", NULL, 314); zephir_check_call_status(); } zephir_read_property(&_8, this_ptr, ZEND_STRL("elements"), PH_NOISY_CC | PH_READONLY); @@ -1453,7 +1453,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) { ZEPHIR_INIT_NVAR(&validator); ZVAL_COPY(&validator, _11$$10); - ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 314, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 315, &name, &validator); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -1467,7 +1467,7 @@ 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, 314, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 315, &name, &validator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &validators, "next", NULL, 0); zephir_check_call_status(); @@ -1477,7 +1477,7 @@ 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, 315, &name, &filters); + ZEPHIR_CALL_METHOD(NULL, &validation, "setfilters", &_14, 316, &name, &filters); zephir_check_call_status(); } } ZEND_HASH_FOREACH_END(); @@ -1505,7 +1505,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) { ZEPHIR_INIT_NVAR(&validator); ZVAL_COPY(&validator, _15$$15); - ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 314, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 315, &name, &validator); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -1519,7 +1519,7 @@ 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, 314, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 315, &name, &validator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &validators, "next", NULL, 0); zephir_check_call_status(); @@ -1529,7 +1529,7 @@ 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, 315, &name, &filters); + ZEPHIR_CALL_METHOD(NULL, &validation, "setfilters", &_14, 316, &name, &filters); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, &_8, "next", NULL, 0); @@ -1537,7 +1537,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) } } ZEPHIR_INIT_NVAR(&element); - ZEPHIR_CALL_METHOD(&messages, &validation, "validate", NULL, 316, data, entity); + ZEPHIR_CALL_METHOD(&messages, &validation, "validate", NULL, 317, data, entity); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_17, &messages, "count", NULL, 0); zephir_check_call_status(); @@ -1854,7 +1854,7 @@ PHP_METHOD(Phalcon_Forms_Form, setAttributes) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(attributes, zephir_get_internal_ce(SL("phalcon\\html\\attributes"))) + Z_PARAM_OBJECT_OF_CLASS(attributes, phalcon_html_attributes_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1904,7 +1904,7 @@ PHP_METHOD(Phalcon_Forms_Form, setTagFactory) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(tagFactory, zephir_get_internal_ce(SL("phalcon\\html\\tagfactory"))) + Z_PARAM_OBJECT_OF_CLASS(tagFactory, phalcon_html_tagfactory_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1930,7 +1930,7 @@ PHP_METHOD(Phalcon_Forms_Form, setValidation) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(validation, zephir_get_internal_ce(SL("phalcon\\filter\\validation\\validationinterface"))) + Z_PARAM_OBJECT_OF_CLASS(validation, phalcon_filter_validation_validationinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/forms/manager.zep.c b/ext/phalcon/forms/manager.zep.c index aded136590..7eb311748c 100644 --- a/ext/phalcon/forms/manager.zep.c +++ b/ext/phalcon/forms/manager.zep.c @@ -83,7 +83,7 @@ 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, 317, entity); + ZEPHIR_CALL_METHOD(NULL, &form, "__construct", NULL, 318, entity); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("forms"), &name, &form); RETURN_CCTOR(&form); @@ -179,7 +179,7 @@ PHP_METHOD(Phalcon_Forms_Manager, set) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(name) - Z_PARAM_OBJECT_OF_CLASS(form, zephir_get_internal_ce(SL("phalcon\\forms\\form"))) + Z_PARAM_OBJECT_OF_CLASS(form, phalcon_forms_form_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/html/attributes.zep.c b/ext/phalcon/html/attributes.zep.c index af5484fd46..04c12c18b4 100644 --- a/ext/phalcon/html/attributes.zep.c +++ b/ext/phalcon/html/attributes.zep.c @@ -164,7 +164,7 @@ 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, 281, &value, &_5$$4, &_6$$4, &__$true); + ZEPHIR_CALL_FUNCTION(&_7$$4, "htmlspecialchars", &_8, 282, &value, &_5$$4, &_6$$4, &__$true); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_9$$4); ZEPHIR_CONCAT_VSVS(&_9$$4, &key, "=\"", &_7$$4, "\" "); @@ -192,7 +192,7 @@ 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, 281, &value, &_11$$6, &_12$$6, &__$true); + ZEPHIR_CALL_FUNCTION(&_13$$6, "htmlspecialchars", &_8, 282, &value, &_11$$6, &_12$$6, &__$true); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_14$$6); ZEPHIR_CONCAT_VSVS(&_14$$6, &key, "=\"", &_13$$6, "\" "); diff --git a/ext/phalcon/html/breadcrumbs.zep.c b/ext/phalcon/html/breadcrumbs.zep.c index dd47c46280..7de994f339 100644 --- a/ext/phalcon/html/breadcrumbs.zep.c +++ b/ext/phalcon/html/breadcrumbs.zep.c @@ -241,7 +241,7 @@ 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, 318, &urls); + ZEPHIR_CALL_FUNCTION(&lastUrl, "end", NULL, 319, &urls); ZEPHIR_UNREF(&urls); zephir_check_call_status(); ZEPHIR_OBS_VAR(&lastLabel); diff --git a/ext/phalcon/html/escaper.zep.c b/ext/phalcon/html/escaper.zep.c index 082607f42d..fee9465f84 100644 --- a/ext/phalcon/html/escaper.zep.c +++ b/ext/phalcon/html/escaper.zep.c @@ -257,9 +257,9 @@ PHP_METHOD(Phalcon_Html_Escaper, css) zephir_get_strval(&input, input_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 319, &input); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 320, &input); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapecss", NULL, 320, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapecss", NULL, 321, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -332,7 +332,7 @@ PHP_METHOD(Phalcon_Html_Escaper, detectEncoding) { ZEPHIR_INIT_NVAR(&charset); ZVAL_COPY(&charset, _2); - ZEPHIR_CALL_FUNCTION(&_4$$5, "mb_detect_encoding", &_5, 321, &input, &charset, &__$true); + ZEPHIR_CALL_FUNCTION(&_4$$5, "mb_detect_encoding", &_5, 322, &input, &charset, &__$true); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&_4$$5)) { RETURN_CCTOR(&charset); @@ -349,7 +349,7 @@ 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, 321, &input, &charset, &__$true); + ZEPHIR_CALL_FUNCTION(&_6$$7, "mb_detect_encoding", &_5, 322, &input, &charset, &__$true); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&_6$$7)) { RETURN_CCTOR(&charset); @@ -359,7 +359,7 @@ PHP_METHOD(Phalcon_Html_Escaper, detectEncoding) } } ZEPHIR_INIT_NVAR(&charset); - ZEPHIR_RETURN_CALL_FUNCTION("mb_detect_encoding", &_5, 321, &input); + ZEPHIR_RETURN_CALL_FUNCTION("mb_detect_encoding", &_5, 322, &input); zephir_check_call_status(); RETURN_MM(); } @@ -622,7 +622,7 @@ 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, 281, &input, &_0, &_1, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 282, &input, &_0, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -658,9 +658,9 @@ PHP_METHOD(Phalcon_Html_Escaper, js) zephir_get_strval(&input, input_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 319, &input); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 320, &input); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapejs", NULL, 322, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapejs", NULL, 323, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -696,11 +696,11 @@ PHP_METHOD(Phalcon_Html_Escaper, normalizeEncoding) zephir_get_strval(&input, input_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "detectencoding", NULL, 323, &input); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "detectencoding", NULL, 324, &input); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "UTF-32"); - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 324, &input, &_1, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 325, &input, &_1, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -876,7 +876,7 @@ PHP_METHOD(Phalcon_Html_Escaper, url) zephir_get_strval(&input, input_param); - ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 325, &input); + ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 326, &input); zephir_check_call_status(); RETURN_MM(); } @@ -916,7 +916,7 @@ PHP_METHOD(Phalcon_Html_Escaper, phpHtmlSpecialChars) 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, 281, &input, &_0, &_1, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 282, &input, &_0, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/html/helper/abstracthelper.zep.c b/ext/phalcon/html/helper/abstracthelper.zep.c index f8cfbf57a7..183ed41a95 100644 --- a/ext/phalcon/html/helper/abstracthelper.zep.c +++ b/ext/phalcon/html/helper/abstracthelper.zep.c @@ -74,7 +74,7 @@ PHP_METHOD(Phalcon_Html_Helper_AbstractHelper, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(escaper, zephir_get_internal_ce(SL("phalcon\\html\\escaper\\escaperinterface"))) + Z_PARAM_OBJECT_OF_CLASS(escaper, phalcon_html_escaper_escaperinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/html/helper/input/checkbox.zep.c b/ext/phalcon/html/helper/input/checkbox.zep.c index 04ce62c3ea..53ac8f5fa2 100644 --- a/ext/phalcon/html/helper/input/checkbox.zep.c +++ b/ext/phalcon/html/helper/input/checkbox.zep.c @@ -69,7 +69,7 @@ PHP_METHOD(Phalcon_Html_Helper_Input_Checkbox, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(escaper, zephir_get_internal_ce(SL("phalcon\\html\\escaper\\escaperinterface"))) + Z_PARAM_OBJECT_OF_CLASS(escaper, phalcon_html_escaper_escaperinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/html/helper/input/select.zep.c b/ext/phalcon/html/helper/input/select.zep.c index 5be0fbff35..522e5c5b66 100644 --- a/ext/phalcon/html/helper/input/select.zep.c +++ b/ext/phalcon/html/helper/input/select.zep.c @@ -115,7 +115,7 @@ PHP_METHOD(Phalcon_Html_Helper_Input_Select, add) } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "processvalue", NULL, 326, &attributes, &value); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "processvalue", NULL, 327, &attributes, &value); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attributes, &_0); ZEPHIR_INIT_VAR(&_1); diff --git a/ext/phalcon/html/helper/meta.zep.c b/ext/phalcon/html/helper/meta.zep.c index c15f01171a..fca49590d3 100644 --- a/ext/phalcon/html/helper/meta.zep.c +++ b/ext/phalcon/html/helper/meta.zep.c @@ -130,7 +130,7 @@ PHP_METHOD(Phalcon_Html_Helper_Meta, addHttp) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "http-equiv"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addelement", NULL, 327, &_0, &httpEquiv, &content); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addelement", NULL, 328, &_0, &httpEquiv, &content); zephir_check_call_status(); RETURN_MM(); } @@ -170,7 +170,7 @@ PHP_METHOD(Phalcon_Html_Helper_Meta, addName) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "name"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 327, &_0, &name, &content); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 328, &_0, &name, &content); zephir_check_call_status(); RETURN_THIS(); } @@ -210,7 +210,7 @@ PHP_METHOD(Phalcon_Html_Helper_Meta, addProperty) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "property"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 327, &_0, &name, &content); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 328, &_0, &name, &content); zephir_check_call_status(); RETURN_THIS(); } diff --git a/ext/phalcon/html/helper/title.zep.c b/ext/phalcon/html/helper/title.zep.c index 3a2ad5c663..8048a279cb 100644 --- a/ext/phalcon/html/helper/title.zep.c +++ b/ext/phalcon/html/helper/title.zep.c @@ -158,7 +158,7 @@ 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, 328, &_0, &_1, &_3); + ZEPHIR_CALL_FUNCTION(&items, "array_merge", NULL, 329, &_0, &_1, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); array_init(&_4); @@ -412,7 +412,7 @@ PHP_METHOD(Phalcon_Html_Helper_Title, prepend) zephir_read_property(&_2, this_ptr, ZEND_STRL("prepend"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&prepend, &_2); ZEPHIR_MAKE_REF(&prepend); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 265, &prepend, &text); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 266, &prepend, &text); ZEPHIR_UNREF(&prepend); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("prepend"), &prepend); diff --git a/ext/phalcon/html/link/evolvablelinkprovider.zep.c b/ext/phalcon/html/link/evolvablelinkprovider.zep.c index 73d49a4701..50d7cedffb 100644 --- a/ext/phalcon/html/link/evolvablelinkprovider.zep.c +++ b/ext/phalcon/html/link/evolvablelinkprovider.zep.c @@ -61,7 +61,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("phalcon\\html\\link\\interfaces\\linkinterface"))) + Z_PARAM_OBJECT_OF_CLASS(link, phalcon_html_link_interfaces_linkinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -98,7 +98,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("phalcon\\html\\link\\interfaces\\linkinterface"))) + Z_PARAM_OBJECT_OF_CLASS(link, phalcon_html_link_interfaces_linkinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/html/tagfactory.zep.c b/ext/phalcon/html/tagfactory.zep.c index 3f4a6bc0e1..3275381f0b 100644 --- a/ext/phalcon/html/tagfactory.zep.c +++ b/ext/phalcon/html/tagfactory.zep.c @@ -119,7 +119,7 @@ PHP_METHOD(Phalcon_Html_TagFactory, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(escaper, zephir_get_internal_ce(SL("phalcon\\html\\escaper\\escaperinterface"))) + Z_PARAM_OBJECT_OF_CLASS(escaper, phalcon_html_escaper_escaperinterface_ce) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(services) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/phalcon/http/cookie.zep.c b/ext/phalcon/http/cookie.zep.c index a78297b23f..5155df3123 100644 --- a/ext/phalcon/http/cookie.zep.c +++ b/ext/phalcon/http/cookie.zep.c @@ -311,32 +311,32 @@ 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, 329, &options, &_8, &_0); + ZEPHIR_CALL_METHOD(&_7, this_ptr, "getarrval", NULL, 330, &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, 329, &options, &_8, &domain); + ZEPHIR_CALL_METHOD(&_9, this_ptr, "getarrval", NULL, 330, &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, 329, &options, &_8, &path); + ZEPHIR_CALL_METHOD(&_10, this_ptr, "getarrval", NULL, 330, &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, 329, &options, &_8, &secure); + ZEPHIR_CALL_METHOD(&_11, this_ptr, "getarrval", NULL, 330, &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, 329, &options, &_8, &httpOnly); + ZEPHIR_CALL_METHOD(&_12, this_ptr, "getarrval", NULL, 330, &options, &_8, &httpOnly); zephir_check_call_status(); zephir_array_update_string(&options, SL("httponly"), &_12, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_8); ZVAL_STRING(&_8, ""); - ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 330, &name, &_8, &options); + ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 331, &name, &_8, &options); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -857,30 +857,30 @@ PHP_METHOD(Phalcon_Http_Cookie, send) } ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "expires"); - ZEPHIR_CALL_METHOD(&_13, this_ptr, "getarrval", NULL, 329, &options, &_3, &expire); + ZEPHIR_CALL_METHOD(&_13, this_ptr, "getarrval", NULL, 330, &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, 329, &options, &_3, &domain); + ZEPHIR_CALL_METHOD(&_14, this_ptr, "getarrval", NULL, 330, &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, 329, &options, &_3, &path); + ZEPHIR_CALL_METHOD(&_15, this_ptr, "getarrval", NULL, 330, &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, 329, &options, &_3, &secure); + ZEPHIR_CALL_METHOD(&_16, this_ptr, "getarrval", NULL, 330, &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, 329, &options, &_3, &httpOnly); + ZEPHIR_CALL_METHOD(&_17, this_ptr, "getarrval", NULL, 330, &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, 330, &name, &encryptValue, &options); + ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 331, &name, &encryptValue, &options); zephir_check_call_status(); RETURN_THIS(); } @@ -1264,14 +1264,14 @@ PHP_METHOD(Phalcon_Http_Cookie, assertSignKeyIsLongEnough) } - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 227, &signKey); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 230, &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, 107, &_1$$3, &length); + ZEPHIR_CALL_FUNCTION(&_2$$3, "sprintf", NULL, 113, &_1$$3, &length); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 29, &_2$$3); zephir_check_call_status(); diff --git a/ext/phalcon/http/request.zep.c b/ext/phalcon/http/request.zep.c index 487f24fce9..6a01653d31 100644 --- a/ext/phalcon/http/request.zep.c +++ b/ext/phalcon/http/request.zep.c @@ -184,7 +184,7 @@ PHP_METHOD(Phalcon_Http_Request, get) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 331, &_REQUEST, &name, filters, defaultValue, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 332, &_REQUEST, &name, filters, defaultValue, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -210,7 +210,7 @@ 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, 332, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 333, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -237,13 +237,13 @@ PHP_METHOD(Phalcon_Http_Request, getBasicAuth) ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "PHP_AUTH_USER"); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 333, &_1); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 334, &_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, 333, &_1); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "hasserver", NULL, 334, &_1); zephir_check_call_status(); _2 = !zephir_is_true(&_3); } @@ -285,7 +285,7 @@ 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, 334, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 335, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -311,7 +311,7 @@ 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, 334, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 335, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -337,7 +337,7 @@ 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, 334, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 335, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -388,7 +388,7 @@ PHP_METHOD(Phalcon_Http_Request, getPreferredIsoLocaleVariant) ZEPHIR_INIT_VAR(&_0); zephir_fast_explode_str(&_0, SL("-"), &language, LONG_MAX); ZEPHIR_CPY_WRT(&language, &_0); - zephir_array_fetch_long(&_1, &language, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 195); + zephir_array_fetch_long(&_1, &language, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 196); ZEPHIR_CPY_WRT(&language, &_1); ZEPHIR_INIT_VAR(&_2); ZEPHIR_INIT_VAR(&_3); @@ -440,7 +440,7 @@ PHP_METHOD(Phalcon_Http_Request, getClientAddress) ZEPHIR_INIT_VAR(&address); ZVAL_NULL(&address); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 335); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 336); zephir_check_call_status(); if (trustForwardedHeader) { ZEPHIR_OBS_NVAR(&address); @@ -457,10 +457,10 @@ PHP_METHOD(Phalcon_Http_Request, getClientAddress) if (Z_TYPE_P(&address) != IS_STRING) { RETURN_MM_BOOL(0); } - if (zephir_memnstr_str(&address, SL(","), "phalcon/Http/Request.zep", 231)) { + if (zephir_memnstr_str(&address, SL(","), "phalcon/Http/Request.zep", 232)) { ZEPHIR_INIT_VAR(&_0$$7); zephir_fast_explode_str(&_0$$7, SL(","), &address, LONG_MAX); - zephir_array_fetch_long(&_1$$7, &_0$$7, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 236); + zephir_array_fetch_long(&_1$$7, &_0$$7, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 237); RETURN_CTOR(&_1$$7); } RETURN_CCTOR(&address); @@ -487,7 +487,7 @@ 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, 332, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 333, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -508,7 +508,7 @@ PHP_METHOD(Phalcon_Http_Request, getContentType) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 335); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 336); zephir_check_call_status(); if (!(zephir_array_isset_string_fetch(&contentType, &server, SL("CONTENT_TYPE"), 1))) { RETURN_MM_NULL(); @@ -547,7 +547,7 @@ PHP_METHOD(Phalcon_Http_Request, getDigestAuth) ZEPHIR_INIT_VAR(&auth); array_init(&auth); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 335); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 336); zephir_check_call_status(); ZEPHIR_OBS_VAR(&digest); if (zephir_array_isset_string_fetch(&digest, &server, SL("PHP_AUTH_DIGEST"), 0)) { @@ -563,15 +563,15 @@ PHP_METHOD(Phalcon_Http_Request, getDigestAuth) RETURN_CTOR(&auth); } if (Z_TYPE_P(&matches) == IS_ARRAY) { - zephir_is_iterable(&matches, 0, "phalcon/Http/Request.zep", 290); + zephir_is_iterable(&matches, 0, "phalcon/Http/Request.zep", 291); if (Z_TYPE_P(&matches) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&matches), _3$$5) { ZEPHIR_INIT_NVAR(&match); ZVAL_COPY(&match, _3$$5); - zephir_array_fetch_long(&_5$$6, &match, 3, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 288); + zephir_array_fetch_long(&_5$$6, &match, 3, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 289); ZEPHIR_OBS_NVAR(&_6$$6); - zephir_array_fetch_long(&_6$$6, &match, 1, PH_NOISY, "phalcon/Http/Request.zep", 288); + zephir_array_fetch_long(&_6$$6, &match, 1, PH_NOISY, "phalcon/Http/Request.zep", 289); zephir_array_update_zval(&auth, &_6$$6, &_5$$6, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -585,9 +585,9 @@ PHP_METHOD(Phalcon_Http_Request, getDigestAuth) } ZEPHIR_CALL_METHOD(&match, &matches, "current", NULL, 0); zephir_check_call_status(); - zephir_array_fetch_long(&_7$$7, &match, 3, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 288); + zephir_array_fetch_long(&_7$$7, &match, 3, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 289); ZEPHIR_OBS_NVAR(&_8$$7); - zephir_array_fetch_long(&_8$$7, &match, 1, PH_NOISY, "phalcon/Http/Request.zep", 288); + zephir_array_fetch_long(&_8$$7, &match, 1, PH_NOISY, "phalcon/Http/Request.zep", 289); zephir_array_update_zval(&auth, &_8$$7, &_7$$7, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &matches, "next", NULL, 0); zephir_check_call_status(); @@ -939,7 +939,7 @@ 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, 335); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 336); zephir_check_call_status(); ZEPHIR_OBS_VAR(&value); if (zephir_array_isset_fetch(&value, &server, &name, 0)) { @@ -1033,9 +1033,9 @@ 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, 335); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 336); zephir_check_call_status(); - zephir_is_iterable(&server, 0, "phalcon/Http/Request.zep", 460); + zephir_is_iterable(&server, 0, "phalcon/Http/Request.zep", 461); if (Z_TYPE_P(&server) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&server), _2, _3, _0) { @@ -1059,7 +1059,7 @@ 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, 283, &_4$$4); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 284, &_4$$4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_11$$4); ZEPHIR_INIT_NVAR(&_12$$4); @@ -1083,7 +1083,7 @@ 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, 283, &_15$$5); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 284, &_15$$5); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_19$$5); ZEPHIR_INIT_NVAR(&_20$$5); @@ -1120,7 +1120,7 @@ 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, 283, &_22$$7); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 284, &_22$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_28$$7); ZEPHIR_INIT_NVAR(&_29$$7); @@ -1144,7 +1144,7 @@ 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, 283, &_32$$8); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 284, &_32$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_36$$8); ZEPHIR_INIT_NVAR(&_37$$8); @@ -1260,7 +1260,7 @@ PHP_METHOD(Phalcon_Http_Request, getHttpHost) zephir_fast_trim(&_4$$5, &host, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_VAR(&cleanHost); zephir_fast_strtolower(&cleanHost, &_4$$5); - if (zephir_memnstr_str(&cleanHost, SL(":"), "phalcon/Http/Request.zep", 534)) { + if (zephir_memnstr_str(&cleanHost, SL(":"), "phalcon/Http/Request.zep", 535)) { ZEPHIR_INIT_VAR(&_5$$6); ZVAL_STRING(&_5$$6, "/:[[:digit:]]+$/"); ZEPHIR_INIT_VAR(&_6$$6); @@ -1282,9 +1282,9 @@ 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, 336, &_13$$7); + ZEPHIR_CALL_METHOD(NULL, &_12$$7, "__construct", NULL, 337, &_13$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$7, "phalcon/Http/Request.zep", 544); + zephir_throw_exception_debug(&_12$$7, "phalcon/Http/Request.zep", 545); ZEPHIR_MM_RESTORE(); return; } @@ -1311,7 +1311,7 @@ PHP_METHOD(Phalcon_Http_Request, getHTTPReferer) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 335); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 336); zephir_check_call_status(); if (!(zephir_array_isset_string_fetch(&httpReferer, &server, SL("HTTP_REFERER"), 1))) { RETURN_MM_STRING(""); @@ -1326,12 +1326,13 @@ PHP_METHOD(Phalcon_Http_Request, getJsonRawBody) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *associative_param = NULL, rawBody, _0; + zval *associative_param = NULL, rawBody, _0, _1; zend_bool associative; zval *this_ptr = getThis(); ZVAL_UNDEF(&rawBody); ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 1) @@ -1355,8 +1356,24 @@ PHP_METHOD(Phalcon_Http_Request, getJsonRawBody) if (Z_TYPE_P(&rawBody) != IS_STRING) { RETURN_MM_BOOL(0); } - ZVAL_BOOL(&_0, (associative ? 1 : 0)); - zephir_json_decode(return_value, &rawBody, zephir_get_intval(&_0) ); + if (ZEPHIR_IS_STRING(&rawBody, "")) { + ZEPHIR_INIT_NVAR(&rawBody); + ZVAL_STRING(&rawBody, "{}"); + } + ZEPHIR_INIT_VAR(&_0); + object_init_ex(&_0, phalcon_support_helper_json_decode_ce); + if (zephir_has_constructor(&_0)) { + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 0); + zephir_check_call_status(); + } + + if (associative) { + ZVAL_BOOL(&_1, 1); + } else { + ZVAL_BOOL(&_1, 0); + } + ZEPHIR_RETURN_CALL_METHOD(&_0, "__invoke", NULL, 192, &rawBody, &_1); + zephir_check_call_status(); RETURN_MM(); } @@ -1381,7 +1398,7 @@ 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, 332, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 333, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -1421,7 +1438,7 @@ PHP_METHOD(Phalcon_Http_Request, getMethod) zephir_get_global(&_REQUEST, SL("_REQUEST")); ZEPHIR_INIT_VAR(&returnMethod); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 335); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 336); zephir_check_call_status(); ZEPHIR_OBS_VAR(&requestMethod); if (EXPECTED(zephir_array_isset_string_fetch(&requestMethod, &server, SL("REQUEST_METHOD"), 0))) { @@ -1435,7 +1452,7 @@ 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, 337, &_1$$5); + ZEPHIR_CALL_METHOD(&overridedMethod, this_ptr, "getheader", NULL, 338, &_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))) { @@ -1544,7 +1561,7 @@ PHP_METHOD(Phalcon_Http_Request, getPatch) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getpatchput", NULL, 338, &_0, &name, filters, defaultValue, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getpatchput", NULL, 339, &_0, &name, filters, defaultValue, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -1584,10 +1601,10 @@ PHP_METHOD(Phalcon_Http_Request, getPort) zephir_check_call_status(); RETURN_MM_LONG(zephir_get_intval(&_1$$3)); } - if (zephir_memnstr_str(&host, SL(":"), "phalcon/Http/Request.zep", 681)) { + if (zephir_memnstr_str(&host, SL(":"), "phalcon/Http/Request.zep", 686)) { ZEPHIR_INIT_VAR(&_3$$4); ZVAL_STRING(&_3$$4, ":"); - ZEPHIR_CALL_FUNCTION(&pos, "strrpos", NULL, 235, &host, &_3$$4); + ZEPHIR_CALL_FUNCTION(&pos, "strrpos", NULL, 238, &host, &_3$$4); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&pos)) { ZVAL_LONG(&_4$$5, (zephir_get_numberval(&pos) + 1)); @@ -1696,7 +1713,7 @@ PHP_METHOD(Phalcon_Http_Request, getPost) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 331, &_POST, &name, filters, defaultValue, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 332, &_POST, &name, filters, defaultValue, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -1788,7 +1805,7 @@ PHP_METHOD(Phalcon_Http_Request, getPut) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getpatchput", NULL, 338, &_0, &name, filters, defaultValue, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getpatchput", NULL, 339, &_0, &name, filters, defaultValue, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -1883,7 +1900,7 @@ PHP_METHOD(Phalcon_Http_Request, getQuery) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 331, &_GET, &name, filters, defaultValue, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 332, &_GET, &name, filters, defaultValue, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -1984,7 +2001,7 @@ PHP_METHOD(Phalcon_Http_Request, getServer) } - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 335); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 336); zephir_check_call_status(); if (!(zephir_array_isset_fetch(&serverValue, &server, &name, 1))) { RETURN_MM_NULL(); @@ -2016,7 +2033,7 @@ 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, 339, &_1$$3); + ZEPHIR_RETURN_CALL_FUNCTION("gethostbyname", NULL, 340, &_1$$3); zephir_check_call_status(); RETURN_MM(); } @@ -2153,7 +2170,7 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) array_init(&files); ZEPHIR_CPY_WRT(&superFiles, &_FILES); if (zephir_fast_count_int(&superFiles) > 0) { - zephir_is_iterable(&superFiles, 0, "phalcon/Http/Request.zep", 925); + zephir_is_iterable(&superFiles, 0, "phalcon/Http/Request.zep", 930); if (Z_TYPE_P(&superFiles) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&superFiles), _2$$3, _3$$3, _0$$3) { @@ -2166,16 +2183,16 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZEPHIR_INIT_NVAR(&input); ZVAL_COPY(&input, _0$$3); ZEPHIR_OBS_NVAR(&_4$$4); - zephir_array_fetch_string(&_4$$4, &input, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 882); + zephir_array_fetch_string(&_4$$4, &input, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 887); if (Z_TYPE_P(&_4$$4) == IS_ARRAY) { - zephir_array_fetch_string(&_5$$5, &input, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 884); - zephir_array_fetch_string(&_6$$5, &input, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 885); - zephir_array_fetch_string(&_7$$5, &input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 886); - zephir_array_fetch_string(&_8$$5, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 887); - zephir_array_fetch_string(&_9$$5, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 888); - ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 340, &_5$$5, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &prefix); + zephir_array_fetch_string(&_5$$5, &input, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 889); + zephir_array_fetch_string(&_6$$5, &input, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 890); + zephir_array_fetch_string(&_7$$5, &input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 891); + zephir_array_fetch_string(&_8$$5, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 892); + zephir_array_fetch_string(&_9$$5, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 893); + 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", 915); + zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 920); if (Z_TYPE_P(&smoothInput) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&smoothInput), _11$$5) { @@ -2183,43 +2200,43 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZVAL_COPY(&file, _11$$5); _13$$6 = onlySuccessful == 0; if (!(_13$$6)) { - zephir_array_fetch_string(&_14$$6, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 893); + zephir_array_fetch_string(&_14$$6, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 898); _13$$6 = ZEPHIR_IS_LONG(&_14$$6, 0); } if (_13$$6) { ZEPHIR_INIT_NVAR(&dataFile); zephir_create_array(&dataFile, 5, 0); ZEPHIR_OBS_NVAR(&_15$$7); - zephir_array_fetch_string(&_15$$7, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 895); + zephir_array_fetch_string(&_15$$7, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 900); zephir_array_update_string(&dataFile, SL("name"), &_15$$7, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_15$$7); - zephir_array_fetch_string(&_15$$7, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 896); + zephir_array_fetch_string(&_15$$7, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 901); zephir_array_update_string(&dataFile, SL("type"), &_15$$7, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_15$$7); - zephir_array_fetch_string(&_15$$7, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 897); + zephir_array_fetch_string(&_15$$7, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 902); zephir_array_update_string(&dataFile, SL("tmp_name"), &_15$$7, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_15$$7); - zephir_array_fetch_string(&_15$$7, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 898); + zephir_array_fetch_string(&_15$$7, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 903); zephir_array_update_string(&dataFile, SL("size"), &_15$$7, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_15$$7); - zephir_array_fetch_string(&_15$$7, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 900); + zephir_array_fetch_string(&_15$$7, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 905); zephir_array_update_string(&dataFile, SL("error"), &_15$$7, PH_COPY | PH_SEPARATE); if (namedKeys == 1) { 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", 906); - ZEPHIR_CALL_METHOD(NULL, &_16$$8, "__construct", &_18, 341, &dataFile, &_17$$8); + zephir_array_fetch_string(&_17$$8, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 911); + 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", 903); + zephir_array_fetch_string(&_19$$8, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 908); zephir_array_update_zval(&files, &_19$$8, &_16$$8, PH_COPY | PH_SEPARATE); } else { 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", 911); - ZEPHIR_CALL_METHOD(NULL, &_20$$9, "__construct", &_18, 341, &dataFile, &_21$$9); + zephir_array_fetch_string(&_21$$9, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 916); + 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", 911); + zephir_array_append(&files, &_20$$9, PH_SEPARATE, "phalcon/Http/Request.zep", 916); } } } ZEND_HASH_FOREACH_END(); @@ -2236,44 +2253,44 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) zephir_check_call_status(); _22$$10 = onlySuccessful == 0; if (!(_22$$10)) { - zephir_array_fetch_string(&_23$$10, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 893); + zephir_array_fetch_string(&_23$$10, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 898); _22$$10 = ZEPHIR_IS_LONG(&_23$$10, 0); } if (_22$$10) { ZEPHIR_INIT_NVAR(&_24$$11); zephir_create_array(&_24$$11, 5, 0); ZEPHIR_OBS_NVAR(&_25$$11); - zephir_array_fetch_string(&_25$$11, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 895); + zephir_array_fetch_string(&_25$$11, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 900); zephir_array_update_string(&_24$$11, SL("name"), &_25$$11, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_25$$11); - zephir_array_fetch_string(&_25$$11, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 896); + zephir_array_fetch_string(&_25$$11, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 901); zephir_array_update_string(&_24$$11, SL("type"), &_25$$11, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_25$$11); - zephir_array_fetch_string(&_25$$11, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 897); + zephir_array_fetch_string(&_25$$11, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 902); zephir_array_update_string(&_24$$11, SL("tmp_name"), &_25$$11, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_25$$11); - zephir_array_fetch_string(&_25$$11, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 898); + zephir_array_fetch_string(&_25$$11, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 903); zephir_array_update_string(&_24$$11, SL("size"), &_25$$11, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_25$$11); - zephir_array_fetch_string(&_25$$11, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 900); + zephir_array_fetch_string(&_25$$11, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 905); zephir_array_update_string(&_24$$11, SL("error"), &_25$$11, PH_COPY | PH_SEPARATE); ZEPHIR_CPY_WRT(&dataFile, &_24$$11); if (namedKeys == 1) { 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", 906); - ZEPHIR_CALL_METHOD(NULL, &_26$$12, "__construct", &_18, 341, &dataFile, &_27$$12); + zephir_array_fetch_string(&_27$$12, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 911); + 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", 903); + zephir_array_fetch_string(&_28$$12, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 908); zephir_array_update_zval(&files, &_28$$12, &_26$$12, PH_COPY | PH_SEPARATE); } else { 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", 911); - ZEPHIR_CALL_METHOD(NULL, &_29$$13, "__construct", &_18, 341, &dataFile, &_30$$13); + zephir_array_fetch_string(&_30$$13, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 916); + 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", 911); + zephir_array_append(&files, &_29$$13, PH_SEPARATE, "phalcon/Http/Request.zep", 916); } } ZEPHIR_CALL_METHOD(NULL, &smoothInput, "next", NULL, 0); @@ -2284,22 +2301,22 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) } else { _31$$14 = onlySuccessful == 0; if (!(_31$$14)) { - zephir_array_fetch_string(&_32$$14, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 916); + zephir_array_fetch_string(&_32$$14, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 921); _31$$14 = ZEPHIR_IS_LONG(&_32$$14, 0); } if (_31$$14) { 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, 341, &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, 341, &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", 920); + zephir_array_append(&files, &_34$$17, PH_SEPARATE, "phalcon/Http/Request.zep", 925); } } } @@ -2318,16 +2335,16 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZEPHIR_CALL_METHOD(&input, &superFiles, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&_35$$18); - zephir_array_fetch_string(&_35$$18, &input, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 882); + zephir_array_fetch_string(&_35$$18, &input, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 887); if (Z_TYPE_P(&_35$$18) == IS_ARRAY) { - zephir_array_fetch_string(&_36$$19, &input, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 884); - zephir_array_fetch_string(&_37$$19, &input, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 885); - zephir_array_fetch_string(&_38$$19, &input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 886); - zephir_array_fetch_string(&_39$$19, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 887); - zephir_array_fetch_string(&_40$$19, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 888); - ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 340, &_36$$19, &_37$$19, &_38$$19, &_39$$19, &_40$$19, &prefix); + zephir_array_fetch_string(&_36$$19, &input, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 889); + zephir_array_fetch_string(&_37$$19, &input, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 890); + zephir_array_fetch_string(&_38$$19, &input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 891); + zephir_array_fetch_string(&_39$$19, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 892); + zephir_array_fetch_string(&_40$$19, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 893); + 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", 915); + zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 920); if (Z_TYPE_P(&smoothInput) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&smoothInput), _41$$19) { @@ -2335,44 +2352,44 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZVAL_COPY(&file, _41$$19); _43$$20 = onlySuccessful == 0; if (!(_43$$20)) { - zephir_array_fetch_string(&_44$$20, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 893); + zephir_array_fetch_string(&_44$$20, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 898); _43$$20 = ZEPHIR_IS_LONG(&_44$$20, 0); } if (_43$$20) { ZEPHIR_INIT_NVAR(&_45$$21); zephir_create_array(&_45$$21, 5, 0); ZEPHIR_OBS_NVAR(&_46$$21); - zephir_array_fetch_string(&_46$$21, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 895); + zephir_array_fetch_string(&_46$$21, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 900); zephir_array_update_string(&_45$$21, SL("name"), &_46$$21, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_46$$21); - zephir_array_fetch_string(&_46$$21, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 896); + zephir_array_fetch_string(&_46$$21, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 901); zephir_array_update_string(&_45$$21, SL("type"), &_46$$21, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_46$$21); - zephir_array_fetch_string(&_46$$21, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 897); + zephir_array_fetch_string(&_46$$21, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 902); zephir_array_update_string(&_45$$21, SL("tmp_name"), &_46$$21, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_46$$21); - zephir_array_fetch_string(&_46$$21, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 898); + zephir_array_fetch_string(&_46$$21, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 903); zephir_array_update_string(&_45$$21, SL("size"), &_46$$21, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_46$$21); - zephir_array_fetch_string(&_46$$21, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 900); + zephir_array_fetch_string(&_46$$21, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 905); zephir_array_update_string(&_45$$21, SL("error"), &_46$$21, PH_COPY | PH_SEPARATE); ZEPHIR_CPY_WRT(&dataFile, &_45$$21); if (namedKeys == 1) { 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", 906); - ZEPHIR_CALL_METHOD(NULL, &_47$$22, "__construct", &_18, 341, &dataFile, &_48$$22); + zephir_array_fetch_string(&_48$$22, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 911); + 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", 903); + zephir_array_fetch_string(&_49$$22, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 908); zephir_array_update_zval(&files, &_49$$22, &_47$$22, PH_COPY | PH_SEPARATE); } else { 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", 911); - ZEPHIR_CALL_METHOD(NULL, &_50$$23, "__construct", &_18, 341, &dataFile, &_51$$23); + zephir_array_fetch_string(&_51$$23, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 916); + 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", 911); + zephir_array_append(&files, &_50$$23, PH_SEPARATE, "phalcon/Http/Request.zep", 916); } } } ZEND_HASH_FOREACH_END(); @@ -2389,44 +2406,44 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) zephir_check_call_status(); _52$$24 = onlySuccessful == 0; if (!(_52$$24)) { - zephir_array_fetch_string(&_53$$24, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 893); + zephir_array_fetch_string(&_53$$24, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 898); _52$$24 = ZEPHIR_IS_LONG(&_53$$24, 0); } if (_52$$24) { ZEPHIR_INIT_NVAR(&_54$$25); zephir_create_array(&_54$$25, 5, 0); ZEPHIR_OBS_NVAR(&_55$$25); - zephir_array_fetch_string(&_55$$25, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 895); + zephir_array_fetch_string(&_55$$25, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 900); zephir_array_update_string(&_54$$25, SL("name"), &_55$$25, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_55$$25); - zephir_array_fetch_string(&_55$$25, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 896); + zephir_array_fetch_string(&_55$$25, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 901); zephir_array_update_string(&_54$$25, SL("type"), &_55$$25, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_55$$25); - zephir_array_fetch_string(&_55$$25, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 897); + zephir_array_fetch_string(&_55$$25, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 902); zephir_array_update_string(&_54$$25, SL("tmp_name"), &_55$$25, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_55$$25); - zephir_array_fetch_string(&_55$$25, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 898); + zephir_array_fetch_string(&_55$$25, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 903); zephir_array_update_string(&_54$$25, SL("size"), &_55$$25, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_55$$25); - zephir_array_fetch_string(&_55$$25, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 900); + zephir_array_fetch_string(&_55$$25, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 905); zephir_array_update_string(&_54$$25, SL("error"), &_55$$25, PH_COPY | PH_SEPARATE); ZEPHIR_CPY_WRT(&dataFile, &_54$$25); if (namedKeys == 1) { 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", 906); - ZEPHIR_CALL_METHOD(NULL, &_56$$26, "__construct", &_18, 341, &dataFile, &_57$$26); + zephir_array_fetch_string(&_57$$26, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 911); + 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", 903); + zephir_array_fetch_string(&_58$$26, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 908); zephir_array_update_zval(&files, &_58$$26, &_56$$26, PH_COPY | PH_SEPARATE); } else { 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", 911); - ZEPHIR_CALL_METHOD(NULL, &_59$$27, "__construct", &_18, 341, &dataFile, &_60$$27); + zephir_array_fetch_string(&_60$$27, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 916); + 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", 911); + zephir_array_append(&files, &_59$$27, PH_SEPARATE, "phalcon/Http/Request.zep", 916); } } ZEPHIR_CALL_METHOD(NULL, &smoothInput, "next", NULL, 0); @@ -2437,22 +2454,22 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) } else { _61$$28 = onlySuccessful == 0; if (!(_61$$28)) { - zephir_array_fetch_string(&_62$$28, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 916); + zephir_array_fetch_string(&_62$$28, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 921); _61$$28 = ZEPHIR_IS_LONG(&_62$$28, 0); } if (_61$$28) { 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, 341, &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, 341, &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", 920); + zephir_array_append(&files, &_64$$31, PH_SEPARATE, "phalcon/Http/Request.zep", 925); } } } @@ -2523,7 +2540,7 @@ PHP_METHOD(Phalcon_Http_Request, getURI) ZEPHIR_INIT_VAR(&_2$$4); ZVAL_STRING(&_2$$4, "?"); zephir_fast_explode(&_1$$4, &_2$$4, &requestURI, LONG_MAX); - zephir_array_fetch_long(&_3$$4, &_1$$4, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 954); + zephir_array_fetch_long(&_3$$4, &_1$$4, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 959); ZEPHIR_CPY_WRT(&requestURI, &_3$$4); } RETURN_CCTOR(&requestURI); @@ -2663,13 +2680,13 @@ 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, 333, &name); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "hasserver", NULL, 334, &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, 333, &_6); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "hasserver", NULL, 334, &_6); zephir_check_call_status(); _4 = zephir_is_true(&_5); } @@ -2862,7 +2879,7 @@ PHP_METHOD(Phalcon_Http_Request, hasServer) } - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 335); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 336); zephir_check_call_status(); RETURN_MM_BOOL(zephir_array_isset(&server, &name)); } @@ -2887,7 +2904,7 @@ 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, 333, &_1); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 334, &_1); zephir_check_call_status(); _2 = zephir_is_true(&_0); if (_2) { @@ -2916,7 +2933,7 @@ PHP_METHOD(Phalcon_Http_Request, isConnect) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 342); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 343); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "CONNECT")); } @@ -2937,7 +2954,7 @@ PHP_METHOD(Phalcon_Http_Request, isDelete) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 342); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 343); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "DELETE")); } @@ -2958,7 +2975,7 @@ PHP_METHOD(Phalcon_Http_Request, isGet) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 342); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 343); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "GET")); } @@ -2979,7 +2996,7 @@ PHP_METHOD(Phalcon_Http_Request, isHead) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 342); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 343); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "HEAD")); } @@ -3027,7 +3044,7 @@ PHP_METHOD(Phalcon_Http_Request, isMethod) } - ZEPHIR_CALL_METHOD(&httpMethod, this_ptr, "getmethod", NULL, 342); + ZEPHIR_CALL_METHOD(&httpMethod, this_ptr, "getmethod", NULL, 343); zephir_check_call_status(); if (Z_TYPE_P(methods) == IS_STRING) { _0$$3 = strict; @@ -3043,14 +3060,14 @@ PHP_METHOD(Phalcon_Http_Request, isMethod) ZEPHIR_CONCAT_SV(&_3$$4, "Invalid HTTP method: ", methods); 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", 1112); + zephir_throw_exception_debug(&_2$$4, "phalcon/Http/Request.zep", 1117); ZEPHIR_MM_RESTORE(); return; } RETURN_MM_BOOL(ZEPHIR_IS_EQUAL(methods, &httpMethod)); } if (Z_TYPE_P(methods) == IS_ARRAY) { - zephir_is_iterable(methods, 0, "phalcon/Http/Request.zep", 1125); + zephir_is_iterable(methods, 0, "phalcon/Http/Request.zep", 1130); if (Z_TYPE_P(methods) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(methods), _4$$5) { @@ -3061,7 +3078,7 @@ PHP_METHOD(Phalcon_Http_Request, isMethod) } else { ZVAL_BOOL(&_7$$6, 0); } - ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "ismethod", &_8, 343, &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); @@ -3083,7 +3100,7 @@ PHP_METHOD(Phalcon_Http_Request, isMethod) } else { ZVAL_BOOL(&_10$$8, 0); } - ZEPHIR_CALL_METHOD(&_9$$8, this_ptr, "ismethod", &_8, 343, &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); @@ -3096,7 +3113,7 @@ PHP_METHOD(Phalcon_Http_Request, isMethod) RETURN_MM_BOOL(0); } if (UNEXPECTED(strict)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_request_exception_ce, "Invalid HTTP method: non-string", "phalcon/Http/Request.zep", 1129); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_request_exception_ce, "Invalid HTTP method: non-string", "phalcon/Http/Request.zep", 1134); return; } RETURN_MM_BOOL(0); @@ -3118,7 +3135,7 @@ PHP_METHOD(Phalcon_Http_Request, isOptions) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 342); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 343); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "OPTIONS")); } @@ -3139,7 +3156,7 @@ PHP_METHOD(Phalcon_Http_Request, isPatch) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 342); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 343); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "PATCH")); } @@ -3160,7 +3177,7 @@ PHP_METHOD(Phalcon_Http_Request, isPost) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 342); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 343); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "POST")); } @@ -3181,7 +3198,7 @@ PHP_METHOD(Phalcon_Http_Request, isPut) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 342); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 343); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "PUT")); } @@ -3202,7 +3219,7 @@ PHP_METHOD(Phalcon_Http_Request, isPurge) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 342); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 343); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "PURGE")); } @@ -3259,7 +3276,7 @@ PHP_METHOD(Phalcon_Http_Request, isSoap) ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "HTTP_SOAPACTION"); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 333, &_1); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 334, &_1); zephir_check_call_status(); if (zephir_is_true(&_0)) { RETURN_MM_BOOL(1); @@ -3269,7 +3286,7 @@ PHP_METHOD(Phalcon_Http_Request, isSoap) if (ZEPHIR_IS_EMPTY(&contentType)) { RETURN_MM_BOOL(0); } - RETURN_MM_BOOL(zephir_memnstr_str(&contentType, SL("application/soap+xml"), "phalcon/Http/Request.zep", 1214)); + RETURN_MM_BOOL(zephir_memnstr_str(&contentType, SL("application/soap+xml"), "phalcon/Http/Request.zep", 1219)); } /** @@ -3288,7 +3305,7 @@ PHP_METHOD(Phalcon_Http_Request, isTrace) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 342); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 343); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "TRACE")); } @@ -3374,7 +3391,7 @@ PHP_METHOD(Phalcon_Http_Request, numFiles) if (Z_TYPE_P(&files) != IS_ARRAY) { RETURN_MM_LONG(0); } - zephir_is_iterable(&files, 0, "phalcon/Http/Request.zep", 1279); + zephir_is_iterable(&files, 0, "phalcon/Http/Request.zep", 1284); if (Z_TYPE_P(&files) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&files), _0) { @@ -3397,7 +3414,7 @@ PHP_METHOD(Phalcon_Http_Request, numFiles) } else { ZVAL_BOOL(&_4$$8, 0); } - ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "hasfilehelper", &_5, 344, &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); } @@ -3431,7 +3448,7 @@ PHP_METHOD(Phalcon_Http_Request, numFiles) } else { ZVAL_BOOL(&_8$$13, 0); } - ZEPHIR_CALL_METHOD(&_7$$13, this_ptr, "hasfilehelper", &_5, 344, &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); } @@ -3556,13 +3573,13 @@ PHP_METHOD(Phalcon_Http_Request, setParameterFilters) ZEPHIR_CONCAT_SVS(&_1$$3, "Filters have not been defined for '", &name, "'"); 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", 1310); + zephir_throw_exception_debug(&_0$$3, "phalcon/Http/Request.zep", 1315); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 345); + ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 346); zephir_check_call_status(); - zephir_is_iterable(&filters, 0, "phalcon/Http/Request.zep", 1323); + zephir_is_iterable(&filters, 0, "phalcon/Http/Request.zep", 1328); if (Z_TYPE_P(&filters) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&filters), _2) { @@ -3577,7 +3594,7 @@ PHP_METHOD(Phalcon_Http_Request, setParameterFilters) ZEPHIR_CONCAT_SVS(&_7$$5, "Sanitizer '", &sanitizer, "' does not exist in the filter locator"); 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", 1319); + zephir_throw_exception_debug(&_6$$5, "phalcon/Http/Request.zep", 1324); ZEPHIR_MM_RESTORE(); return; } @@ -3602,7 +3619,7 @@ PHP_METHOD(Phalcon_Http_Request, setParameterFilters) ZEPHIR_CONCAT_SVS(&_11$$7, "Sanitizer '", &sanitizer, "' does not exist in the filter locator"); 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", 1319); + zephir_throw_exception_debug(&_10$$7, "phalcon/Http/Request.zep", 1324); ZEPHIR_MM_RESTORE(); return; } @@ -3629,7 +3646,7 @@ PHP_METHOD(Phalcon_Http_Request, setParameterFilters) } else { ZEPHIR_CPY_WRT(&localScope, &scope); } - zephir_is_iterable(&localScope, 0, "phalcon/Http/Request.zep", 1338); + zephir_is_iterable(&localScope, 0, "phalcon/Http/Request.zep", 1343); if (Z_TYPE_P(&localScope) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&localScope), _13) { @@ -3747,7 +3764,7 @@ PHP_METHOD(Phalcon_Http_Request, getBestQuality) quality = 0.0; ZEPHIR_INIT_VAR(&selectedName); ZVAL_STRING(&selectedName, ""); - zephir_is_iterable(&qualityParts, 0, "phalcon/Http/Request.zep", 1381); + zephir_is_iterable(&qualityParts, 0, "phalcon/Http/Request.zep", 1386); if (Z_TYPE_P(&qualityParts) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&qualityParts), _0) { @@ -3755,18 +3772,18 @@ PHP_METHOD(Phalcon_Http_Request, getBestQuality) ZVAL_COPY(&accept, _0); if (i == 0) { ZEPHIR_OBS_NVAR(&_2$$4); - zephir_array_fetch_string(&_2$$4, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1367); + zephir_array_fetch_string(&_2$$4, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1372); quality = zephir_get_doubleval(&_2$$4); ZEPHIR_OBS_NVAR(&selectedName); - zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1368); + zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1373); } else { ZEPHIR_OBS_NVAR(&_3$$5); - zephir_array_fetch_string(&_3$$5, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1370); + zephir_array_fetch_string(&_3$$5, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1375); acceptQuality = zephir_get_doubleval(&_3$$5); if (acceptQuality > quality) { quality = acceptQuality; ZEPHIR_OBS_NVAR(&selectedName); - zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1374); + zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1379); } } i++; @@ -3784,18 +3801,18 @@ PHP_METHOD(Phalcon_Http_Request, getBestQuality) zephir_check_call_status(); if (i == 0) { ZEPHIR_OBS_NVAR(&_4$$8); - zephir_array_fetch_string(&_4$$8, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1367); + zephir_array_fetch_string(&_4$$8, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1372); quality = zephir_get_doubleval(&_4$$8); ZEPHIR_OBS_NVAR(&selectedName); - zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1368); + zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1373); } else { ZEPHIR_OBS_NVAR(&_5$$9); - zephir_array_fetch_string(&_5$$9, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1370); + zephir_array_fetch_string(&_5$$9, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1375); acceptQuality = zephir_get_doubleval(&_5$$9); if (acceptQuality > quality) { quality = acceptQuality; ZEPHIR_OBS_NVAR(&selectedName); - zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1374); + zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1379); } } i++; @@ -3901,7 +3918,7 @@ PHP_METHOD(Phalcon_Http_Request, getHelper) RETURN_MM(); } if (Z_TYPE_P(filters) != IS_NULL) { - ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 345); + ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 346); zephir_check_call_status(); if (noRecursive) { ZVAL_BOOL(&_3$$6, 1); @@ -3956,7 +3973,7 @@ PHP_METHOD(Phalcon_Http_Request, hasFileHelper) if (Z_TYPE_P(data) != IS_ARRAY) { RETURN_MM_LONG(1); } - zephir_is_iterable(data, 0, "phalcon/Http/Request.zep", 1450); + zephir_is_iterable(data, 0, "phalcon/Http/Request.zep", 1455); if (Z_TYPE_P(data) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(data), _0) { @@ -3977,7 +3994,7 @@ PHP_METHOD(Phalcon_Http_Request, hasFileHelper) } else { ZVAL_BOOL(&_4$$7, 0); } - ZEPHIR_CALL_METHOD(&_3$$7, this_ptr, "hasfilehelper", &_5, 344, &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); } @@ -4008,7 +4025,7 @@ PHP_METHOD(Phalcon_Http_Request, hasFileHelper) } else { ZVAL_BOOL(&_8$$11, 0); } - ZEPHIR_CALL_METHOD(&_7$$11, this_ptr, "hasfilehelper", &_5, 344, &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); } @@ -4137,7 +4154,7 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader) ZVAL_LONG(&_3, 1); ZEPHIR_CALL_FUNCTION(&parts, "preg_split", NULL, 67, &_1, &serverValue, &_2, &_3); zephir_check_call_status(); - zephir_is_iterable(&parts, 0, "phalcon/Http/Request.zep", 1494); + zephir_is_iterable(&parts, 0, "phalcon/Http/Request.zep", 1499); if (Z_TYPE_P(&parts) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&parts), _4) { @@ -4153,7 +4170,7 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader) ZVAL_LONG(&_9$$3, 1); ZEPHIR_CALL_FUNCTION(&headerSplit, "preg_split", NULL, 67, &_7$$3, &_6$$3, &_8$$3, &_9$$3); zephir_check_call_status(); - zephir_is_iterable(&headerSplit, 0, "phalcon/Http/Request.zep", 1491); + zephir_is_iterable(&headerSplit, 0, "phalcon/Http/Request.zep", 1496); if (Z_TYPE_P(&headerSplit) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&headerSplit), _10$$3) { @@ -4166,17 +4183,17 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader) if (!ZEPHIR_IS_FALSE_IDENTICAL(&_13$$4)) { ZEPHIR_INIT_NVAR(&split); zephir_fast_explode_str(&split, SL("="), &headerPart, 2 ); - zephir_array_fetch_long(&_14$$5, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1480); + zephir_array_fetch_long(&_14$$5, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1485); if (ZEPHIR_IS_STRING_IDENTICAL(&_14$$5, "q")) { ZEPHIR_OBS_NVAR(&_15$$6); - zephir_array_fetch_long(&_15$$6, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1481); + zephir_array_fetch_long(&_15$$6, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1486); ZEPHIR_INIT_NVAR(&_16$$6); ZVAL_DOUBLE(&_16$$6, zephir_get_doubleval(&_15$$6)); zephir_array_update_string(&headerParts, SL("quality"), &_16$$6, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_long(&_17$$7, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1483); + zephir_array_fetch_long(&_17$$7, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1488); ZEPHIR_OBS_NVAR(&_18$$7); - zephir_array_fetch_long(&_18$$7, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1483); + zephir_array_fetch_long(&_18$$7, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1488); zephir_array_update_zval(&headerParts, &_18$$7, &_17$$7, PH_COPY | PH_SEPARATE); } } else { @@ -4204,17 +4221,17 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader) if (!ZEPHIR_IS_FALSE_IDENTICAL(&_21$$9)) { ZEPHIR_INIT_NVAR(&split); zephir_fast_explode_str(&split, SL("="), &headerPart, 2 ); - zephir_array_fetch_long(&_22$$10, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1480); + zephir_array_fetch_long(&_22$$10, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1485); if (ZEPHIR_IS_STRING_IDENTICAL(&_22$$10, "q")) { ZEPHIR_OBS_NVAR(&_23$$11); - zephir_array_fetch_long(&_23$$11, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1481); + zephir_array_fetch_long(&_23$$11, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1486); ZEPHIR_INIT_NVAR(&_24$$11); ZVAL_DOUBLE(&_24$$11, zephir_get_doubleval(&_23$$11)); zephir_array_update_string(&headerParts, SL("quality"), &_24$$11, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_long(&_25$$12, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1483); + zephir_array_fetch_long(&_25$$12, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1488); ZEPHIR_OBS_NVAR(&_26$$12); - zephir_array_fetch_long(&_26$$12, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1483); + zephir_array_fetch_long(&_26$$12, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1488); zephir_array_update_zval(&headerParts, &_26$$12, &_25$$12, PH_COPY | PH_SEPARATE); } } else { @@ -4228,7 +4245,7 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader) } } ZEPHIR_INIT_NVAR(&headerPart); - zephir_array_append(&returnedParts, &headerParts, PH_SEPARATE, "phalcon/Http/Request.zep", 1491); + zephir_array_append(&returnedParts, &headerParts, PH_SEPARATE, "phalcon/Http/Request.zep", 1496); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &parts, "rewind", NULL, 0); @@ -4251,7 +4268,7 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader) ZVAL_LONG(&_31$$14, 1); ZEPHIR_CALL_FUNCTION(&headerSplit, "preg_split", NULL, 67, &_29$$14, &_28$$14, &_30$$14, &_31$$14); zephir_check_call_status(); - zephir_is_iterable(&headerSplit, 0, "phalcon/Http/Request.zep", 1491); + zephir_is_iterable(&headerSplit, 0, "phalcon/Http/Request.zep", 1496); if (Z_TYPE_P(&headerSplit) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&headerSplit), _32$$14) { @@ -4264,17 +4281,17 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader) if (!ZEPHIR_IS_FALSE_IDENTICAL(&_35$$15)) { ZEPHIR_INIT_NVAR(&split); zephir_fast_explode_str(&split, SL("="), &headerPart, 2 ); - zephir_array_fetch_long(&_36$$16, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1480); + zephir_array_fetch_long(&_36$$16, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1485); if (ZEPHIR_IS_STRING_IDENTICAL(&_36$$16, "q")) { ZEPHIR_OBS_NVAR(&_37$$17); - zephir_array_fetch_long(&_37$$17, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1481); + zephir_array_fetch_long(&_37$$17, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1486); ZEPHIR_INIT_NVAR(&_38$$17); ZVAL_DOUBLE(&_38$$17, zephir_get_doubleval(&_37$$17)); zephir_array_update_string(&headerParts, SL("quality"), &_38$$17, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_long(&_39$$18, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1483); + zephir_array_fetch_long(&_39$$18, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1488); ZEPHIR_OBS_NVAR(&_40$$18); - zephir_array_fetch_long(&_40$$18, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1483); + zephir_array_fetch_long(&_40$$18, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1488); zephir_array_update_zval(&headerParts, &_40$$18, &_39$$18, PH_COPY | PH_SEPARATE); } } else { @@ -4302,17 +4319,17 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader) if (!ZEPHIR_IS_FALSE_IDENTICAL(&_43$$20)) { ZEPHIR_INIT_NVAR(&split); zephir_fast_explode_str(&split, SL("="), &headerPart, 2 ); - zephir_array_fetch_long(&_44$$21, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1480); + zephir_array_fetch_long(&_44$$21, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1485); if (ZEPHIR_IS_STRING_IDENTICAL(&_44$$21, "q")) { ZEPHIR_OBS_NVAR(&_45$$22); - zephir_array_fetch_long(&_45$$22, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1481); + zephir_array_fetch_long(&_45$$22, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1486); ZEPHIR_INIT_NVAR(&_46$$22); ZVAL_DOUBLE(&_46$$22, zephir_get_doubleval(&_45$$22)); zephir_array_update_string(&headerParts, SL("quality"), &_46$$22, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_long(&_47$$23, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1483); + zephir_array_fetch_long(&_47$$23, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1488); ZEPHIR_OBS_NVAR(&_48$$23); - zephir_array_fetch_long(&_48$$23, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1483); + zephir_array_fetch_long(&_48$$23, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1488); zephir_array_update_zval(&headerParts, &_48$$23, &_47$$23, PH_COPY | PH_SEPARATE); } } else { @@ -4326,7 +4343,7 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader) } } ZEPHIR_INIT_NVAR(&headerPart); - zephir_array_append(&returnedParts, &headerParts, PH_SEPARATE, "phalcon/Http/Request.zep", 1491); + zephir_array_append(&returnedParts, &headerParts, PH_SEPARATE, "phalcon/Http/Request.zep", 1496); ZEPHIR_CALL_METHOD(NULL, &parts, "next", NULL, 0); zephir_check_call_status(); } @@ -4402,7 +4419,7 @@ 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, 335); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 336); zephir_check_call_status(); if (Z_TYPE_P(&container) != IS_NULL) { ZEPHIR_INIT_VAR(&_1$$3); @@ -4437,13 +4454,13 @@ PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) } ZEPHIR_INIT_VAR(&_8); ZVAL_STRING(&_8, "PHP_AUTH_USER"); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 333, &_8); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 334, &_8); zephir_check_call_status(); _9 = zephir_is_true(&_0); if (_9) { ZEPHIR_INIT_NVAR(&_8); ZVAL_STRING(&_8, "PHP_AUTH_PW"); - ZEPHIR_CALL_METHOD(&_10, this_ptr, "hasserver", NULL, 333, &_8); + ZEPHIR_CALL_METHOD(&_10, this_ptr, "hasserver", NULL, 334, &_8); zephir_check_call_status(); _9 = zephir_is_true(&_10); } @@ -4461,11 +4478,11 @@ PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) } else { ZEPHIR_INIT_VAR(&_15$$8); ZVAL_STRING(&_15$$8, "HTTP_AUTHORIZATION"); - ZEPHIR_CALL_METHOD(&_14$$8, this_ptr, "hasserver", NULL, 333, &_15$$8); + ZEPHIR_CALL_METHOD(&_14$$8, this_ptr, "hasserver", NULL, 334, &_15$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_15$$8); ZVAL_STRING(&_15$$8, "REDIRECT_HTTP_AUTHORIZATION"); - ZEPHIR_CALL_METHOD(&_16$$8, this_ptr, "hasserver", NULL, 333, &_15$$8); + ZEPHIR_CALL_METHOD(&_16$$8, this_ptr, "hasserver", NULL, 334, &_15$$8); zephir_check_call_status(); if (zephir_is_true(&_14$$8)) { ZEPHIR_INIT_VAR(&_17$$9); @@ -4481,36 +4498,36 @@ PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) if (zephir_is_true(&authHeader)) { ZEPHIR_INIT_VAR(&_19$$11); ZVAL_STRING(&_19$$11, "basic "); - ZEPHIR_CALL_FUNCTION(&_20$$11, "stripos", NULL, 346, &authHeader, &_19$$11); + ZEPHIR_CALL_FUNCTION(&_20$$11, "stripos", NULL, 347, &authHeader, &_19$$11); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_19$$11); ZVAL_STRING(&_19$$11, "digest "); - ZEPHIR_CALL_FUNCTION(&_21$$11, "stripos", NULL, 346, &authHeader, &_19$$11); + ZEPHIR_CALL_FUNCTION(&_21$$11, "stripos", NULL, 347, &authHeader, &_19$$11); zephir_check_call_status(); _22$$11 = ZEPHIR_IS_LONG_IDENTICAL(&_21$$11, 0); if (_22$$11) { ZEPHIR_INIT_NVAR(&_19$$11); ZVAL_STRING(&_19$$11, "PHP_AUTH_DIGEST"); - ZEPHIR_CALL_METHOD(&_23$$11, this_ptr, "hasserver", NULL, 333, &_19$$11); + ZEPHIR_CALL_METHOD(&_23$$11, this_ptr, "hasserver", NULL, 334, &_19$$11); zephir_check_call_status(); _22$$11 = !zephir_is_true(&_23$$11); } ZEPHIR_INIT_NVAR(&_19$$11); ZVAL_STRING(&_19$$11, "bearer "); - ZEPHIR_CALL_FUNCTION(&_24$$11, "stripos", NULL, 346, &authHeader, &_19$$11); + ZEPHIR_CALL_FUNCTION(&_24$$11, "stripos", NULL, 347, &authHeader, &_19$$11); zephir_check_call_status(); if (ZEPHIR_IS_LONG_IDENTICAL(&_20$$11, 0)) { ZVAL_LONG(&_25$$12, 6); ZEPHIR_INIT_VAR(&_26$$12); zephir_substr(&_26$$12, &authHeader, 6 , 0, ZEPHIR_SUBSTR_NO_LENGTH); - ZEPHIR_CALL_FUNCTION(&_27$$12, "base64_decode", NULL, 223, &_26$$12); + ZEPHIR_CALL_FUNCTION(&_27$$12, "base64_decode", NULL, 226, &_26$$12); zephir_check_call_status(); ZEPHIR_INIT_VAR(&exploded); zephir_fast_explode_str(&exploded, SL(":"), &_27$$12, 2 ); if (zephir_fast_count_int(&exploded) == 2) { - zephir_array_fetch_long(&_28$$13, &exploded, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1553); + zephir_array_fetch_long(&_28$$13, &exploded, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1558); zephir_array_update_string(&headers, SL("Php-Auth-User"), &_28$$13, PH_COPY | PH_SEPARATE); - zephir_array_fetch_long(&_29$$13, &exploded, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1554); + zephir_array_fetch_long(&_29$$13, &exploded, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1559); zephir_array_update_string(&headers, SL("Php-Auth-Pw"), &_29$$13, PH_COPY | PH_SEPARATE); } } else if (_22$$11) { @@ -4523,11 +4540,11 @@ PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) if (!(zephir_array_isset_string(&headers, SL("Authorization")))) { ZEPHIR_OBS_VAR(&digest); if (zephir_array_isset_string(&headers, SL("Php-Auth-User"))) { - zephir_array_fetch_string(&_30$$17, &headers, SL("Php-Auth-User"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1566); - zephir_array_fetch_string(&_31$$17, &headers, SL("Php-Auth-Pw"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1566); + zephir_array_fetch_string(&_30$$17, &headers, SL("Php-Auth-User"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1571); + zephir_array_fetch_string(&_31$$17, &headers, SL("Php-Auth-Pw"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1571); ZEPHIR_INIT_VAR(&_32$$17); ZEPHIR_CONCAT_VSV(&_32$$17, &_30$$17, ":", &_31$$17); - ZEPHIR_CALL_FUNCTION(&_33$$17, "base64_encode", NULL, 224, &_32$$17); + ZEPHIR_CALL_FUNCTION(&_33$$17, "base64_encode", NULL, 227, &_32$$17); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_34$$17); ZEPHIR_CONCAT_SV(&_34$$17, "Basic ", &_33$$17); @@ -4627,7 +4644,7 @@ PHP_METHOD(Phalcon_Http_Request, smoothFiles) ZEPHIR_INIT_VAR(&files); array_init(&files); - zephir_is_iterable(&names, 0, "phalcon/Http/Request.zep", 1630); + zephir_is_iterable(&names, 0, "phalcon/Http/Request.zep", 1635); if (Z_TYPE_P(&names) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&names), _2, _3, _0) { @@ -4646,35 +4663,35 @@ PHP_METHOD(Phalcon_Http_Request, smoothFiles) zephir_create_array(&_4$$4, 6, 0); zephir_array_update_string(&_4$$4, SL("name"), &name, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_5$$4); - zephir_array_fetch(&_5$$4, &types, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1606); + zephir_array_fetch(&_5$$4, &types, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1611); zephir_array_update_string(&_4$$4, SL("type"), &_5$$4, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_5$$4); - zephir_array_fetch(&_5$$4, &tmp_names, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1607); + zephir_array_fetch(&_5$$4, &tmp_names, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1612); zephir_array_update_string(&_4$$4, SL("tmp_name"), &_5$$4, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_5$$4); - zephir_array_fetch(&_5$$4, &sizes, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1608); + zephir_array_fetch(&_5$$4, &sizes, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1613); zephir_array_update_string(&_4$$4, SL("size"), &_5$$4, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_5$$4); - zephir_array_fetch(&_5$$4, &errors, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1609); + zephir_array_fetch(&_5$$4, &errors, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1614); zephir_array_update_string(&_4$$4, SL("error"), &_5$$4, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_4$$4, SL("key"), &p, PH_COPY | PH_SEPARATE); - zephir_array_append(&files, &_4$$4, PH_SEPARATE, "phalcon/Http/Request.zep", 1611); + zephir_array_append(&files, &_4$$4, PH_SEPARATE, "phalcon/Http/Request.zep", 1616); } if (Z_TYPE_P(&name) == IS_ARRAY) { - zephir_array_fetch(&_6$$5, &names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1616); - zephir_array_fetch(&_7$$5, &types, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1617); - zephir_array_fetch(&_8$$5, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1618); - zephir_array_fetch(&_9$$5, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1619); - zephir_array_fetch(&_10$$5, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1620); - ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 340, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &_10$$5, &p); + zephir_array_fetch(&_6$$5, &names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1621); + zephir_array_fetch(&_7$$5, &types, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1622); + zephir_array_fetch(&_8$$5, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1623); + zephir_array_fetch(&_9$$5, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1624); + zephir_array_fetch(&_10$$5, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1625); + 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", 1627); + zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1632); if (Z_TYPE_P(&parentFiles) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&parentFiles), _12$$5) { ZEPHIR_INIT_NVAR(&file); ZVAL_COPY(&file, _12$$5); - zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1625); + zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1630); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &parentFiles, "rewind", NULL, 0); @@ -4687,7 +4704,7 @@ PHP_METHOD(Phalcon_Http_Request, smoothFiles) } ZEPHIR_CALL_METHOD(&file, &parentFiles, "current", NULL, 0); zephir_check_call_status(); - zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1625); + zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1630); ZEPHIR_CALL_METHOD(NULL, &parentFiles, "next", NULL, 0); zephir_check_call_status(); } @@ -4715,35 +4732,35 @@ PHP_METHOD(Phalcon_Http_Request, smoothFiles) zephir_create_array(&_14$$9, 6, 0); zephir_array_update_string(&_14$$9, SL("name"), &name, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_15$$9); - zephir_array_fetch(&_15$$9, &types, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1606); + zephir_array_fetch(&_15$$9, &types, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1611); zephir_array_update_string(&_14$$9, SL("type"), &_15$$9, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_15$$9); - zephir_array_fetch(&_15$$9, &tmp_names, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1607); + zephir_array_fetch(&_15$$9, &tmp_names, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1612); zephir_array_update_string(&_14$$9, SL("tmp_name"), &_15$$9, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_15$$9); - zephir_array_fetch(&_15$$9, &sizes, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1608); + zephir_array_fetch(&_15$$9, &sizes, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1613); zephir_array_update_string(&_14$$9, SL("size"), &_15$$9, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_15$$9); - zephir_array_fetch(&_15$$9, &errors, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1609); + zephir_array_fetch(&_15$$9, &errors, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1614); zephir_array_update_string(&_14$$9, SL("error"), &_15$$9, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_14$$9, SL("key"), &p, PH_COPY | PH_SEPARATE); - zephir_array_append(&files, &_14$$9, PH_SEPARATE, "phalcon/Http/Request.zep", 1611); + zephir_array_append(&files, &_14$$9, PH_SEPARATE, "phalcon/Http/Request.zep", 1616); } if (Z_TYPE_P(&name) == IS_ARRAY) { - zephir_array_fetch(&_16$$10, &names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1616); - zephir_array_fetch(&_17$$10, &types, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1617); - zephir_array_fetch(&_18$$10, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1618); - zephir_array_fetch(&_19$$10, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1619); - zephir_array_fetch(&_20$$10, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1620); - ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 340, &_16$$10, &_17$$10, &_18$$10, &_19$$10, &_20$$10, &p); + zephir_array_fetch(&_16$$10, &names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1621); + zephir_array_fetch(&_17$$10, &types, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1622); + zephir_array_fetch(&_18$$10, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1623); + zephir_array_fetch(&_19$$10, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1624); + zephir_array_fetch(&_20$$10, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1625); + 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", 1627); + zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1632); if (Z_TYPE_P(&parentFiles) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&parentFiles), _21$$10) { ZEPHIR_INIT_NVAR(&file); ZVAL_COPY(&file, _21$$10); - zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1625); + zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1630); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &parentFiles, "rewind", NULL, 0); @@ -4756,7 +4773,7 @@ PHP_METHOD(Phalcon_Http_Request, smoothFiles) } ZEPHIR_CALL_METHOD(&file, &parentFiles, "current", NULL, 0); zephir_check_call_status(); - zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1625); + zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1630); ZEPHIR_CALL_METHOD(NULL, &parentFiles, "next", NULL, 0); zephir_check_call_status(); } @@ -4798,7 +4815,7 @@ PHP_METHOD(Phalcon_Http_Request, getFilterService) zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&container, &_1$$3); if (Z_TYPE_P(&container) == IS_NULL) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_request_exception_ce, "A dependency injection container is required to access the 'filter' service", "phalcon/Http/Request.zep", 1648); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_request_exception_ce, "A dependency injection container is required to access the 'filter' service", "phalcon/Http/Request.zep", 1653); return; } ZEPHIR_INIT_VAR(&_3$$3); @@ -4892,7 +4909,7 @@ PHP_METHOD(Phalcon_Http_Request, getFilteredData) ZEPHIR_OBS_VAR(&filters); zephir_read_property(&_0, this_ptr, ZEND_STRL("queryFilters"), PH_NOISY_CC | PH_READONLY); - zephir_array_fetch(&_1, &_0, &methodKey, PH_READONLY, "phalcon/Http/Request.zep", 1680); + zephir_array_fetch(&_1, &_0, &methodKey, PH_READONLY, "phalcon/Http/Request.zep", 1685); if (!(zephir_array_isset_fetch(&filters, &_1, &name, 0))) { ZEPHIR_INIT_NVAR(&filters); array_init(&filters); @@ -4996,7 +5013,7 @@ PHP_METHOD(Phalcon_Http_Request, getPatchPut) if (_0$$3) { ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "json"); - ZEPHIR_CALL_FUNCTION(&_2$$3, "stripos", NULL, 346, &contentType, &_1$$3); + ZEPHIR_CALL_FUNCTION(&_2$$3, "stripos", NULL, 347, &contentType, &_1$$3); zephir_check_call_status(); _0$$3 = !ZEPHIR_IS_FALSE(&_2$$3); } @@ -5014,7 +5031,7 @@ PHP_METHOD(Phalcon_Http_Request, getPatchPut) ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "getrawbody", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&cached); - ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 347, &_4$$6, &cached); + ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 348, &_4$$6, &cached); ZEPHIR_UNREF(&cached); zephir_check_call_status(); } @@ -5030,7 +5047,7 @@ PHP_METHOD(Phalcon_Http_Request, getPatchPut) } else { ZVAL_BOOL(&_6, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 331, &cached, &name, filters, defaultValue, &_5, &_6); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 332, &cached, &name, filters, defaultValue, &_5, &_6); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/http/request/file.zep.c b/ext/phalcon/http/request/file.zep.c index 8ffb91c57e..e076d1c3cf 100644 --- a/ext/phalcon/http/request/file.zep.c +++ b/ext/phalcon/http/request/file.zep.c @@ -140,7 +140,7 @@ 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, 108, &_0$$3); + ZEPHIR_CALL_FUNCTION(&_1$$3, "defined", NULL, 114, &_0$$3); zephir_check_call_status(); if (zephir_is_true(&_1$$3)) { ZVAL_LONG(&_2$$4, 4); @@ -151,22 +151,22 @@ PHP_METHOD(Phalcon_Http_Request_File, __construct) } ZEPHIR_INIT_VAR(&_5); ZVAL_STRING(&_5, "tmp_name"); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "getarrval", NULL, 348, &file, &_5); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "getarrval", NULL, 349, &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, 348, &file, &_5); + ZEPHIR_CALL_METHOD(&_6, this_ptr, "getarrval", NULL, 349, &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, 348, &file, &_5); + ZEPHIR_CALL_METHOD(&_7, this_ptr, "getarrval", NULL, 349, &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, 348, &file, &_5); + ZEPHIR_CALL_METHOD(&_8, this_ptr, "getarrval", NULL, 349, &file, &_5); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("error"), &_8); if (zephir_is_true(key)) { @@ -241,15 +241,15 @@ PHP_METHOD(Phalcon_Http_Request_File, getRealType) ZEPHIR_MM_GROW(); ZVAL_LONG(&_0, 16); - ZEPHIR_CALL_FUNCTION(&finfo, "finfo_open", NULL, 306, &_0); + ZEPHIR_CALL_FUNCTION(&finfo, "finfo_open", NULL, 307, &_0); zephir_check_call_status(); 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, 307, &finfo, &_0); + ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 308, &finfo, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 308, &finfo); + ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 309, &finfo); zephir_check_call_status(); RETURN_CCTOR(&mime); } @@ -354,7 +354,7 @@ 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, 349, &_0, &destination); + ZEPHIR_RETURN_CALL_FUNCTION("move_uploaded_file", NULL, 350, &_0, &destination); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/http/response.zep.c b/ext/phalcon/http/response.zep.c index a0078cfd1f..54758f5ee1 100644 --- a/ext/phalcon/http/response.zep.c +++ b/ext/phalcon/http/response.zep.c @@ -82,6 +82,10 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Response) * @var array */ zend_declare_property_null(phalcon_http_response_ce, SL("statusCodes"), ZEND_ACC_PROTECTED); + /** + * @var Encode + */ + zend_declare_property_null(phalcon_http_response_ce, SL("encode"), ZEND_ACC_PRIVATE); phalcon_http_response_ce->create_object = zephir_init_properties_Phalcon_Http_Response; zend_class_implements(phalcon_http_response_ce, 1, phalcon_http_responseinterface_ce); @@ -98,7 +102,7 @@ PHP_METHOD(Phalcon_Http_Response, __construct) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *content_param = NULL, *code = NULL, code_sub, *status = NULL, status_sub, __$null, _0; + zval *content_param = NULL, *code = NULL, code_sub, *status = NULL, status_sub, __$null, _0, _1; zval content; zval *this_ptr = getThis(); @@ -107,6 +111,7 @@ PHP_METHOD(Phalcon_Http_Response, __construct) ZVAL_UNDEF(&status_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, 3) @@ -151,6 +156,14 @@ PHP_METHOD(Phalcon_Http_Response, __construct) } zephir_update_property_zval(this_ptr, ZEND_STRL("headers"), &_0); + ZEPHIR_INIT_VAR(&_1); + object_init_ex(&_1, phalcon_support_helper_json_encode_ce); + if (zephir_has_constructor(&_1)) { + ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 0); + zephir_check_call_status(); + } + + zephir_update_property_zval(this_ptr, ZEND_STRL("encode"), &_1); if (!ZEPHIR_IS_NULL(&content)) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "setcontent", NULL, 0, &content); zephir_check_call_status(); @@ -252,7 +265,7 @@ PHP_METHOD(Phalcon_Http_Response, getDI) 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_http_response_exception_ce, "A dependency injection container is required to access the 'url' service", "phalcon/Http/Response.zep", 147); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "A dependency injection container is required to access the 'url' service", "phalcon/Http/Response.zep", 153); return; } zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container); @@ -502,7 +515,7 @@ 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, 350, location, &_1$$5); + ZEPHIR_CALL_FUNCTION(&_2$$5, "strstr", NULL, 351, location, &_1$$5); zephir_check_call_status(); _0$$5 = zephir_is_true(&_2$$5); } @@ -648,7 +661,7 @@ PHP_METHOD(Phalcon_Http_Response, send) zephir_read_property(&_0, this_ptr, ZEND_STRL("sent"), PH_NOISY_CC | PH_READONLY); if (UNEXPECTED(zephir_is_true(&_0))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "Response was already sent", "phalcon/Http/Response.zep", 337); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "Response was already sent", "phalcon/Http/Response.zep", 343); return; } ZEPHIR_CALL_METHOD(NULL, this_ptr, "sendheaders", NULL, 0); @@ -667,7 +680,7 @@ PHP_METHOD(Phalcon_Http_Response, send) _3$$5 = ((zephir_fast_strlen_ev(&file)) ? 1 : 0); } if (_3$$5) { - ZEPHIR_CALL_FUNCTION(NULL, "readfile", NULL, 351, &file); + ZEPHIR_CALL_FUNCTION(NULL, "readfile", NULL, 352, &file); zephir_check_call_status(); } } @@ -948,7 +961,7 @@ PHP_METHOD(Phalcon_Http_Response, setCookies) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(cookies, zephir_get_internal_ce(SL("phalcon\\http\\response\\cookiesinterface"))) + Z_PARAM_OBJECT_OF_CLASS(cookies, phalcon_http_response_cookiesinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -972,7 +985,7 @@ PHP_METHOD(Phalcon_Http_Response, setDI) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1095,7 +1108,7 @@ PHP_METHOD(Phalcon_Http_Response, setEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1159,16 +1172,16 @@ 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, 352, &filePath); + ZEPHIR_CALL_METHOD(&basePath, this_ptr, "getbasename", NULL, 353, &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, 353); + ZEPHIR_CALL_FUNCTION(&_0$$6, "mb_detect_order", NULL, 354); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&basePathEncoding, "mb_detect_encoding", NULL, 321, &basePath, &_0$$6, &__$true); + ZEPHIR_CALL_FUNCTION(&basePathEncoding, "mb_detect_encoding", NULL, 322, &basePath, &_0$$6, &__$true); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_1$$5); @@ -1184,7 +1197,7 @@ 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, 325, &basePath); + ZEPHIR_CALL_FUNCTION(&_2$$7, "rawurlencode", NULL, 326, &basePath); zephir_check_call_status(); ZEPHIR_CPY_WRT(&basePath, &_2$$7); ZEPHIR_INIT_VAR(&_3$$7); @@ -1196,7 +1209,7 @@ 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, 208, &basePath, &_5$$8); + ZEPHIR_CALL_FUNCTION(&_6$$8, "addcslashes", NULL, 211, &basePath, &_5$$8); zephir_check_call_status(); ZEPHIR_CPY_WRT(&basePath, &_6$$8); ZEPHIR_INIT_VAR(&_7$$8); @@ -1269,7 +1282,7 @@ PHP_METHOD(Phalcon_Http_Response, setHeaders) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(headers, zephir_get_internal_ce(SL("phalcon\\http\\response\\headersinterface"))) + Z_PARAM_OBJECT_OF_CLASS(headers, phalcon_http_response_headersinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1280,7 +1293,7 @@ PHP_METHOD(Phalcon_Http_Response, setHeaders) ZEPHIR_CALL_METHOD(&data, headers, "toarray", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&data, 0, "phalcon/Http/Response.zep", 622); + zephir_is_iterable(&data, 0, "phalcon/Http/Response.zep", 628); if (Z_TYPE_P(&data) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _2, _3, _0) { @@ -1337,7 +1350,7 @@ PHP_METHOD(Phalcon_Http_Response, setJsonContent) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long jsonOptions, depth, ZEPHIR_LAST_CALL_STATUS; - zval *content, content_sub, *jsonOptions_param = NULL, *depth_param = NULL, _0, _1, _2, _3; + zval *content, content_sub, *jsonOptions_param = NULL, *depth_param = NULL, _0, _1, _2, _3, _4; zval *this_ptr = getThis(); ZVAL_UNDEF(&content_sub); @@ -1345,6 +1358,7 @@ PHP_METHOD(Phalcon_Http_Response, setJsonContent) 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, 3) @@ -1374,11 +1388,12 @@ PHP_METHOD(Phalcon_Http_Response, setJsonContent) ZVAL_STRING(&_0, "application/json"); ZEPHIR_CALL_METHOD(NULL, this_ptr, "setcontenttype", NULL, 0, &_0); zephir_check_call_status(); - ZVAL_LONG(&_2, jsonOptions); - ZVAL_LONG(&_3, depth); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "encode", NULL, 354, content, &_2, &_3); + zephir_read_property(&_1, this_ptr, ZEND_STRL("encode"), PH_NOISY_CC | PH_READONLY); + ZVAL_LONG(&_3, jsonOptions); + ZVAL_LONG(&_4, depth); + ZEPHIR_CALL_METHOD(&_2, &_1, "__invoke", NULL, 0, content, &_3, &_4); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "setcontent", NULL, 0, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setcontent", NULL, 0, &_2); zephir_check_call_status(); RETURN_THIS(); } @@ -1530,7 +1545,7 @@ PHP_METHOD(Phalcon_Http_Response, setStatusCode) 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); + zephir_is_iterable(¤tHeadersRaw, 0, "phalcon/Http/Response.zep", 717); if (Z_TYPE_P(¤tHeadersRaw) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(¤tHeadersRaw), _4, _5, _2) { @@ -1546,7 +1561,7 @@ PHP_METHOD(Phalcon_Http_Response, setStatusCode) if (_6$$3) { ZEPHIR_INIT_NVAR(&_7$$3); ZVAL_STRING(&_7$$3, "HTTP/"); - ZEPHIR_CALL_FUNCTION(&_8$$3, "strstr", &_9, 350, &key, &_7$$3); + ZEPHIR_CALL_FUNCTION(&_8$$3, "strstr", &_9, 351, &key, &_7$$3); zephir_check_call_status(); _6$$3 = zephir_is_true(&_8$$3); } @@ -1573,7 +1588,7 @@ PHP_METHOD(Phalcon_Http_Response, setStatusCode) if (_11$$5) { ZEPHIR_INIT_NVAR(&_12$$5); ZVAL_STRING(&_12$$5, "HTTP/"); - ZEPHIR_CALL_FUNCTION(&_13$$5, "strstr", &_9, 350, &key, &_12$$5); + ZEPHIR_CALL_FUNCTION(&_13$$5, "strstr", &_9, 351, &key, &_12$$5); zephir_check_call_status(); _11$$5 = zephir_is_true(&_13$$5); } @@ -1590,7 +1605,7 @@ PHP_METHOD(Phalcon_Http_Response, setStatusCode) ZEPHIR_INIT_NVAR(&key); if (ZEPHIR_IS_NULL(&message)) { ZEPHIR_INIT_VAR(&statusCodes); - zephir_create_array(&statusCodes, 88, 0); + 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")); @@ -1680,11 +1695,11 @@ PHP_METHOD(Phalcon_Http_Response, setStatusCode) 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); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "Non-standard statuscode given without a message", "phalcon/Http/Response.zep", 824); return; } ZEPHIR_OBS_VAR(&defaultMessage); - zephir_array_fetch_long(&defaultMessage, &statusCodes, code, PH_NOISY, "phalcon/Http/Response.zep", 821); + zephir_array_fetch_long(&defaultMessage, &statusCodes, code, PH_NOISY, "phalcon/Http/Response.zep", 827); zephir_get_strval(&message, &defaultMessage); } zephir_read_property(&_15, this_ptr, ZEND_STRL("headers"), PH_NOISY_CC | PH_READONLY); @@ -1812,7 +1827,7 @@ PHP_METHOD(Phalcon_Http_Response, getBasename) 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); + zephir_array_fetch_long(&filename, &matches, 0, PH_NOISY, "phalcon/Http/Response.zep", 867); } else { ZEPHIR_INIT_NVAR(&filename); ZVAL_STRING(&filename, ""); @@ -1833,71 +1848,6 @@ PHP_METHOD(Phalcon_Http_Response, getBasename) RETURN_CCTOR(&filename); } -/** - * @todo This will be removed when traits are introduced - */ -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, 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, 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(&_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; diff --git a/ext/phalcon/http/response.zep.h b/ext/phalcon/http/response.zep.h index 7d771a052a..041faf4b8d 100644 --- a/ext/phalcon/http/response.zep.h +++ b/ext/phalcon/http/response.zep.h @@ -38,7 +38,6 @@ PHP_METHOD(Phalcon_Http_Response, setNotModified); PHP_METHOD(Phalcon_Http_Response, setStatusCode); PHP_METHOD(Phalcon_Http_Response, setRawHeader); PHP_METHOD(Phalcon_Http_Response, getBasename); -PHP_METHOD(Phalcon_Http_Response, encode); zend_object *zephir_init_properties_Phalcon_Http_Response(zend_class_entry *class_type); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_response___construct, 0, 0, 0) @@ -182,12 +181,6 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_response_getbasenam ZEND_ARG_INFO(0, suffix) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_response_encode, 0, 1, IS_STRING, 0) - ZEND_ARG_INFO(0, data) - ZEND_ARG_TYPE_INFO(0, options, IS_LONG, 0) - ZEND_ARG_TYPE_INFO(0, depth, IS_LONG, 0) -ZEND_END_ARG_INFO() - ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_response_zephir_init_properties_phalcon_http_response, 0, 0, 0) ZEND_END_ARG_INFO() @@ -231,6 +224,5 @@ ZEPHIR_INIT_FUNCS(phalcon_http_response_method_entry) { PHP_ME(Phalcon_Http_Response, setStatusCode, arginfo_phalcon_http_response_setstatuscode, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Response, setRawHeader, arginfo_phalcon_http_response_setrawheader, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Response, getBasename, arginfo_phalcon_http_response_getbasename, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Http_Response, encode, arginfo_phalcon_http_response_encode, ZEND_ACC_PRIVATE) PHP_FE_END }; diff --git a/ext/phalcon/image/adapter/abstractadapter.zep.c b/ext/phalcon/image/adapter/abstractadapter.zep.c index b3265ad2dc..d77288b7a1 100644 --- a/ext/phalcon/image/adapter/abstractadapter.zep.c +++ b/ext/phalcon/image/adapter/abstractadapter.zep.c @@ -476,7 +476,7 @@ PHP_METHOD(Phalcon_Image_Adapter_AbstractAdapter, mask) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(mask, zephir_get_internal_ce(SL("phalcon\\image\\adapter\\adapterinterface"))) + Z_PARAM_OBJECT_OF_CLASS(mask, phalcon_image_adapter_adapterinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1189,7 +1189,7 @@ PHP_METHOD(Phalcon_Image_Adapter_AbstractAdapter, watermark) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 4) - Z_PARAM_OBJECT_OF_CLASS(watermark, zephir_get_internal_ce(SL("phalcon\\image\\adapter\\adapterinterface"))) + Z_PARAM_OBJECT_OF_CLASS(watermark, phalcon_image_adapter_adapterinterface_ce) Z_PARAM_OPTIONAL Z_PARAM_LONG(offsetX) Z_PARAM_LONG(offsetY) diff --git a/ext/phalcon/image/adapter/gd.zep.c b/ext/phalcon/image/adapter/gd.zep.c index 8127cd1896..a939a46626 100644 --- a/ext/phalcon/image/adapter/gd.zep.c +++ b/ext/phalcon/image/adapter/gd.zep.c @@ -132,7 +132,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("realpath"), &_2$$3); zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&imageInfo, "getimagesize", NULL, 309, &_3$$3); + ZEPHIR_CALL_FUNCTION(&imageInfo, "getimagesize", NULL, 310, &_3$$3); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&imageInfo)) { zephir_array_fetch_long(&_4$$4, &imageInfo, 0, PH_NOISY | PH_READONLY, "phalcon/Image/Adapter/Gd.zep", 42); @@ -315,7 +315,7 @@ 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, 108, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "defined", NULL, 114, &_0); zephir_check_call_status(); if (zephir_is_true(&_1)) { ZEPHIR_INIT_NVAR(&version); @@ -391,7 +391,7 @@ 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, 279, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 280, &_1); zephir_check_call_status(); zephir_round(&_0, &_2, NULL, NULL); opacity = zephir_get_intval(&_0); @@ -679,7 +679,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processMask) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(mask, zephir_get_internal_ce(SL("phalcon\\image\\adapter\\adapterinterface"))) + Z_PARAM_OBJECT_OF_CLASS(mask, phalcon_image_adapter_adapterinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -946,7 +946,7 @@ 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, 279, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 280, &_1); zephir_check_call_status(); zephir_round(&_0, &_2, NULL, NULL); opacity = zephir_get_intval(&_0); @@ -1448,7 +1448,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processSharpen) ZEPHIR_INIT_VAR(&_0); ZVAL_LONG(&_1, (-18 + ((amount * 0.08)))); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 279, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 280, &_1); zephir_check_call_status(); ZVAL_LONG(&_1, 2); zephir_round(&_0, &_2, &_1, NULL); @@ -1617,7 +1617,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processText) ZVAL_LONG(offsetY, _1); ZEPHIR_INIT_VAR(&_2); ZVAL_DOUBLE(&_3, ((zephir_safe_div_long_long((opacity * 127), 100)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_4, "abs", NULL, 279, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "abs", NULL, 280, &_3); zephir_check_call_status(); zephir_round(&_2, &_4, NULL, NULL); opacity = zephir_get_intval(&_2); @@ -1646,11 +1646,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processText) topRightY = zephir_get_intval(&_10$$5); } ZVAL_LONG(&_5$$3, (topRightX - bottomLeftX)); - ZEPHIR_CALL_FUNCTION(&_11$$3, "abs", NULL, 279, &_5$$3); + ZEPHIR_CALL_FUNCTION(&_11$$3, "abs", NULL, 280, &_5$$3); zephir_check_call_status(); ZVAL_LONG(&width, (zephir_get_numberval(&_11$$3) + 10)); ZVAL_LONG(&_5$$3, (topRightY - bottomLeftY)); - ZEPHIR_CALL_FUNCTION(&_12$$3, "abs", NULL, 279, &_5$$3); + ZEPHIR_CALL_FUNCTION(&_12$$3, "abs", NULL, 280, &_5$$3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&height); ZVAL_LONG(&height, (zephir_get_numberval(&_12$$3) + 10)); @@ -1754,7 +1754,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processWatermark) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(4, 4) - Z_PARAM_OBJECT_OF_CLASS(watermark, zephir_get_internal_ce(SL("phalcon\\image\\adapter\\adapterinterface"))) + Z_PARAM_OBJECT_OF_CLASS(watermark, phalcon_image_adapter_adapterinterface_ce) Z_PARAM_LONG(offsetX) Z_PARAM_LONG(offsetY) Z_PARAM_LONG(opacity) @@ -1784,7 +1784,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processWatermark) 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, 279, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "abs", NULL, 280, &_4$$3); zephir_check_call_status(); zephir_round(&_3$$3, &_5$$3, NULL, NULL); opacity = zephir_get_intval(&_3$$3); @@ -1852,7 +1852,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, check) ZVAL_STRING(&_0, "2.0.1"); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, ">="); - ZEPHIR_CALL_FUNCTION(&_2, "version_compare", NULL, 124, &version, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "version_compare", NULL, 130, &version, &_0, &_1); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(&_2)) { ZEPHIR_INIT_VAR(&_3$$3); diff --git a/ext/phalcon/image/adapter/imagick.zep.c b/ext/phalcon/image/adapter/imagick.zep.c index 2e174edbdd..e71158bd6b 100644 --- a/ext/phalcon/image/adapter/imagick.zep.c +++ b/ext/phalcon/image/adapter/imagick.zep.c @@ -148,11 +148,8 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, __construct) zephir_update_property_zval(this_ptr, ZEND_STRL("file"), &file); ZEPHIR_INIT_VAR(&_0); object_init_ex(&_0, zephir_get_internal_ce(SL("imagick"))); - if (zephir_has_constructor(&_0)) { - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 0); - zephir_check_call_status(); - } - + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 0); + zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_0); zephir_read_property(&_1, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); if (1 == (zephir_file_exists(&_1) == SUCCESS)) { @@ -183,7 +180,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, __construct) zephir_read_property(&_12$$5, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_13$$5); ZVAL_STRING(&_13$$5, "Imagick::ALPHACHANNEL_SET"); - ZEPHIR_CALL_FUNCTION(&_14$$5, "constant", NULL, 109, &_13$$5); + ZEPHIR_CALL_FUNCTION(&_14$$5, "constant", NULL, 115, &_13$$5); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_12$$5, "setimagealphachannel", NULL, 0, &_14$$5); zephir_check_call_status(); @@ -227,13 +224,10 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, __construct) zephir_read_property(&_26$$7, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_27$$7); object_init_ex(&_27$$7, zephir_get_internal_ce(SL("imagickpixel"))); - if (zephir_has_constructor(&_27$$7)) { - ZEPHIR_INIT_VAR(&_28$$7); - ZVAL_STRING(&_28$$7, "transparent"); - ZEPHIR_CALL_METHOD(NULL, &_27$$7, "__construct", NULL, 0, &_28$$7); - zephir_check_call_status(); - } - + ZEPHIR_INIT_VAR(&_28$$7); + ZVAL_STRING(&_28$$7, "transparent"); + ZEPHIR_CALL_METHOD(NULL, &_27$$7, "__construct", NULL, 0, &_28$$7); + zephir_check_call_status(); ZVAL_LONG(&_29$$7, width); ZVAL_LONG(&_30$$7, height); ZEPHIR_CALL_METHOD(NULL, &_26$$7, "newimage", NULL, 0, &_29$$7, &_30$$7, &_27$$7); @@ -522,31 +516,22 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processBackground) ZVAL_LONG(&_1, red); ZVAL_LONG(&_2, green); ZVAL_LONG(&_3, blue); - ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 107, &_0, &_1, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 113, &_0, &_1, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&pixel1); object_init_ex(&pixel1, zephir_get_internal_ce(SL("imagickpixel"))); - if (zephir_has_constructor(&pixel1)) { - ZEPHIR_CALL_METHOD(NULL, &pixel1, "__construct", NULL, 0, &color); - zephir_check_call_status(); - } - + ZEPHIR_CALL_METHOD(NULL, &pixel1, "__construct", NULL, 0, &color); + zephir_check_call_status(); ZEPHIR_INIT_VAR(&pixel2); object_init_ex(&pixel2, zephir_get_internal_ce(SL("imagickpixel"))); - if (zephir_has_constructor(&pixel2)) { - ZEPHIR_INIT_NVAR(&_0); - ZVAL_STRING(&_0, "transparent"); - ZEPHIR_CALL_METHOD(NULL, &pixel2, "__construct", NULL, 0, &_0); - zephir_check_call_status(); - } - + ZEPHIR_INIT_NVAR(&_0); + ZVAL_STRING(&_0, "transparent"); + ZEPHIR_CALL_METHOD(NULL, &pixel2, "__construct", NULL, 0, &_0); + zephir_check_call_status(); ZEPHIR_INIT_VAR(&background); object_init_ex(&background, zephir_get_internal_ce(SL("imagick"))); - if (zephir_has_constructor(&background)) { - ZEPHIR_CALL_METHOD(NULL, &background, "__construct", NULL, 0); - zephir_check_call_status(); - } - + ZEPHIR_CALL_METHOD(NULL, &background, "__construct", NULL, 0); + zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_2, 0); ZEPHIR_CALL_METHOD(NULL, &_1, "setiteratorindex", NULL, 0, &_2); @@ -564,7 +549,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processBackground) if (!ZEPHIR_IS_TRUE_IDENTICAL(&_7$$3)) { ZEPHIR_INIT_NVAR(&_9$$4); ZVAL_STRING(&_9$$4, "Imagick::ALPHACHANNEL_SET"); - ZEPHIR_CALL_FUNCTION(&_10$$4, "constant", &_11, 109, &_9$$4); + ZEPHIR_CALL_FUNCTION(&_10$$4, "constant", &_11, 115, &_9$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &background, "setimagealphachannel", &_12, 0, &_10$$4); zephir_check_call_status(); @@ -573,11 +558,11 @@ 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, 109, &_14$$3); + ZEPHIR_CALL_FUNCTION(&_15$$3, "constant", &_11, 115, &_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, 109, &_14$$3); + ZEPHIR_CALL_FUNCTION(&_16$$3, "constant", &_11, 115, &_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); @@ -590,7 +575,7 @@ 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, 109, &_14$$3); + ZEPHIR_CALL_FUNCTION(&_22$$3, "constant", &_11, 115, &_14$$3); zephir_check_call_status(); ZVAL_LONG(&_23$$3, 0); ZVAL_LONG(&_24$$3, 0); @@ -852,7 +837,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processMask) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(image, zephir_get_internal_ce(SL("phalcon\\image\\adapter\\adapterinterface"))) + Z_PARAM_OBJECT_OF_CLASS(image, phalcon_image_adapter_adapterinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -863,11 +848,8 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processMask) ZEPHIR_INIT_VAR(&mask); object_init_ex(&mask, zephir_get_internal_ce(SL("imagick"))); - if (zephir_has_constructor(&mask)) { - ZEPHIR_CALL_METHOD(NULL, &mask, "__construct", NULL, 0); - zephir_check_call_status(); - } - + ZEPHIR_CALL_METHOD(NULL, &mask, "__construct", NULL, 0); + zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, image, "render", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &mask, "readimageblob", NULL, 0, &_0); @@ -887,7 +869,7 @@ 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, 109, &_5$$3); + ZEPHIR_CALL_FUNCTION(&_6$$3, "constant", &_7, 115, &_5$$3); zephir_check_call_status(); ZVAL_LONG(&_8$$3, 0); ZVAL_LONG(&_9$$3, 0); @@ -1125,11 +1107,8 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) } ZEPHIR_INIT_VAR(&fade); object_init_ex(&fade, zephir_get_internal_ce(SL("imagick"))); - if (zephir_has_constructor(&fade)) { - ZEPHIR_CALL_METHOD(NULL, &fade, "__construct", NULL, 0); - zephir_check_call_status(); - } - + ZEPHIR_CALL_METHOD(NULL, &fade, "__construct", NULL, 0); + zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_16, &reflection, "getimagewidth", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_17, &reflection, "getimageheight", NULL, 0); @@ -1146,7 +1125,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) } ZEPHIR_INIT_NVAR(&_18$$7); ZVAL_STRING(&_18$$7, "Imagick::COMPOSITE_DSTOUT"); - ZEPHIR_CALL_FUNCTION(&_19$$7, "constant", &_20, 109, &_18$$7); + ZEPHIR_CALL_FUNCTION(&_19$$7, "constant", &_20, 115, &_18$$7); zephir_check_call_status(); ZVAL_LONG(&_21$$7, 0); ZVAL_LONG(&_22$$7, 0); @@ -1158,11 +1137,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) } ZEPHIR_INIT_NVAR(&_18$$7); ZVAL_STRING(&_18$$7, "Imagick::EVALUATE_MULTIPLY"); - ZEPHIR_CALL_FUNCTION(&_24$$7, "constant", &_20, 109, &_18$$7); + ZEPHIR_CALL_FUNCTION(&_24$$7, "constant", &_20, 115, &_18$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_18$$7); ZVAL_STRING(&_18$$7, "Imagick::CHANNEL_ALPHA"); - ZEPHIR_CALL_FUNCTION(&_25$$7, "constant", &_20, 109, &_18$$7); + ZEPHIR_CALL_FUNCTION(&_25$$7, "constant", &_20, 115, &_18$$7); zephir_check_call_status(); ZVAL_LONG(&_21$$7, opacity); ZEPHIR_CALL_METHOD(NULL, &reflection, "evaluateimage", &_26, 0, &_24$$7, &_21$$7, &_25$$7); @@ -1178,18 +1157,12 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) zephir_check_call_status(); ZEPHIR_INIT_VAR(&image); object_init_ex(&image, zephir_get_internal_ce(SL("imagick"))); - if (zephir_has_constructor(&image)) { - ZEPHIR_CALL_METHOD(NULL, &image, "__construct", NULL, 0); - zephir_check_call_status(); - } - + ZEPHIR_CALL_METHOD(NULL, &image, "__construct", NULL, 0); + zephir_check_call_status(); ZEPHIR_INIT_VAR(&pixel); object_init_ex(&pixel, zephir_get_internal_ce(SL("imagickpixel"))); - if (zephir_has_constructor(&pixel)) { - ZEPHIR_CALL_METHOD(NULL, &pixel, "__construct", NULL, 0); - zephir_check_call_status(); - } - + ZEPHIR_CALL_METHOD(NULL, &pixel, "__construct", NULL, 0); + zephir_check_call_status(); zephir_read_property(&_4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&_28, &_4, "getimageheight", NULL, 0); zephir_check_call_status(); @@ -1208,7 +1181,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_34$$10); ZVAL_STRING(&_34$$10, "Imagick::ALPHACHANNEL_SET"); - ZEPHIR_CALL_FUNCTION(&_35$$10, "constant", &_20, 109, &_34$$10); + ZEPHIR_CALL_FUNCTION(&_35$$10, "constant", &_20, 115, &_34$$10); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &image, "setimagealphachannel", &_36, 0, &_35$$10); zephir_check_call_status(); @@ -1225,7 +1198,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) zephir_read_property(&_42$$10, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_34$$10); ZVAL_STRING(&_34$$10, "Imagick::COMPOSITE_SRC"); - ZEPHIR_CALL_FUNCTION(&_43$$10, "constant", &_20, 109, &_34$$10); + ZEPHIR_CALL_FUNCTION(&_43$$10, "constant", &_20, 115, &_34$$10); zephir_check_call_status(); ZVAL_LONG(&_44$$10, 0); ZVAL_LONG(&_45$$10, 0); @@ -1254,7 +1227,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) } ZEPHIR_INIT_NVAR(&_48$$13); ZVAL_STRING(&_48$$13, "Imagick::COMPOSITE_OVER"); - ZEPHIR_CALL_FUNCTION(&_49$$13, "constant", &_20, 109, &_48$$13); + ZEPHIR_CALL_FUNCTION(&_49$$13, "constant", &_20, 115, &_48$$13); zephir_check_call_status(); zephir_read_property(&_50$$13, this_ptr, ZEND_STRL("height"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_51$$13, 0); @@ -1366,7 +1339,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processRender) if (ZEPHIR_IS_STRING(&extension, "jpg") || ZEPHIR_IS_STRING(&extension, "jpeg")) { ZEPHIR_INIT_VAR(&_5$$4); ZVAL_STRING(&_5$$4, "Imagick::COMPRESSION_JPEG"); - ZEPHIR_CALL_FUNCTION(&_6$$4, "constant", NULL, 109, &_5$$4); + ZEPHIR_CALL_FUNCTION(&_6$$4, "constant", NULL, 115, &_5$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &image, "setimagecompression", NULL, 0, &_6$$4); zephir_check_call_status(); @@ -1495,11 +1468,8 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processRotate) zephir_check_call_status(); ZEPHIR_INIT_VAR(&pixel); object_init_ex(&pixel, zephir_get_internal_ce(SL("imagickpixel"))); - if (zephir_has_constructor(&pixel)) { - ZEPHIR_CALL_METHOD(NULL, &pixel, "__construct", NULL, 0); - zephir_check_call_status(); - } - + ZEPHIR_CALL_METHOD(NULL, &pixel, "__construct", NULL, 0); + zephir_check_call_status(); while (1) { if (!(1)) { break; @@ -1615,7 +1585,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processSave) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_9$$3); ZVAL_STRING(&_9$$3, "w"); - ZEPHIR_CALL_FUNCTION(&fp, "fopen", NULL, 130, &file, &_9$$3); + ZEPHIR_CALL_FUNCTION(&fp, "fopen", NULL, 136, &file, &_9$$3); zephir_check_call_status(); zephir_read_property(&_10$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(NULL, &_10$$3, "writeimagesfile", NULL, 0, &fp); @@ -1627,7 +1597,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processSave) zephir_read_property(&_11$$4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_12$$4); ZVAL_STRING(&_12$$4, "Imagick::COMPRESSION_JPEG"); - ZEPHIR_CALL_FUNCTION(&_13$$4, "constant", NULL, 109, &_12$$4); + ZEPHIR_CALL_FUNCTION(&_13$$4, "constant", NULL, 115, &_12$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_11$$4, "setimagecompression", NULL, 0, &_13$$4); zephir_check_call_status(); @@ -1805,25 +1775,19 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) opacity = (long) (zephir_safe_div_long_long(opacity, 100)); ZEPHIR_INIT_VAR(&draw); object_init_ex(&draw, zephir_get_internal_ce(SL("imagickdraw"))); - if (zephir_has_constructor(&draw)) { - ZEPHIR_CALL_METHOD(NULL, &draw, "__construct", NULL, 0); - zephir_check_call_status(); - } - + ZEPHIR_CALL_METHOD(NULL, &draw, "__construct", NULL, 0); + zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "rgb(%d, %d, %d)"); ZVAL_LONG(&_1, red); ZVAL_LONG(&_2, green); ZVAL_LONG(&_3, blue); - ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 107, &_0, &_1, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 113, &_0, &_1, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_0); object_init_ex(&_0, zephir_get_internal_ce(SL("imagickpixel"))); - if (zephir_has_constructor(&_0)) { - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 0, &color); - zephir_check_call_status(); - } - + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 0, &color); + zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &draw, "setfillcolor", NULL, 0, &_0); zephir_check_call_status(); if (Z_TYPE_P(&fontFile) != IS_NULL) { @@ -1850,7 +1814,7 @@ 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, 109, &_6$$7); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 115, &_6$$7); zephir_check_call_status(); } else if (Z_TYPE_P(offsetY) == IS_LONG) { ZEPHIR_INIT_VAR(&y); @@ -1862,7 +1826,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_7$$8) { ZEPHIR_INIT_VAR(&_8$$8); ZVAL_STRING(&_8$$8, "Imagick::GRAVITY_SOUTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 109, &_8$$8); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 115, &_8$$8); zephir_check_call_status(); } else { } @@ -1873,7 +1837,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_9$$8) { ZEPHIR_INIT_NVAR(&_8$$8); ZVAL_STRING(&_8$$8, "Imagick::GRAVITY_NORTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 109, &_8$$8); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 115, &_8$$8); zephir_check_call_status(); } else { } @@ -1884,7 +1848,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_10$$8) { ZEPHIR_INIT_NVAR(&_8$$8); ZVAL_STRING(&_8$$8, "Imagick::GRAVITY_SOUTH"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 109, &_8$$8); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 115, &_8$$8); zephir_check_call_status(); } else { } @@ -1895,7 +1859,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_11$$8) { ZEPHIR_INIT_NVAR(&_8$$8); ZVAL_STRING(&_8$$8, "Imagick::GRAVITY_NORTH"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 109, &_8$$8); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 115, &_8$$8); zephir_check_call_status(); } else { } @@ -1919,7 +1883,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_12$$11) { ZEPHIR_INIT_VAR(&_13$$11); ZVAL_STRING(&_13$$11, "Imagick::GRAVITY_SOUTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 109, &_13$$11); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 115, &_13$$11); zephir_check_call_status(); } else { } @@ -1930,7 +1894,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_14$$11) { ZEPHIR_INIT_NVAR(&_13$$11); ZVAL_STRING(&_13$$11, "Imagick::GRAVITY_SOUTH"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 109, &_13$$11); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 115, &_13$$11); zephir_check_call_status(); } else { } @@ -1941,7 +1905,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_15$$11) { ZEPHIR_INIT_NVAR(&_13$$11); ZVAL_STRING(&_13$$11, "Imagick::GRAVITY_EAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 109, &_13$$11); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 115, &_13$$11); zephir_check_call_status(); } else { } @@ -1952,7 +1916,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_16$$11) { ZEPHIR_INIT_NVAR(&_13$$11); ZVAL_STRING(&_13$$11, "Imagick::GRAVITY_WEST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 109, &_13$$11); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 115, &_13$$11); zephir_check_call_status(); } else { } @@ -1981,14 +1945,14 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (ZEPHIR_LT_LONG(&y, 0)) { ZEPHIR_INIT_VAR(&_17$$12); ZVAL_STRING(&_17$$12, "Imagick::GRAVITY_SOUTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 109, &_17$$12); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 115, &_17$$12); zephir_check_call_status(); } else { } if (ZEPHIR_GE_LONG(&y, 0)) { ZEPHIR_INIT_NVAR(&_17$$12); ZVAL_STRING(&_17$$12, "Imagick::GRAVITY_NORTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 109, &_17$$12); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 115, &_17$$12); zephir_check_call_status(); } else { } @@ -2060,7 +2024,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processWatermark) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(4, 4) - Z_PARAM_OBJECT_OF_CLASS(image, zephir_get_internal_ce(SL("phalcon\\image\\adapter\\adapterinterface"))) + Z_PARAM_OBJECT_OF_CLASS(image, phalcon_image_adapter_adapterinterface_ce) Z_PARAM_LONG(offsetX) Z_PARAM_LONG(offsetY) Z_PARAM_LONG(opacity) @@ -2078,22 +2042,19 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processWatermark) opacity = (long) (zephir_safe_div_long_long(opacity, 100)); ZEPHIR_INIT_VAR(&watermark); object_init_ex(&watermark, zephir_get_internal_ce(SL("imagick"))); - if (zephir_has_constructor(&watermark)) { - ZEPHIR_CALL_METHOD(NULL, &watermark, "__construct", NULL, 0); - zephir_check_call_status(); - } - + ZEPHIR_CALL_METHOD(NULL, &watermark, "__construct", NULL, 0); + zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, image, "render", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &watermark, "readimageblob", NULL, 0, &_0); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "Imagick::EVALUATE_MULTIPLY"); - ZEPHIR_CALL_FUNCTION(&_2, "constant", NULL, 109, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "constant", NULL, 115, &_1); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "Imagick::CHANNEL_ALPHA"); - ZEPHIR_CALL_FUNCTION(&_3, "constant", NULL, 109, &_1); + ZEPHIR_CALL_FUNCTION(&_3, "constant", NULL, 115, &_1); zephir_check_call_status(); ZVAL_LONG(&_4, opacity); ZEPHIR_CALL_METHOD(NULL, &watermark, "evaluateimage", NULL, 0, &_2, &_4, &_3); @@ -2109,7 +2070,7 @@ 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, 109, &_7$$3); + ZEPHIR_CALL_FUNCTION(&_8$$3, "constant", NULL, 115, &_7$$3); zephir_check_call_status(); ZVAL_LONG(&_9$$3, offsetX); ZVAL_LONG(&_10$$3, offsetY); @@ -2163,12 +2124,12 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, check) } ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "Imagick::IMAGICK_EXTNUM"); - ZEPHIR_CALL_FUNCTION(&_2, "defined", NULL, 108, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "defined", NULL, 114, &_1); zephir_check_call_status(); if (zephir_is_true(&_2)) { ZEPHIR_INIT_VAR(&_3$$4); ZVAL_STRING(&_3$$4, "Imagick::IMAGICK_EXTNUM"); - ZEPHIR_CALL_FUNCTION(&_4$$4, "constant", NULL, 109, &_3$$4); + ZEPHIR_CALL_FUNCTION(&_4$$4, "constant", NULL, 115, &_3$$4); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("version"), &_4$$4); } diff --git a/ext/phalcon/logger/abstractlogger.zep.c b/ext/phalcon/logger/abstractlogger.zep.c index 07e2cebffe..786da644fc 100644 --- a/ext/phalcon/logger/abstractlogger.zep.c +++ b/ext/phalcon/logger/abstractlogger.zep.c @@ -188,7 +188,7 @@ PHP_METHOD(Phalcon_Logger_AbstractLogger, addAdapter) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(name) - Z_PARAM_OBJECT_OF_CLASS(adapter, zephir_get_internal_ce(SL("phalcon\\logger\\adapter\\adapterinterface"))) + Z_PARAM_OBJECT_OF_CLASS(adapter, phalcon_logger_adapter_adapterinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/logger/adapter/abstractadapter.zep.c b/ext/phalcon/logger/adapter/abstractadapter.zep.c index c516f3ceb5..ee386b360f 100644 --- a/ext/phalcon/logger/adapter/abstractadapter.zep.c +++ b/ext/phalcon/logger/adapter/abstractadapter.zep.c @@ -153,7 +153,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, add) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(item, zephir_get_internal_ce(SL("phalcon\\logger\\item"))) + Z_PARAM_OBJECT_OF_CLASS(item, phalcon_logger_item_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -333,7 +333,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, setFormatter) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(formatter, zephir_get_internal_ce(SL("phalcon\\logger\\formatter\\formatterinterface"))) + Z_PARAM_OBJECT_OF_CLASS(formatter, phalcon_logger_formatter_formatterinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -360,7 +360,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, getFormattedItem) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(item, zephir_get_internal_ce(SL("phalcon\\logger\\item"))) + Z_PARAM_OBJECT_OF_CLASS(item, phalcon_logger_item_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/logger/adapter/noop.zep.c b/ext/phalcon/logger/adapter/noop.zep.c index 1610eaa641..a431439e89 100644 --- a/ext/phalcon/logger/adapter/noop.zep.c +++ b/ext/phalcon/logger/adapter/noop.zep.c @@ -62,7 +62,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_Noop, process) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(item, zephir_get_internal_ce(SL("phalcon\\logger\\item"))) + Z_PARAM_OBJECT_OF_CLASS(item, phalcon_logger_item_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/logger/adapter/stream.zep.c b/ext/phalcon/logger/adapter/stream.zep.c index dcf63ec9f4..6ac2a836cf 100644 --- a/ext/phalcon/logger/adapter/stream.zep.c +++ b/ext/phalcon/logger/adapter/stream.zep.c @@ -191,7 +191,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_Stream, process) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(item, zephir_get_internal_ce(SL("phalcon\\logger\\item"))) + Z_PARAM_OBJECT_OF_CLASS(item, phalcon_logger_item_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -218,7 +218,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_Stream, process) return; } ZVAL_LONG(&_6, 2); - ZEPHIR_CALL_FUNCTION(NULL, "flock", NULL, 122, &handler, &_6); + ZEPHIR_CALL_FUNCTION(NULL, "flock", NULL, 128, &handler, &_6); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_7, this_ptr, "getformatteditem", NULL, 0, item); zephir_check_call_status(); @@ -259,7 +259,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_Stream, phpFopen) zephir_get_strval(&mode, mode_param); - ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 130, &filename, &mode); + ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 136, &filename, &mode); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/logger/adapter/syslog.zep.c b/ext/phalcon/logger/adapter/syslog.zep.c index 940248ecd5..a70bf10332 100644 --- a/ext/phalcon/logger/adapter/syslog.zep.c +++ b/ext/phalcon/logger/adapter/syslog.zep.c @@ -182,7 +182,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_Syslog, process) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(item, zephir_get_internal_ce(SL("phalcon\\logger\\item"))) + Z_PARAM_OBJECT_OF_CLASS(item, phalcon_logger_item_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -207,7 +207,7 @@ 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, 107, &_7$$3, &_4$$3, &_6$$3); + ZEPHIR_CALL_FUNCTION(&_8$$3, "sprintf", NULL, 113, &_7$$3, &_4$$3, &_6$$3); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 406, &_8$$3); zephir_check_call_status(); diff --git a/ext/phalcon/logger/formatter/abstractformatter.zep.c b/ext/phalcon/logger/formatter/abstractformatter.zep.c index 9cb6863af5..aa84d5986d 100644 --- a/ext/phalcon/logger/formatter/abstractformatter.zep.c +++ b/ext/phalcon/logger/formatter/abstractformatter.zep.c @@ -77,7 +77,7 @@ PHP_METHOD(Phalcon_Logger_Formatter_AbstractFormatter, getFormattedDate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(item, zephir_get_internal_ce(SL("phalcon\\logger\\item"))) + Z_PARAM_OBJECT_OF_CLASS(item, phalcon_logger_item_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/logger/formatter/json.zep.c b/ext/phalcon/logger/formatter/json.zep.c index 27079e31b4..2aa358fdcb 100644 --- a/ext/phalcon/logger/formatter/json.zep.c +++ b/ext/phalcon/logger/formatter/json.zep.c @@ -100,7 +100,7 @@ PHP_METHOD(Phalcon_Logger_Formatter_Json, format) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(item, zephir_get_internal_ce(SL("phalcon\\logger\\item"))) + Z_PARAM_OBJECT_OF_CLASS(item, phalcon_logger_item_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/logger/formatter/line.zep.c b/ext/phalcon/logger/formatter/line.zep.c index 28cd744d0b..4e43602237 100644 --- a/ext/phalcon/logger/formatter/line.zep.c +++ b/ext/phalcon/logger/formatter/line.zep.c @@ -113,7 +113,7 @@ PHP_METHOD(Phalcon_Logger_Formatter_Line, format) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(item, zephir_get_internal_ce(SL("phalcon\\logger\\item"))) + Z_PARAM_OBJECT_OF_CLASS(item, phalcon_logger_item_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/logger/loggerfactory.zep.c b/ext/phalcon/logger/loggerfactory.zep.c index c0f798a99e..42b7ccdf10 100644 --- a/ext/phalcon/logger/loggerfactory.zep.c +++ b/ext/phalcon/logger/loggerfactory.zep.c @@ -56,7 +56,7 @@ PHP_METHOD(Phalcon_Logger_LoggerFactory, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\logger\\adapterfactory"))) + Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_logger_adapterfactory_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/messages/messages.zep.c b/ext/phalcon/messages/messages.zep.c index 9ee9ee5a2a..62dc9cfdf3 100644 --- a/ext/phalcon/messages/messages.zep.c +++ b/ext/phalcon/messages/messages.zep.c @@ -104,7 +104,7 @@ PHP_METHOD(Phalcon_Messages_Messages, appendMessage) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(message, zephir_get_internal_ce(SL("phalcon\\messages\\messageinterface"))) + Z_PARAM_OBJECT_OF_CLASS(message, phalcon_messages_messageinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/micro.zep.c b/ext/phalcon/mvc/micro.zep.c index 9ae284ea7e..b428e980f8 100644 --- a/ext/phalcon/mvc/micro.zep.c +++ b/ext/phalcon/mvc/micro.zep.c @@ -139,7 +139,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, __construct) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 1) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, phalcon_di_diinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -455,7 +455,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, setEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1607,7 +1607,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, mount) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(collection, zephir_get_internal_ce(SL("phalcon\\mvc\\micro\\collectioninterface"))) + Z_PARAM_OBJECT_OF_CLASS(collection, phalcon_mvc_micro_collectioninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2172,7 +2172,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, setDI) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2221,7 +2221,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, setModelBinder) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(modelBinder, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\binderinterface"))) + Z_PARAM_OBJECT_OF_CLASS(modelBinder, phalcon_mvc_model_binderinterface_ce) Z_PARAM_OPTIONAL Z_PARAM_ZVAL_OR_NULL(cache) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/phalcon/mvc/micro/lazyloader.zep.c b/ext/phalcon/mvc/micro/lazyloader.zep.c index 6b13a97cc3..ee68620acf 100644 --- a/ext/phalcon/mvc/micro/lazyloader.zep.c +++ b/ext/phalcon/mvc/micro/lazyloader.zep.c @@ -119,7 +119,7 @@ PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, callMethod) Z_PARAM_STR(method) Z_PARAM_ZVAL(arguments) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(modelBinder, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\binderinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(modelBinder, phalcon_mvc_model_binderinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model.zep.c b/ext/phalcon/mvc/model.zep.c index bfba20edfe..5e7b350afa 100644 --- a/ext/phalcon/mvc/model.zep.c +++ b/ext/phalcon/mvc/model.zep.c @@ -177,8 +177,8 @@ PHP_METHOD(Phalcon_Mvc_Model, __construct) ZEND_PARSE_PARAMETERS_START(0, 3) Z_PARAM_OPTIONAL Z_PARAM_ZVAL_OR_NULL(data) - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(modelsManager, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\managerinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, phalcon_di_diinterface_ce) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(modelsManager, phalcon_mvc_model_managerinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -745,7 +745,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __set) RETVAL_ZVAL(value, 1, 0); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_15, "property_exists", NULL, 285, this_ptr, &property); + ZEPHIR_CALL_FUNCTION(&_15, "property_exists", NULL, 286, this_ptr, &property); zephir_check_call_status(); if (zephir_is_true(&_15)) { ZEPHIR_CALL_METHOD(&manager, this_ptr, "getmodelsmanager", NULL, 0); @@ -937,7 +937,7 @@ PHP_METHOD(Phalcon_Mvc_Model, addBehavior) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(behavior, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\behaviorinterface"))) + Z_PARAM_OBJECT_OF_CLASS(behavior, phalcon_mvc_model_behaviorinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -983,7 +983,7 @@ PHP_METHOD(Phalcon_Mvc_Model, appendMessage) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(message, zephir_get_internal_ce(SL("phalcon\\messages\\messageinterface"))) + Z_PARAM_OBJECT_OF_CLASS(message, phalcon_messages_messageinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1393,7 +1393,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResult) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 3) - Z_PARAM_OBJECT_OF_CLASS(base, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(base, phalcon_mvc_modelinterface_ce) Z_PARAM_ARRAY(data) Z_PARAM_OPTIONAL Z_PARAM_LONG(dirtyState) @@ -4035,7 +4035,7 @@ PHP_METHOD(Phalcon_Mvc_Model, query) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 1) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, phalcon_di_diinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -4716,7 +4716,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -5175,7 +5175,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setTransaction) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(transaction, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\transactioninterface"))) + Z_PARAM_OBJECT_OF_CLASS(transaction, phalcon_mvc_model_transactioninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -6460,8 +6460,8 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(4, 4) - Z_PARAM_OBJECT_OF_CLASS(metaData, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\metadatainterface"))) - Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\db\\adapter\\adapterinterface"))) + Z_PARAM_OBJECT_OF_CLASS(metaData, phalcon_mvc_model_metadatainterface_ce) + Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_db_adapter_adapterinterface_ce) Z_PARAM_ZVAL(table) Z_PARAM_ZVAL(identityField) ZEND_PARSE_PARAMETERS_END(); @@ -6919,8 +6919,8 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(3, 3) - Z_PARAM_OBJECT_OF_CLASS(metaData, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\metadatainterface"))) - Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\db\\adapter\\adapterinterface"))) + Z_PARAM_OBJECT_OF_CLASS(metaData, phalcon_mvc_model_metadatainterface_ce) + Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_db_adapter_adapterinterface_ce) Z_PARAM_ZVAL(table) ZEND_PARSE_PARAMETERS_END(); #endif @@ -7417,8 +7417,8 @@ PHP_METHOD(Phalcon_Mvc_Model, has) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(metaData, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\metadatainterface"))) - Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\db\\adapter\\adapterinterface"))) + Z_PARAM_OBJECT_OF_CLASS(metaData, phalcon_mvc_model_metadatainterface_ce) + Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_db_adapter_adapterinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -8180,7 +8180,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSave) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(3, 3) - Z_PARAM_OBJECT_OF_CLASS(metaData, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\metadatainterface"))) + Z_PARAM_OBJECT_OF_CLASS(metaData, phalcon_mvc_model_metadatainterface_ce) Z_PARAM_BOOL(exists) Z_PARAM_ZVAL(identityField) ZEND_PARSE_PARAMETERS_END(); @@ -8555,7 +8555,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\db\\adapter\\adapterinterface"))) + Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_db_adapter_adapterinterface_ce) Z_PARAM_ZVAL(related) ZEND_PARSE_PARAMETERS_END(); #endif @@ -8988,7 +8988,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(connection, zephir_get_internal_ce(SL("phalcon\\db\\adapter\\adapterinterface"))) + Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_db_adapter_adapterinterface_ce) Z_PARAM_ZVAL(related) ZEND_PARSE_PARAMETERS_END(); #endif @@ -11003,7 +11003,7 @@ PHP_METHOD(Phalcon_Mvc_Model, validate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(validator, zephir_get_internal_ce(SL("phalcon\\filter\\validation\\validationinterface"))) + Z_PARAM_OBJECT_OF_CLASS(validator, phalcon_filter_validation_validationinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model/behavior.zep.c b/ext/phalcon/mvc/model/behavior.zep.c index 686355e4da..bbe42d548a 100644 --- a/ext/phalcon/mvc/model/behavior.zep.c +++ b/ext/phalcon/mvc/model/behavior.zep.c @@ -149,7 +149,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Behavior, missingMethod) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 3) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_STR(method) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(arguments) @@ -224,7 +224,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Behavior, notify) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(type) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model/behavior/softdelete.zep.c b/ext/phalcon/mvc/model/behavior/softdelete.zep.c index 4117f4aaf9..9a030939c6 100644 --- a/ext/phalcon/mvc/model/behavior/softdelete.zep.c +++ b/ext/phalcon/mvc/model/behavior/softdelete.zep.c @@ -76,7 +76,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Behavior_SoftDelete, notify) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(type) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model/behavior/timestampable.zep.c b/ext/phalcon/mvc/model/behavior/timestampable.zep.c index 9826f2cd66..791e34d207 100644 --- a/ext/phalcon/mvc/model/behavior/timestampable.zep.c +++ b/ext/phalcon/mvc/model/behavior/timestampable.zep.c @@ -68,7 +68,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Behavior_Timestampable, notify) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(type) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model/binder.zep.c b/ext/phalcon/mvc/model/binder.zep.c index 9cfc14ab19..39d5d5588f 100644 --- a/ext/phalcon/mvc/model/binder.zep.c +++ b/ext/phalcon/mvc/model/binder.zep.c @@ -84,7 +84,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, __construct) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 1) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(cache, zephir_get_internal_ce(SL("phalcon\\cache\\adapter\\adapterinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(cache, phalcon_cache_adapter_adapterinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -439,12 +439,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection) zephir_check_call_status(); } else { object_init_ex(&reflection, zephir_get_internal_ce(SL("reflectionfunction"))); - ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 141, handler); + ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 147, 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, 142); + ZEPHIR_CALL_METHOD(&methodParams, &reflection, "getparameters", NULL, 148); zephir_check_call_status(); ZEPHIR_INIT_VAR(¶msKeys); zephir_array_keys(¶msKeys, ¶ms); @@ -636,7 +636,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, setCache) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(cache, zephir_get_internal_ce(SL("phalcon\\cache\\adapter\\adapterinterface"))) + Z_PARAM_OBJECT_OF_CLASS(cache, phalcon_cache_adapter_adapterinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model/criteria.zep.c b/ext/phalcon/mvc/model/criteria.zep.c index 7fc69cfe26..e1d8f95f4c 100644 --- a/ext/phalcon/mvc/model/criteria.zep.c +++ b/ext/phalcon/mvc/model/criteria.zep.c @@ -622,7 +622,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, fromInput) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(3, 4) - Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) Z_PARAM_STR(modelName) Z_PARAM_ARRAY(data) Z_PARAM_OPTIONAL @@ -1459,11 +1459,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, limit) ZVAL_LONG(&_0, limit); - ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 279, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 280, &_0); zephir_check_call_status(); limit = zephir_get_numberval(&_1); ZVAL_LONG(&_0, offset); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 279, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 280, &_0); zephir_check_call_status(); offset = zephir_get_numberval(&_2); if (UNEXPECTED(limit == 0)) { @@ -1853,7 +1853,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, setDI) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model/manager.zep.c b/ext/phalcon/mvc/model/manager.zep.c index 40387efde2..21f3a6226d 100644 --- a/ext/phalcon/mvc/model/manager.zep.c +++ b/ext/phalcon/mvc/model/manager.zep.c @@ -253,8 +253,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, addBehavior) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) - Z_PARAM_OBJECT_OF_CLASS(behavior, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\behaviorinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(behavior, phalcon_mvc_model_behaviorinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -315,7 +315,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, addBelongsTo) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(4, 5) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_ZVAL(fields) Z_PARAM_STR(referencedModel) Z_PARAM_ZVAL(referencedFields) @@ -435,7 +435,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasMany) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(4, 5) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_ZVAL(fields) Z_PARAM_STR(referencedModel) Z_PARAM_ZVAL(referencedFields) @@ -563,7 +563,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasManyToMany) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(7, 8) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_ZVAL(fields) Z_PARAM_STR(intermediateModel) Z_PARAM_ZVAL(intermediateFields) @@ -706,7 +706,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasOne) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(4, 5) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_ZVAL(fields) Z_PARAM_STR(referencedModel) Z_PARAM_ZVAL(referencedFields) @@ -833,7 +833,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasOneThrough) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(7, 8) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_ZVAL(fields) Z_PARAM_STR(intermediateModel) Z_PARAM_ZVAL(intermediateFields) @@ -1439,7 +1439,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getBelongsTo) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1495,7 +1495,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getBelongsToRecords) ZEND_PARSE_PARAMETERS_START(3, 5) Z_PARAM_STR(modelName) Z_PARAM_STR(modelRelation) - Z_PARAM_OBJECT_OF_CLASS(record, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(record, phalcon_mvc_modelinterface_ce) Z_PARAM_OPTIONAL Z_PARAM_ZVAL_OR_NULL(parameters) Z_PARAM_STR_OR_NULL(method) @@ -1589,7 +1589,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getConnectionService) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_ARRAY(connectionServices) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1629,7 +1629,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getCustomEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1687,7 +1687,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getHasMany) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1735,7 +1735,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getHasManyRecords) ZEND_PARSE_PARAMETERS_START(3, 5) Z_PARAM_STR(modelName) Z_PARAM_STR(modelRelation) - Z_PARAM_OBJECT_OF_CLASS(record, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(record, phalcon_mvc_modelinterface_ce) Z_PARAM_OPTIONAL Z_PARAM_ZVAL_OR_NULL(parameters) Z_PARAM_STR_OR_NULL(method) @@ -1808,7 +1808,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getHasManyToMany) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1843,7 +1843,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getHasOne) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1878,7 +1878,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getHasOneAndHasMany) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1924,7 +1924,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getHasOneRecords) ZEND_PARSE_PARAMETERS_START(3, 5) Z_PARAM_STR(modelName) Z_PARAM_STR(modelRelation) - Z_PARAM_OBJECT_OF_CLASS(record, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(record, phalcon_mvc_modelinterface_ce) Z_PARAM_OPTIONAL Z_PARAM_ZVAL_OR_NULL(parameters) Z_PARAM_STR_OR_NULL(method) @@ -1997,7 +1997,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getHasOneThrough) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2068,7 +2068,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getModelSchema) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2107,7 +2107,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getModelSource) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2149,7 +2149,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getReadConnection) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2179,7 +2179,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getReadConnectionService) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2340,8 +2340,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getRelationRecords) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 4) - Z_PARAM_OBJECT_OF_CLASS(relation, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\relationinterface"))) - Z_PARAM_OBJECT_OF_CLASS(record, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(relation, phalcon_mvc_model_relationinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(record, phalcon_mvc_modelinterface_ce) Z_PARAM_OPTIONAL Z_PARAM_ZVAL_OR_NULL(parameters) Z_PARAM_STR_OR_NULL(method) @@ -2972,7 +2972,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getWriteConnection) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -3006,7 +3006,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getWriteConnectionService) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -3330,7 +3330,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, initialize) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -3426,7 +3426,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, isKeepingSnapshots) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -3464,7 +3464,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, isUsingDynamicUpdate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -3523,7 +3523,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, isVisibleModelProperty) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_STR(property) ZEND_PARSE_PARAMETERS_END(); #endif @@ -3542,10 +3542,10 @@ 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, 144, &className); + ZEPHIR_CALL_METHOD(NULL, &classReflection, "__construct", NULL, 150, &className); zephir_check_call_status(); ZVAL_LONG(&_1$$3, 1); - ZEPHIR_CALL_METHOD(&reflectionProperties, &classReflection, "getproperties", NULL, 155, &_1$$3); + ZEPHIR_CALL_METHOD(&reflectionProperties, &classReflection, "getproperties", NULL, 161, &_1$$3); zephir_check_call_status(); zephir_is_iterable(&reflectionProperties, 0, "phalcon/Mvc/Model/Manager.zep", 1905); if (Z_TYPE_P(&reflectionProperties) == IS_ARRAY) { @@ -3605,7 +3605,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, keepSnapshots) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_BOOL(keepSnapshots) ZEND_PARSE_PARAMETERS_END(); #endif @@ -3726,7 +3726,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, notifyEvent) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(eventName) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -3844,7 +3844,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, missingMethod) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(3, 3) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_STR(eventName) Z_PARAM_ZVAL(data) ZEND_PARSE_PARAMETERS_END(); @@ -3936,7 +3936,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, setConnectionService) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_STR(connectionService) ZEND_PARSE_PARAMETERS_END(); #endif @@ -3982,8 +3982,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, setCustomEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -4014,7 +4014,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, setDI) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -4041,7 +4041,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, setEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -4132,7 +4132,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, setModelSchema) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_STR(schema) ZEND_PARSE_PARAMETERS_END(); #endif @@ -4178,7 +4178,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, setModelSource) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_STR(source) ZEND_PARSE_PARAMETERS_END(); #endif @@ -4224,7 +4224,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, setReadConnectionService) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_STR(connectionService) ZEND_PARSE_PARAMETERS_END(); #endif @@ -4325,7 +4325,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, setWriteConnectionService) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_STR(connectionService) ZEND_PARSE_PARAMETERS_END(); #endif @@ -4372,7 +4372,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, useDynamicUpdate) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_BOOL(dynamicUpdate) ZEND_PARSE_PARAMETERS_END(); #endif @@ -4421,7 +4421,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getConnection) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_ARRAY(connectionServices) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model/metadata.zep.c b/ext/phalcon/mvc/model/metadata.zep.c index 5e56c77dd4..302ccf7d59 100644 --- a/ext/phalcon/mvc/model/metadata.zep.c +++ b/ext/phalcon/mvc/model/metadata.zep.c @@ -149,7 +149,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getAttributes) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -192,7 +192,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getAutomaticCreateAttributes) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -235,7 +235,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getAutomaticUpdateAttributes) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -278,7 +278,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getBindTypes) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -322,7 +322,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getColumnMap) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -369,7 +369,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getDefaultValues) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -412,7 +412,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getDataTypes) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -455,7 +455,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getDataTypesNumeric) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -522,7 +522,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getEmptyStringAttributes) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -564,7 +564,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getIdentityField) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -603,7 +603,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getNonPrimaryKeyAttributes) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -646,7 +646,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getNotNullAttributes) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -689,7 +689,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getPrimaryKeyAttributes) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -733,7 +733,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, getReverseColumnMap) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -814,7 +814,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, hasAttribute) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_STR(attribute) ZEND_PARSE_PARAMETERS_END(); #endif @@ -926,7 +926,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, readColumnMap) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -985,7 +985,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, readColumnMapIndex) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_LONG(index) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1048,7 +1048,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, readMetaData) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1110,7 +1110,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, readMetaDataIndex) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_LONG(index) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1196,7 +1196,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, setAutomaticCreateAttributes) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_ARRAY(attributes) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1239,7 +1239,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, setAutomaticUpdateAttributes) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_ARRAY(attributes) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1282,7 +1282,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, setEmptyStringAttributes) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_ARRAY(attributes) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1311,7 +1311,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, setDI) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1334,7 +1334,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, setStrategy) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(strategy, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\metadata\\strategy\\strategyinterface"))) + Z_PARAM_OBJECT_OF_CLASS(strategy, phalcon_mvc_model_metadata_strategy_strategyinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1452,7 +1452,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, writeMetaDataIndex) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(3, 3) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_LONG(index) Z_PARAM_ZVAL(data) ZEND_PARSE_PARAMETERS_END(); @@ -1527,7 +1527,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, initialize) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(4, 4) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_ZVAL(key) Z_PARAM_ZVAL(table) Z_PARAM_ZVAL(schema) diff --git a/ext/phalcon/mvc/model/metadata/apcu.zep.c b/ext/phalcon/mvc/model/metadata/apcu.zep.c index 5dbd2edf30..90609a0c7b 100644 --- a/ext/phalcon/mvc/model/metadata/apcu.zep.c +++ b/ext/phalcon/mvc/model/metadata/apcu.zep.c @@ -77,7 +77,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData_Apcu, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\cache\\adapterfactory"))) + Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_cache_adapterfactory_ce) Z_PARAM_OPTIONAL Z_PARAM_ARRAY_OR_NULL(options) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/phalcon/mvc/model/metadata/libmemcached.zep.c b/ext/phalcon/mvc/model/metadata/libmemcached.zep.c index 463ce1702a..a8352afaf1 100644 --- a/ext/phalcon/mvc/model/metadata/libmemcached.zep.c +++ b/ext/phalcon/mvc/model/metadata/libmemcached.zep.c @@ -67,7 +67,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData_Libmemcached, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\cache\\adapterfactory"))) + Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_cache_adapterfactory_ce) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/phalcon/mvc/model/metadata/redis.zep.c b/ext/phalcon/mvc/model/metadata/redis.zep.c index 8e1b8592b1..1815760db0 100644 --- a/ext/phalcon/mvc/model/metadata/redis.zep.c +++ b/ext/phalcon/mvc/model/metadata/redis.zep.c @@ -80,7 +80,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData_Redis, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\cache\\adapterfactory"))) + Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_cache_adapterfactory_ce) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/phalcon/mvc/model/metadata/strategy/annotations.zep.c b/ext/phalcon/mvc/model/metadata/strategy/annotations.zep.c index 9b4492aa3f..d5a21d567a 100644 --- a/ext/phalcon/mvc/model/metadata/strategy/annotations.zep.c +++ b/ext/phalcon/mvc/model/metadata/strategy/annotations.zep.c @@ -77,8 +77,8 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData_Strategy_Annotations, getColumnMaps) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) - Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -399,8 +399,8 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData_Strategy_Annotations, getMetaData) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) - Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model/metadata/strategy/introspection.zep.c b/ext/phalcon/mvc/model/metadata/strategy/introspection.zep.c index 8ec496772e..2c56a0c12d 100644 --- a/ext/phalcon/mvc/model/metadata/strategy/introspection.zep.c +++ b/ext/phalcon/mvc/model/metadata/strategy/introspection.zep.c @@ -65,8 +65,8 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData_Strategy_Introspection, getColumnMaps) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) - Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -193,8 +193,8 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData_Strategy_Introspection, getMetaData) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) - Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) + Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model/query.zep.c b/ext/phalcon/mvc/model/query.zep.c index 78f2cb39af..0007b2f311 100644 --- a/ext/phalcon/mvc/model/query.zep.c +++ b/ext/phalcon/mvc/model/query.zep.c @@ -232,7 +232,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, __construct) ZEND_PARSE_PARAMETERS_START(0, 3) Z_PARAM_OPTIONAL Z_PARAM_STR_OR_NULL(phql) - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, phalcon_di_diinterface_ce) Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); #endif @@ -941,7 +941,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, setDI) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1048,7 +1048,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, setTransaction) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(transaction, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\transactioninterface"))) + Z_PARAM_OBJECT_OF_CLASS(transaction, phalcon_mvc_model_transactioninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -3999,7 +3999,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoin) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(manager, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\managerinterface"))) + Z_PARAM_OBJECT_OF_CLASS(manager, phalcon_mvc_model_managerinterface_ce) Z_PARAM_ARRAY(join) ZEND_PARSE_PARAMETERS_END(); #endif @@ -5126,7 +5126,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin) Z_PARAM_ZVAL(joinSource) Z_PARAM_STR(modelAlias) Z_PARAM_STR(joinAlias) - Z_PARAM_OBJECT_OF_CLASS(relation, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\relationinterface"))) + Z_PARAM_OBJECT_OF_CLASS(relation, phalcon_mvc_model_relationinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -5795,7 +5795,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getReadConnection) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 4) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_OPTIONAL Z_PARAM_ARRAY_OR_NULL(intermediate) Z_PARAM_ARRAY(bindParams) @@ -5883,7 +5883,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getRelatedRecords) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(4, 4) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_ARRAY(intermediate) Z_PARAM_ARRAY(bindParams) Z_PARAM_ARRAY(bindTypes) @@ -6220,7 +6220,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) Z_PARAM_ZVAL(joinSource) Z_PARAM_STR(modelAlias) Z_PARAM_STR(joinAlias) - Z_PARAM_OBJECT_OF_CLASS(relation, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\relationinterface"))) + Z_PARAM_OBJECT_OF_CLASS(relation, phalcon_mvc_model_relationinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -6404,7 +6404,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getTable) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(manager, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\managerinterface"))) + Z_PARAM_OBJECT_OF_CLASS(manager, phalcon_mvc_model_managerinterface_ce) Z_PARAM_ARRAY(qualifiedName) ZEND_PARSE_PARAMETERS_END(); #endif @@ -6458,7 +6458,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getWriteConnection) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 4) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_OPTIONAL Z_PARAM_ARRAY_OR_NULL(intermediate) Z_PARAM_ARRAY(bindParams) diff --git a/ext/phalcon/mvc/model/query/builder.zep.c b/ext/phalcon/mvc/model/query/builder.zep.c index f8965cf78b..6b31bf9d4d 100644 --- a/ext/phalcon/mvc/model/query/builder.zep.c +++ b/ext/phalcon/mvc/model/query/builder.zep.c @@ -194,7 +194,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, __construct) ZEND_PARSE_PARAMETERS_START(0, 2) Z_PARAM_OPTIONAL Z_PARAM_ZVAL_OR_NULL(params) - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, phalcon_di_diinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2495,7 +2495,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, limit) ZVAL_LONG(&_0, limit); - ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 279, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 280, &_0); zephir_check_call_status(); limit = zephir_get_numberval(&_1); if (UNEXPECTED(limit == 0)) { @@ -2506,7 +2506,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, limit) zephir_update_property_zval(this_ptr, ZEND_STRL("limit"), &_0); if (zephir_is_numeric(offset)) { ZVAL_LONG(&_2$$4, zephir_get_intval(offset)); - ZEPHIR_CALL_FUNCTION(&_3$$4, "abs", NULL, 279, &_2$$4); + ZEPHIR_CALL_FUNCTION(&_3$$4, "abs", NULL, 280, &_2$$4); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("offset"), &_3$$4); } @@ -3174,7 +3174,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, setDI) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -3351,7 +3351,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, conditionBetween) object_init_ex(&_1$$3, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "Operator % is not available."); - ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 107, &_2$$3, &operator); + ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 113, &_2$$3, &operator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_3$$3); zephir_check_call_status(); @@ -3473,7 +3473,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, conditionIn) object_init_ex(&_1$$3, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "Operator % is not available."); - ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 107, &_2$$3, &operator); + ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 113, &_2$$3, &operator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_3$$3); zephir_check_call_status(); @@ -3634,7 +3634,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, conditionNotBetween) object_init_ex(&_1$$3, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "Operator % is not available."); - ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 107, &_2$$3, &operator); + ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 113, &_2$$3, &operator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_3$$3); zephir_check_call_status(); @@ -3756,7 +3756,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, conditionNotIn) object_init_ex(&_1$$3, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "Operator % is not available."); - ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 107, &_2$$3, &operator); + ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 113, &_2$$3, &operator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_3$$3); zephir_check_call_status(); diff --git a/ext/phalcon/mvc/model/query/status.zep.c b/ext/phalcon/mvc/model/query/status.zep.c index d50f9c5374..1d3e076975 100644 --- a/ext/phalcon/mvc/model/query/status.zep.c +++ b/ext/phalcon/mvc/model/query/status.zep.c @@ -87,7 +87,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Status, __construct) ZEND_PARSE_PARAMETERS_START(1, 2) Z_PARAM_BOOL(success) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(model, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model/resultset/complex.zep.c b/ext/phalcon/mvc/model/resultset/complex.zep.c index 3407356e28..dd1c1e0bba 100644 --- a/ext/phalcon/mvc/model/resultset/complex.zep.c +++ b/ext/phalcon/mvc/model/resultset/complex.zep.c @@ -79,7 +79,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, __construct) ZEND_PARSE_PARAMETERS_START(1, 3) Z_PARAM_ZVAL(columnTypes) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(result, zephir_get_internal_ce(SL("phalcon\\db\\resultinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(result, phalcon_db_resultinterface_ce) Z_PARAM_ZVAL_OR_NULL(cache) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model/transaction.zep.c b/ext/phalcon/mvc/model/transaction.zep.c index 317deccb3a..2a34947130 100644 --- a/ext/phalcon/mvc/model/transaction.zep.c +++ b/ext/phalcon/mvc/model/transaction.zep.c @@ -136,7 +136,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 3) - Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) Z_PARAM_OPTIONAL Z_PARAM_BOOL(autoBegin) Z_PARAM_STR(service) @@ -330,7 +330,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction, rollback) ZEND_PARSE_PARAMETERS_START(0, 2) Z_PARAM_OPTIONAL Z_PARAM_STR_OR_NULL(rollbackMessage) - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(rollbackRecord, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(rollbackRecord, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -453,7 +453,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction, setRollbackedRecord) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(record, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(record, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -476,7 +476,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction, setTransactionManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(manager, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\transaction\\managerinterface"))) + Z_PARAM_OBJECT_OF_CLASS(manager, phalcon_mvc_model_transaction_managerinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model/transaction/failed.zep.c b/ext/phalcon/mvc/model/transaction/failed.zep.c index a6f8ff23fb..b7f31d9745 100644 --- a/ext/phalcon/mvc/model/transaction/failed.zep.c +++ b/ext/phalcon/mvc/model/transaction/failed.zep.c @@ -66,7 +66,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction_Failed, __construct) ZEND_PARSE_PARAMETERS_START(1, 2) Z_PARAM_STR(message) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(record, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(record, phalcon_mvc_modelinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model/transaction/manager.zep.c b/ext/phalcon/mvc/model/transaction/manager.zep.c index 0db97f489d..01c952438c 100644 --- a/ext/phalcon/mvc/model/transaction/manager.zep.c +++ b/ext/phalcon/mvc/model/transaction/manager.zep.c @@ -130,7 +130,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction_Manager, __construct) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 1) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, phalcon_di_diinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -521,7 +521,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction_Manager, notifyCommit) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(transaction, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\transactioninterface"))) + Z_PARAM_OBJECT_OF_CLASS(transaction, phalcon_mvc_model_transactioninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -551,7 +551,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction_Manager, notifyRollback) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(transaction, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\transactioninterface"))) + Z_PARAM_OBJECT_OF_CLASS(transaction, phalcon_mvc_model_transactioninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -731,7 +731,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction_Manager, setDI) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -797,7 +797,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction_Manager, collectTransaction) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(transaction, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\transactioninterface"))) + Z_PARAM_OBJECT_OF_CLASS(transaction, phalcon_mvc_model_transactioninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/model/validationfailed.zep.c b/ext/phalcon/mvc/model/validationfailed.zep.c index 2865c2259f..c0fb793cb5 100644 --- a/ext/phalcon/mvc/model/validationfailed.zep.c +++ b/ext/phalcon/mvc/model/validationfailed.zep.c @@ -73,7 +73,7 @@ PHP_METHOD(Phalcon_Mvc_Model_ValidationFailed, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(model, zephir_get_internal_ce(SL("phalcon\\mvc\\modelinterface"))) + Z_PARAM_OBJECT_OF_CLASS(model, phalcon_mvc_modelinterface_ce) Z_PARAM_ARRAY(validationMessages) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/router.zep.c b/ext/phalcon/mvc/router.zep.c index b8969683f3..855a484c12 100644 --- a/ext/phalcon/mvc/router.zep.c +++ b/ext/phalcon/mvc/router.zep.c @@ -1037,7 +1037,7 @@ PHP_METHOD(Phalcon_Mvc_Router, attach) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(route, zephir_get_internal_ce(SL("phalcon\\mvc\\router\\routeinterface"))) + Z_PARAM_OBJECT_OF_CLASS(route, phalcon_mvc_router_routeinterface_ce) Z_PARAM_OPTIONAL Z_PARAM_LONG(position) ZEND_PARSE_PARAMETERS_END(); @@ -2335,7 +2335,7 @@ PHP_METHOD(Phalcon_Mvc_Router, mount) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(group, zephir_get_internal_ce(SL("phalcon\\mvc\\router\\groupinterface"))) + Z_PARAM_OBJECT_OF_CLASS(group, phalcon_mvc_router_groupinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -2746,7 +2746,7 @@ PHP_METHOD(Phalcon_Mvc_Router, setEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/router/annotations.zep.c b/ext/phalcon/mvc/router/annotations.zep.c index 1de30496a3..a80b822927 100644 --- a/ext/phalcon/mvc/router/annotations.zep.c +++ b/ext/phalcon/mvc/router/annotations.zep.c @@ -810,7 +810,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, processActionAnnotation) Z_PARAM_STR(namespaceName) Z_PARAM_STR(controller) Z_PARAM_STR(action) - Z_PARAM_OBJECT_OF_CLASS(annotation, zephir_get_internal_ce(SL("phalcon\\annotations\\annotation"))) + Z_PARAM_OBJECT_OF_CLASS(annotation, phalcon_annotations_annotation_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -886,7 +886,7 @@ 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, 178, &_3$$6, &proxyActionName); + ZEPHIR_CALL_FUNCTION(&_4$$6, "call_user_func", NULL, 184, &_3$$6, &proxyActionName); zephir_check_call_status(); ZEPHIR_CPY_WRT(&proxyActionName, &_4$$6); } @@ -1069,7 +1069,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, processControllerAnnotation) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(handler) - Z_PARAM_OBJECT_OF_CLASS(annotation, zephir_get_internal_ce(SL("phalcon\\annotations\\annotation"))) + Z_PARAM_OBJECT_OF_CLASS(annotation, phalcon_annotations_annotation_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/router/route.zep.c b/ext/phalcon/mvc/router/route.zep.c index 44b0cc2cc5..e039745abf 100644 --- a/ext/phalcon/mvc/router/route.zep.c +++ b/ext/phalcon/mvc/router/route.zep.c @@ -1021,7 +1021,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Route, setGroup) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(group, zephir_get_internal_ce(SL("phalcon\\mvc\\router\\groupinterface"))) + Z_PARAM_OBJECT_OF_CLASS(group, phalcon_mvc_router_groupinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/url.zep.c b/ext/phalcon/mvc/url.zep.c index f0ff53ab71..19a6d1f1d1 100644 --- a/ext/phalcon/mvc/url.zep.c +++ b/ext/phalcon/mvc/url.zep.c @@ -84,7 +84,7 @@ PHP_METHOD(Phalcon_Mvc_Url, __construct) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 1) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(router, zephir_get_internal_ce(SL("phalcon\\mvc\\routerinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(router, phalcon_mvc_routerinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/view.zep.c b/ext/phalcon/mvc/view.zep.c index 0fd3817998..96e6057073 100644 --- a/ext/phalcon/mvc/view.zep.c +++ b/ext/phalcon/mvc/view.zep.c @@ -893,6 +893,8 @@ PHP_METHOD(Phalcon_Mvc_View, getRender) /** * Returns a parameter previously set in the view + * + * @return mixed|null */ PHP_METHOD(Phalcon_Mvc_View, getVar) { @@ -1036,14 +1038,14 @@ PHP_METHOD(Phalcon_Mvc_View, has) } ZEPHIR_CALL_METHOD(&_2, this_ptr, "getviewsdirs", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&_2, 0, "phalcon/Mvc/View.zep", 597); + zephir_is_iterable(&_2, 0, "phalcon/Mvc/View.zep", 599); if (Z_TYPE_P(&_2) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_2), _3) { ZEPHIR_INIT_NVAR(&viewsDir); ZVAL_COPY(&viewsDir, _3); ZEPHIR_INIT_NVAR(&_5$$4); - zephir_is_iterable(&engines, 0, "phalcon/Mvc/View.zep", 595); + zephir_is_iterable(&engines, 0, "phalcon/Mvc/View.zep", 597); if (Z_TYPE_P(&engines) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&engines), _8$$4, _9$$4, _6$$4) { @@ -1098,7 +1100,7 @@ PHP_METHOD(Phalcon_Mvc_View, has) ZEPHIR_CALL_METHOD(&viewsDir, &_2, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_12$$9); - zephir_is_iterable(&engines, 0, "phalcon/Mvc/View.zep", 595); + zephir_is_iterable(&engines, 0, "phalcon/Mvc/View.zep", 597); if (Z_TYPE_P(&engines) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&engines), _15$$9, _16$$9, _13$$9) { @@ -1296,18 +1298,18 @@ PHP_METHOD(Phalcon_Mvc_View, pick) } else { ZEPHIR_INIT_VAR(&layout); ZVAL_NULL(&layout); - if (zephir_memnstr_str(renderView, SL("/"), "phalcon/Mvc/View.zep", 699)) { + if (zephir_memnstr_str(renderView, SL("/"), "phalcon/Mvc/View.zep", 701)) { ZEPHIR_INIT_VAR(&parts); zephir_fast_explode_str(&parts, SL("/"), renderView, LONG_MAX); ZEPHIR_OBS_NVAR(&layout); - zephir_array_fetch_long(&layout, &parts, 0, PH_NOISY, "phalcon/Mvc/View.zep", 701); + zephir_array_fetch_long(&layout, &parts, 0, PH_NOISY, "phalcon/Mvc/View.zep", 703); } ZEPHIR_INIT_VAR(&_0$$4); zephir_create_array(&_0$$4, 1, 0); zephir_array_fast_append(&_0$$4, renderView); ZEPHIR_CPY_WRT(&pickView, &_0$$4); if (Z_TYPE_P(&layout) != IS_NULL) { - zephir_array_append(&pickView, &layout, PH_SEPARATE, "phalcon/Mvc/View.zep", 707); + zephir_array_append(&pickView, &layout, PH_SEPARATE, "phalcon/Mvc/View.zep", 709); } } zephir_update_property_zval(this_ptr, ZEND_STRL("pickView"), &pickView); @@ -1539,7 +1541,7 @@ PHP_METHOD(Phalcon_Mvc_View, setEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -1966,7 +1968,7 @@ PHP_METHOD(Phalcon_Mvc_View, setViewsDir) _0 = Z_TYPE_P(viewsDir) != IS_ARRAY; } if (_0) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Views directory must be a string or an array", "phalcon/Mvc/View.zep", 980); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Views directory must be a string or an array", "phalcon/Mvc/View.zep", 982); return; } if (Z_TYPE_P(viewsDir) == IS_STRING) { @@ -1976,7 +1978,7 @@ PHP_METHOD(Phalcon_Mvc_View, setViewsDir) } else { ZEPHIR_INIT_VAR(&newViewsDir); array_init(&newViewsDir); - zephir_is_iterable(viewsDir, 0, "phalcon/Mvc/View.zep", 998); + zephir_is_iterable(viewsDir, 0, "phalcon/Mvc/View.zep", 1000); if (Z_TYPE_P(viewsDir) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(viewsDir), _4$$5, _5$$5, _2$$5) { @@ -1989,7 +1991,7 @@ PHP_METHOD(Phalcon_Mvc_View, setViewsDir) ZEPHIR_INIT_NVAR(&directory); ZVAL_COPY(&directory, _2$$5); if (Z_TYPE_P(&directory) != IS_STRING) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Views directory item must be a string", "phalcon/Mvc/View.zep", 992); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Views directory item must be a string", "phalcon/Mvc/View.zep", 994); return; } ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "getdirseparator", NULL, 486, &directory); @@ -2010,7 +2012,7 @@ PHP_METHOD(Phalcon_Mvc_View, setViewsDir) ZEPHIR_CALL_METHOD(&directory, viewsDir, "current", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&directory) != IS_STRING) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Views directory item must be a string", "phalcon/Mvc/View.zep", 992); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Views directory item must be a string", "phalcon/Mvc/View.zep", 994); return; } ZEPHIR_CALL_METHOD(&_7$$8, this_ptr, "getdirseparator", NULL, 486, &directory); @@ -2210,7 +2212,7 @@ PHP_METHOD(Phalcon_Mvc_View, engineRender) array_init(&viewEnginePaths); ZEPHIR_CALL_METHOD(&_1, this_ptr, "getviewsdirs", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&_1, 0, "phalcon/Mvc/View.zep", 1104); + zephir_is_iterable(&_1, 0, "phalcon/Mvc/View.zep", 1106); if (Z_TYPE_P(&_1) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_1), _2) { @@ -2224,7 +2226,7 @@ PHP_METHOD(Phalcon_Mvc_View, engineRender) } else { ZEPHIR_CPY_WRT(&viewsDirPath, &viewPath); } - zephir_is_iterable(&engines, 0, "phalcon/Mvc/View.zep", 1099); + zephir_is_iterable(&engines, 0, "phalcon/Mvc/View.zep", 1101); if (Z_TYPE_P(&engines) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&engines), _8$$3, _9$$3, _6$$3) { @@ -2267,7 +2269,7 @@ PHP_METHOD(Phalcon_Mvc_View, engineRender) } RETURN_MM_NULL(); } - zephir_array_append(&viewEnginePaths, &viewEnginePath, PH_SEPARATE, "phalcon/Mvc/View.zep", 1097); + zephir_array_append(&viewEnginePaths, &viewEnginePath, PH_SEPARATE, "phalcon/Mvc/View.zep", 1099); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &engines, "rewind", NULL, 0); @@ -2313,7 +2315,7 @@ PHP_METHOD(Phalcon_Mvc_View, engineRender) } RETURN_MM_NULL(); } - zephir_array_append(&viewEnginePaths, &viewEnginePath, PH_SEPARATE, "phalcon/Mvc/View.zep", 1097); + zephir_array_append(&viewEnginePaths, &viewEnginePath, PH_SEPARATE, "phalcon/Mvc/View.zep", 1099); ZEPHIR_CALL_METHOD(NULL, &engines, "next", NULL, 0); zephir_check_call_status(); } @@ -2340,7 +2342,7 @@ PHP_METHOD(Phalcon_Mvc_View, engineRender) } else { ZEPHIR_CPY_WRT(&viewsDirPath, &viewPath); } - zephir_is_iterable(&engines, 0, "phalcon/Mvc/View.zep", 1099); + zephir_is_iterable(&engines, 0, "phalcon/Mvc/View.zep", 1101); if (Z_TYPE_P(&engines) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&engines), _27$$16, _28$$16, _25$$16) { @@ -2383,7 +2385,7 @@ PHP_METHOD(Phalcon_Mvc_View, engineRender) } RETURN_MM_NULL(); } - zephir_array_append(&viewEnginePaths, &viewEnginePath, PH_SEPARATE, "phalcon/Mvc/View.zep", 1097); + zephir_array_append(&viewEnginePaths, &viewEnginePath, PH_SEPARATE, "phalcon/Mvc/View.zep", 1099); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &engines, "rewind", NULL, 0); @@ -2429,7 +2431,7 @@ PHP_METHOD(Phalcon_Mvc_View, engineRender) } RETURN_MM_NULL(); } - zephir_array_append(&viewEnginePaths, &viewEnginePath, PH_SEPARATE, "phalcon/Mvc/View.zep", 1097); + zephir_array_append(&viewEnginePaths, &viewEnginePath, PH_SEPARATE, "phalcon/Mvc/View.zep", 1099); ZEPHIR_CALL_METHOD(NULL, &engines, "next", NULL, 0); zephir_check_call_status(); } @@ -2455,7 +2457,7 @@ PHP_METHOD(Phalcon_Mvc_View, engineRender) ZEPHIR_CONCAT_SVS(&_45$$30, "View '", &viewPath, "' was not found in any of the views directory"); ZEPHIR_CALL_METHOD(NULL, &_44$$30, "__construct", NULL, 29, &_45$$30); zephir_check_call_status(); - zephir_throw_exception_debug(&_44$$30, "phalcon/Mvc/View.zep", 1113); + zephir_throw_exception_debug(&_44$$30, "phalcon/Mvc/View.zep", 1115); ZEPHIR_MM_RESTORE(); return; } @@ -2568,10 +2570,10 @@ PHP_METHOD(Phalcon_Mvc_View, loadTemplateEngines) zephir_array_update_string(&engines, SL(".phtml"), &_2$$4, PH_COPY | PH_SEPARATE); } else { if (Z_TYPE_P(&di) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "A dependency injection container is required to access application services", "phalcon/Mvc/View.zep", 1156); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "A dependency injection container is required to access application services", "phalcon/Mvc/View.zep", 1158); return; } - zephir_is_iterable(®isteredEngines, 0, "phalcon/Mvc/View.zep", 1193); + zephir_is_iterable(®isteredEngines, 0, "phalcon/Mvc/View.zep", 1195); if (Z_TYPE_P(®isteredEngines) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(®isteredEngines), _5$$5, _6$$5, _3$$5) { @@ -2589,7 +2591,7 @@ PHP_METHOD(Phalcon_Mvc_View, 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(&_7$$9, "call_user_func", &_10, 178, &engineService, this_ptr); + ZEPHIR_CALL_FUNCTION(&_7$$9, "call_user_func", &_10, 184, &engineService, this_ptr); zephir_check_call_status(); zephir_array_update_zval(&engines, &extension, &_7$$9, PH_COPY | PH_SEPARATE); } else { @@ -2603,7 +2605,7 @@ PHP_METHOD(Phalcon_Mvc_View, loadTemplateEngines) ZEPHIR_CONCAT_SV(&_12$$12, "Invalid template engine registration for extension: ", &extension); ZEPHIR_CALL_METHOD(NULL, &_11$$12, "__construct", &_13, 29, &_12$$12); zephir_check_call_status(); - zephir_throw_exception_debug(&_11$$12, "phalcon/Mvc/View.zep", 1184); + zephir_throw_exception_debug(&_11$$12, "phalcon/Mvc/View.zep", 1186); ZEPHIR_MM_RESTORE(); return; } @@ -2634,7 +2636,7 @@ PHP_METHOD(Phalcon_Mvc_View, loadTemplateEngines) ZEPHIR_CALL_CE_STATIC(&_16$$15, _17$$15, "bind", &_9, 0, &engineService, &di); zephir_check_call_status(); ZEPHIR_CPY_WRT(&engineService, &_16$$15); - ZEPHIR_CALL_FUNCTION(&_16$$15, "call_user_func", &_10, 178, &engineService, this_ptr); + ZEPHIR_CALL_FUNCTION(&_16$$15, "call_user_func", &_10, 184, &engineService, this_ptr); zephir_check_call_status(); zephir_array_update_zval(&engines, &extension, &_16$$15, PH_COPY | PH_SEPARATE); } else { @@ -2648,7 +2650,7 @@ PHP_METHOD(Phalcon_Mvc_View, loadTemplateEngines) ZEPHIR_CONCAT_SV(&_19$$18, "Invalid template engine registration for extension: ", &extension); ZEPHIR_CALL_METHOD(NULL, &_18$$18, "__construct", &_13, 29, &_19$$18); zephir_check_call_status(); - zephir_throw_exception_debug(&_18$$18, "phalcon/Mvc/View.zep", 1184); + zephir_throw_exception_debug(&_18$$18, "phalcon/Mvc/View.zep", 1186); ZEPHIR_MM_RESTORE(); return; } @@ -2810,7 +2812,7 @@ PHP_METHOD(Phalcon_Mvc_View, processRender) ZEPHIR_CPY_WRT(&renderView, &_3$$7); } else { ZEPHIR_OBS_NVAR(&renderView); - zephir_array_fetch_long(&renderView, &pickView, 0, PH_NOISY, "phalcon/Mvc/View.zep", 1271); + zephir_array_fetch_long(&renderView, &pickView, 0, PH_NOISY, "phalcon/Mvc/View.zep", 1273); if (Z_TYPE_P(&layoutName) == IS_NULL) { ZEPHIR_OBS_VAR(&pickViewAction); if (zephir_array_isset_long_fetch(&pickViewAction, &pickView, 1, 0)) { @@ -2868,7 +2870,7 @@ PHP_METHOD(Phalcon_Mvc_View, processRender) zephir_read_property(&_11$$17, this_ptr, ZEND_STRL("templatesBefore"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&templatesBefore, &_11$$17); silence = 0; - zephir_is_iterable(&templatesBefore, 0, "phalcon/Mvc/View.zep", 1347); + zephir_is_iterable(&templatesBefore, 0, "phalcon/Mvc/View.zep", 1349); if (Z_TYPE_P(&templatesBefore) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&templatesBefore), _12$$17) { @@ -2936,7 +2938,7 @@ PHP_METHOD(Phalcon_Mvc_View, processRender) zephir_read_property(&_20$$23, this_ptr, ZEND_STRL("templatesAfter"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&templatesAfter, &_20$$23); silence = 0; - zephir_is_iterable(&templatesAfter, 0, "phalcon/Mvc/View.zep", 1383); + zephir_is_iterable(&templatesAfter, 0, "phalcon/Mvc/View.zep", 1385); if (Z_TYPE_P(&templatesAfter) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&templatesAfter), _21$$23) { diff --git a/ext/phalcon/mvc/view/engine/abstractengine.zep.c b/ext/phalcon/mvc/view/engine/abstractengine.zep.c index 32034fc57f..a63e44dca4 100644 --- a/ext/phalcon/mvc/view/engine/abstractengine.zep.c +++ b/ext/phalcon/mvc/view/engine/abstractengine.zep.c @@ -61,9 +61,9 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_AbstractEngine, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(view, zephir_get_internal_ce(SL("phalcon\\mvc\\viewbaseinterface"))) + Z_PARAM_OBJECT_OF_CLASS(view, phalcon_mvc_viewbaseinterface_ce) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(container, phalcon_di_diinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/mvc/view/engine/volt.zep.c b/ext/phalcon/mvc/view/engine/volt.zep.c index 0530b665b5..4f805952fe 100644 --- a/ext/phalcon/mvc/view/engine/volt.zep.c +++ b/ext/phalcon/mvc/view/engine/volt.zep.c @@ -126,7 +126,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, callMacro) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_RETURN_CALL_FUNCTION("call_user_func", NULL, 178, ¯o, &arguments); + ZEPHIR_RETURN_CALL_FUNCTION("call_user_func", NULL, 184, ¯o, &arguments); zephir_check_call_status(); RETURN_MM(); } @@ -195,12 +195,12 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, convertEncoding) _1 = ZEPHIR_IS_STRING_IDENTICAL(&from, "utf8"); } if (_1) { - ZEPHIR_RETURN_CALL_FUNCTION("utf8_decode", NULL, 280, &text); + ZEPHIR_RETURN_CALL_FUNCTION("utf8_decode", NULL, 281, &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, 324, &text, &from, &to); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 325, &text, &from, &to); zephir_check_call_status(); RETURN_MM(); } @@ -378,7 +378,7 @@ 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, 227, item); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strlen", NULL, 230, item); zephir_check_call_status(); RETURN_MM(); } @@ -659,7 +659,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, setEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -799,12 +799,12 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, slice) 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, 221, value, &_6$$11, &length); + ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", NULL, 224, value, &_6$$11, &length); zephir_check_call_status(); RETURN_MM(); } ZVAL_LONG(&_7$$10, start); - ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", NULL, 221, value, &_7$$10); + ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", NULL, 224, value, &_7$$10); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/mvc/view/engine/volt/compiler.zep.c b/ext/phalcon/mvc/view/engine/volt/compiler.zep.c index ddffa1fc6f..6698da341d 100644 --- a/ext/phalcon/mvc/view/engine/volt/compiler.zep.c +++ b/ext/phalcon/mvc/view/engine/volt/compiler.zep.c @@ -160,7 +160,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, __construct) bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 1) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(view, zephir_get_internal_ce(SL("phalcon\\mvc\\viewbaseinterface"))) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(view, phalcon_mvc_viewbaseinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -3556,7 +3556,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, setDI) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -4070,7 +4070,7 @@ 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, 265, &funcArguments, &_4$$7); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 266, &funcArguments, &_4$$7); ZEPHIR_UNREF(&funcArguments); zephir_check_call_status(); } diff --git a/ext/phalcon/mvc/view/simple.zep.c b/ext/phalcon/mvc/view/simple.zep.c index 47ff456058..66b678a117 100644 --- a/ext/phalcon/mvc/view/simple.zep.c +++ b/ext/phalcon/mvc/view/simple.zep.c @@ -604,7 +604,7 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, setEventsManager) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(eventsManager, zephir_get_internal_ce(SL("phalcon\\events\\managerinterface"))) + Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -880,7 +880,7 @@ 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, 178, &engineService, this_ptr); + ZEPHIR_CALL_FUNCTION(&engineObject, "call_user_func", &_10, 184, &engineService, this_ptr); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&engineObject, &engineService); @@ -923,7 +923,7 @@ 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, 178, &engineService, this_ptr); + ZEPHIR_CALL_FUNCTION(&engineObject, "call_user_func", &_10, 184, &engineService, this_ptr); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&engineObject, &engineService); diff --git a/ext/phalcon/paginator/adapter/abstractadapter.zep.c b/ext/phalcon/paginator/adapter/abstractadapter.zep.c index a055b46c60..1c9be2b7bf 100644 --- a/ext/phalcon/paginator/adapter/abstractadapter.zep.c +++ b/ext/phalcon/paginator/adapter/abstractadapter.zep.c @@ -197,7 +197,7 @@ PHP_METHOD(Phalcon_Paginator_Adapter_AbstractAdapter, setRepository) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(repository, zephir_get_internal_ce(SL("phalcon\\paginator\\repositoryinterface"))) + Z_PARAM_OBJECT_OF_CLASS(repository, phalcon_paginator_repositoryinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/paginator/adapter/model.zep.c b/ext/phalcon/paginator/adapter/model.zep.c index c61d625a37..1e9e85aa41 100644 --- a/ext/phalcon/paginator/adapter/model.zep.c +++ b/ext/phalcon/paginator/adapter/model.zep.c @@ -166,7 +166,7 @@ PHP_METHOD(Phalcon_Paginator_Adapter_Model, paginate) ZEPHIR_INIT_VAR(&_6); ZVAL_STRING(&_6, "count"); zephir_array_fast_append(&_5, &_6); - ZEPHIR_CALL_FUNCTION(&rowCountResult, "call_user_func", NULL, 178, &_5, ¶meters); + ZEPHIR_CALL_FUNCTION(&rowCountResult, "call_user_func", NULL, 184, &_5, ¶meters); zephir_check_call_status(); if (Z_TYPE_P(&rowCountResult) == IS_OBJECT) { ZEPHIR_CALL_METHOD(&_7$$6, &rowCountResult, "count", NULL, 0); @@ -193,7 +193,7 @@ PHP_METHOD(Phalcon_Paginator_Adapter_Model, paginate) ZEPHIR_INIT_VAR(&_11$$10); ZVAL_STRING(&_11$$10, "find"); zephir_array_fast_append(&_10$$10, &_11$$10); - ZEPHIR_CALL_FUNCTION(&_12$$10, "call_user_func", NULL, 178, &_10$$10, ¶meters); + ZEPHIR_CALL_FUNCTION(&_12$$10, "call_user_func", NULL, 184, &_10$$10, ¶meters); zephir_check_call_status(); ZEPHIR_CPY_WRT(&pageItems, &_12$$10); } diff --git a/ext/phalcon/paginator/adapter/querybuilder.zep.c b/ext/phalcon/paginator/adapter/querybuilder.zep.c index 1a255342a1..7259d47c2a 100644 --- a/ext/phalcon/paginator/adapter/querybuilder.zep.c +++ b/ext/phalcon/paginator/adapter/querybuilder.zep.c @@ -421,7 +421,7 @@ PHP_METHOD(Phalcon_Paginator_Adapter_QueryBuilder, setQueryBuilder) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(builder, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\query\\builder"))) + Z_PARAM_OBJECT_OF_CLASS(builder, phalcon_mvc_model_query_builder_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/session/adapter/libmemcached.zep.c b/ext/phalcon/session/adapter/libmemcached.zep.c index ca990878d9..afcd49cae5 100644 --- a/ext/phalcon/session/adapter/libmemcached.zep.c +++ b/ext/phalcon/session/adapter/libmemcached.zep.c @@ -74,7 +74,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Libmemcached, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\storage\\adapterfactory"))) + Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_storage_adapterfactory_ce) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/phalcon/session/adapter/redis.zep.c b/ext/phalcon/session/adapter/redis.zep.c index 42b782ed10..1fc10ead7b 100644 --- a/ext/phalcon/session/adapter/redis.zep.c +++ b/ext/phalcon/session/adapter/redis.zep.c @@ -69,7 +69,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Redis, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\storage\\adapterfactory"))) + Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_storage_adapterfactory_ce) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/phalcon/session/adapter/stream.zep.c b/ext/phalcon/session/adapter/stream.zep.c index 19de674495..1674498fb3 100644 --- a/ext/phalcon/session/adapter/stream.zep.c +++ b/ext/phalcon/session/adapter/stream.zep.c @@ -182,7 +182,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, destroy) _2 = zephir_is_true(&_3); } if (_2) { - ZEPHIR_CALL_FUNCTION(NULL, "unlink", NULL, 113, &file); + ZEPHIR_CALL_FUNCTION(NULL, "unlink", NULL, 119, &file); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -257,7 +257,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) _9$$3 = ZEPHIR_LT(&_10$$3, &time); } if (_9$$3) { - ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_11, 113, &file); + ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_11, 119, &file); zephir_check_call_status(); } } ZEND_HASH_FOREACH_END(); @@ -285,7 +285,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) _14$$5 = ZEPHIR_LT(&_15$$5, &time); } if (_14$$5) { - ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_11, 113, &file); + ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_11, 119, &file); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, &_3, "next", NULL, 0); @@ -370,7 +370,7 @@ 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, 122, &pointer, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "flock", NULL, 128, &pointer, &_4$$3); zephir_check_call_status(); if (zephir_is_true(&_5$$3)) { ZEPHIR_CALL_METHOD(&data, this_ptr, "phpfilegetcontents", NULL, 0, &name); @@ -481,7 +481,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, getArrVal) } if (UNEXPECTED(zephir_is_true(&cast))) { ZEPHIR_MAKE_REF(&value); - ZEPHIR_CALL_FUNCTION(NULL, "settype", NULL, 12, &value, &cast); + ZEPHIR_CALL_FUNCTION(NULL, "settype", NULL, 11, &value, &cast); ZEPHIR_UNREF(&value); zephir_check_call_status(); } @@ -640,7 +640,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, phpFilePutContents) ZVAL_LONG(&_0, flags); - ZEPHIR_RETURN_CALL_FUNCTION("file_put_contents", NULL, 129, &filename, data, &_0, context); + ZEPHIR_RETURN_CALL_FUNCTION("file_put_contents", NULL, 135, &filename, data, &_0, context); zephir_check_call_status(); RETURN_MM(); } @@ -678,7 +678,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, phpFopen) zephir_get_strval(&mode, mode_param); - ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 130, &filename, &mode); + ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 136, &filename, &mode); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/session/bag.zep.c b/ext/phalcon/session/bag.zep.c index 8884fae211..d9a672759f 100644 --- a/ext/phalcon/session/bag.zep.c +++ b/ext/phalcon/session/bag.zep.c @@ -89,7 +89,7 @@ PHP_METHOD(Phalcon_Session_Bag, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(session, zephir_get_internal_ce(SL("phalcon\\session\\managerinterface"))) + Z_PARAM_OBJECT_OF_CLASS(session, phalcon_session_managerinterface_ce) Z_PARAM_STR(name) ZEND_PARSE_PARAMETERS_END(); #endif @@ -306,7 +306,7 @@ PHP_METHOD(Phalcon_Session_Bag, setDI) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/storage/adapter/abstractadapter.zep.c b/ext/phalcon/storage/adapter/abstractadapter.zep.c index 82e95b9788..e5adecc0fc 100644 --- a/ext/phalcon/storage/adapter/abstractadapter.zep.c +++ b/ext/phalcon/storage/adapter/abstractadapter.zep.c @@ -118,7 +118,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\storage\\serializerfactory"))) + Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_storage_serializerfactory_ce) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); @@ -801,7 +801,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, getArrVal) } if (UNEXPECTED(zephir_is_true(&cast))) { ZEPHIR_MAKE_REF(&value); - ZEPHIR_CALL_FUNCTION(NULL, "settype", NULL, 12, &value, &cast); + ZEPHIR_CALL_FUNCTION(NULL, "settype", NULL, 11, &value, &cast); ZEPHIR_UNREF(&value); zephir_check_call_status(); } diff --git a/ext/phalcon/storage/adapter/apcu.zep.c b/ext/phalcon/storage/adapter/apcu.zep.c index 02b9d49a78..b41ad327db 100644 --- a/ext/phalcon/storage/adapter/apcu.zep.c +++ b/ext/phalcon/storage/adapter/apcu.zep.c @@ -69,7 +69,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\storage\\serializerfactory"))) + Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_storage_serializerfactory_ce) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); @@ -657,7 +657,9 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuDec) ZVAL_LONG(&_0, step); ZVAL_LONG(&_1, ttl); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_dec", NULL, 0, key, &_0, success, &_1); + ZEPHIR_MAKE_REF(success); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_dec", NULL, 99, key, &_0, success, &_1); + ZEPHIR_UNREF(success); zephir_check_call_status(); RETURN_MM(); } @@ -682,7 +684,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuDelete) zephir_fetch_params(1, 1, 0, &key); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_delete", NULL, 0, key); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_delete", NULL, 100, key); zephir_check_call_status(); RETURN_MM(); } @@ -707,7 +709,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuExists) zephir_fetch_params(1, 1, 0, &key); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_exists", NULL, 0, key); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_exists", NULL, 101, key); zephir_check_call_status(); RETURN_MM(); } @@ -756,7 +758,9 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuInc) ZVAL_LONG(&_0, step); ZVAL_LONG(&_1, ttl); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_inc", NULL, 0, key, &_0, success, &_1); + ZEPHIR_MAKE_REF(success); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_inc", NULL, 102, key, &_0, success, &_1); + ZEPHIR_UNREF(success); zephir_check_call_status(); RETURN_MM(); } @@ -789,14 +793,15 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuFetch) } - ZEPHIR_RETURN_CALL_FUNCTION("apcu_fetch", NULL, 0, key, success); + ZEPHIR_MAKE_REF(success); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_fetch", NULL, 103, key, success); + ZEPHIR_UNREF(success); zephir_check_call_status(); RETURN_MM(); } PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuIterator) { - zend_class_entry *_0 = NULL; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval *pattern_param = NULL; @@ -817,15 +822,9 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuIterator) zephir_get_strval(&pattern, pattern_param); - if (!_0) { - _0 = zephir_fetch_class_str_ex(SL("APCUIterator"), ZEND_FETCH_CLASS_AUTO); - } - object_init_ex(return_value, _0); - if (zephir_has_constructor(return_value)) { - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 0, &pattern); - zephir_check_call_status(); - } - + object_init_ex(return_value, zephir_get_internal_ce(SL("apcuiterator"))); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 0, &pattern); + zephir_check_call_status(); RETURN_MM(); } @@ -860,7 +859,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuStore) ZVAL_LONG(&_0, ttl); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_store", NULL, 0, key, payload, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_store", NULL, 104, key, payload, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/storage/adapter/libmemcached.zep.c b/ext/phalcon/storage/adapter/libmemcached.zep.c index fdf67171dc..6ad4c7ddff 100644 --- a/ext/phalcon/storage/adapter/libmemcached.zep.c +++ b/ext/phalcon/storage/adapter/libmemcached.zep.c @@ -68,7 +68,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Libmemcached, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\storage\\serializerfactory"))) + Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_storage_serializerfactory_ce) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); @@ -331,14 +331,14 @@ 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, 99, &connection, &client); + ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "setoptions", NULL, 105, &connection, &client); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_10$$4, &_9$$4, "setservers", NULL, 100, &connection, &servers); + ZEPHIR_CALL_METHOD(&_10$$4, &_9$$4, "setservers", NULL, 106, &connection, &servers); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_10$$4, "setsasl", NULL, 101, &connection, &saslUser, &saslPass); + ZEPHIR_CALL_METHOD(NULL, &_10$$4, "setsasl", NULL, 107, &connection, &saslUser, &saslPass); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 102, &connection); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 108, &connection); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("adapter"), &connection); } diff --git a/ext/phalcon/storage/adapter/memory.zep.c b/ext/phalcon/storage/adapter/memory.zep.c index 72849173e8..1c7ebffbfd 100644 --- a/ext/phalcon/storage/adapter/memory.zep.c +++ b/ext/phalcon/storage/adapter/memory.zep.c @@ -70,7 +70,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Memory, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\storage\\serializerfactory"))) + Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_storage_serializerfactory_ce) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/phalcon/storage/adapter/redis.zep.c b/ext/phalcon/storage/adapter/redis.zep.c index aeb2bfd58d..05b7f08465 100644 --- a/ext/phalcon/storage/adapter/redis.zep.c +++ b/ext/phalcon/storage/adapter/redis.zep.c @@ -96,7 +96,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Redis, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\storage\\serializerfactory"))) + Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_storage_serializerfactory_ce) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); @@ -350,22 +350,19 @@ PHP_METHOD(Phalcon_Storage_Adapter_Redis, getAdapter) if (Z_TYPE_P(&_0) == IS_NULL) { ZEPHIR_INIT_VAR(&connection); object_init_ex(&connection, zephir_get_internal_ce(SL("redis"))); - if (zephir_has_constructor(&connection)) { - ZEPHIR_CALL_METHOD(NULL, &connection, "__construct", NULL, 0); - zephir_check_call_status(); - } - - ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "checkconnect", NULL, 103, &connection); + ZEPHIR_CALL_METHOD(NULL, &connection, "__construct", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "checkconnect", NULL, 109, &connection); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_2$$3, &_1$$3, "checkauth", NULL, 104, &connection); + ZEPHIR_CALL_METHOD(&_2$$3, &_1$$3, "checkauth", NULL, 110, &connection); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "checkindex", NULL, 105, &connection); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "checkindex", NULL, 111, &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, 106, &connection); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 112, &connection); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("adapter"), &connection); } @@ -825,7 +822,7 @@ 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, 107, &_5$$5, &host, &port); + ZEPHIR_CALL_FUNCTION(&_6$$5, "sprintf", NULL, 113, &_5$$5, &host, &port); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_4$$5, "__construct", NULL, 29, &_6$$5); zephir_check_call_status(); @@ -931,34 +928,34 @@ 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, 108, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "defined", NULL, 114, &_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, 109, &_2$$3); + ZEPHIR_CALL_FUNCTION(&_3$$3, "constant", NULL, 115, &_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, 108, &_0); + ZEPHIR_CALL_FUNCTION(&_4, "defined", NULL, 114, &_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, 109, &_5$$4); + ZEPHIR_CALL_FUNCTION(&_6$$4, "constant", NULL, 115, &_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, 108, &_0); + ZEPHIR_CALL_FUNCTION(&_7, "defined", NULL, 114, &_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, 109, &_8$$5); + ZEPHIR_CALL_FUNCTION(&_9$$5, "constant", NULL, 115, &_8$$5); zephir_check_call_status(); zephir_array_update_string(&map, SL("redis_json"), &_9$$5, PH_COPY | PH_SEPARATE); } diff --git a/ext/phalcon/storage/adapter/stream.zep.c b/ext/phalcon/storage/adapter/stream.zep.c index cc11ffd131..d18a9ce061 100644 --- a/ext/phalcon/storage/adapter/stream.zep.c +++ b/ext/phalcon/storage/adapter/stream.zep.c @@ -87,7 +87,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\storage\\serializerfactory"))) + Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_storage_serializerfactory_ce) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); @@ -114,7 +114,7 @@ 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", 60); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "getdirseparator", NULL, 110, &storageDir); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "getdirseparator", NULL, 116, &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); @@ -153,9 +153,9 @@ 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, 110, &_0); + ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdirseparator", NULL, 116, &_0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 111, &directory); + ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 117, &directory); zephir_check_call_status(); zephir_is_iterable(&iterator, 0, "phalcon/Storage/Adapter/Stream.zep", 91); if (Z_TYPE_P(&iterator) == IS_ARRAY) { @@ -319,9 +319,9 @@ 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, 112, &key); + ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 118, &key); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("unlink", NULL, 113, &filepath); + ZEPHIR_RETURN_CALL_FUNCTION("unlink", NULL, 119, &filepath); zephir_check_call_status(); RETURN_MM(); } @@ -378,17 +378,17 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, get) } - ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 112, &key); + ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 118, &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, 114, &filepath); + ZEPHIR_CALL_METHOD(&payload, this_ptr, "getpayload", NULL, 120, &filepath); zephir_check_call_status(); _0 = ZEPHIR_IS_EMPTY(&payload); if (!(_0)) { - ZEPHIR_CALL_METHOD(&_1, this_ptr, "isexpired", NULL, 115, &payload); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "isexpired", NULL, 121, &payload); zephir_check_call_status(); _0 = zephir_is_true(&_1); } @@ -465,7 +465,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getKeys) ZEPHIR_INIT_VAR(&files); array_init(&files); - ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 116); + ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 122); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, this_ptr, "phpfileexists", NULL, 0, &directory); zephir_check_call_status(); @@ -473,7 +473,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getKeys) array_init(return_value); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 111, &directory); + ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 117, &directory); zephir_check_call_status(); zephir_is_iterable(&iterator, 0, "phalcon/Storage/Adapter/Stream.zep", 197); if (Z_TYPE_P(&iterator) == IS_ARRAY) { @@ -564,19 +564,19 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, has) } - ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 112, &key); + ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 118, &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, 114, &filepath); + ZEPHIR_CALL_METHOD(&payload, this_ptr, "getpayload", NULL, 120, &filepath); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_IS_EMPTY(&payload))) { RETURN_MM_BOOL(0); } - ZEPHIR_CALL_METHOD(&_1, this_ptr, "isexpired", NULL, 115, &payload); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "isexpired", NULL, 121, &payload); zephir_check_call_status(); RETURN_MM_BOOL(!zephir_is_true(&_1)); } @@ -725,7 +725,7 @@ 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, 117, &payload, &key); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "storepayload", NULL, 123, &payload, &key); zephir_check_call_status(); RETURN_MM(); } @@ -784,7 +784,7 @@ 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, 117, &payload, &key); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "storepayload", NULL, 123, &payload, &key); zephir_check_call_status(); RETURN_MM(); } @@ -843,15 +843,15 @@ 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, 110, &_2); + ZEPHIR_CALL_METHOD(&dirPrefix, this_ptr, "getdirseparator", NULL, 116, &_2); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "getkeywithoutprefix", NULL, 118, &key); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "getkeywithoutprefix", NULL, 124, &key); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&dirFromFile, this_ptr, "getdirfromfile", NULL, 119, &_3); + ZEPHIR_CALL_METHOD(&dirFromFile, this_ptr, "getdirfromfile", NULL, 125, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); ZEPHIR_CONCAT_VV(&_4, &dirPrefix, &dirFromFile); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getdirseparator", NULL, 110, &_4); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getdirseparator", NULL, 116, &_4); zephir_check_call_status(); RETURN_MM(); } @@ -887,9 +887,9 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getFilepath) zephir_get_strval(&key, key_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdir", NULL, 116, &key); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdir", NULL, 122, &key); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "getkeywithoutprefix", NULL, 118, &key); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getkeywithoutprefix", NULL, 124, &key); zephir_check_call_status(); ZEPHIR_CONCAT_VV(return_value, &_0, &_1); RETURN_MM(); @@ -980,10 +980,10 @@ 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, 120, &dir, &_1); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 126, &dir, &_1); zephir_check_call_status(); ZVAL_LONG(&_1, 2); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 121, &_0, &_1); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 127, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -1044,7 +1044,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getPayload) RETURN_MM(); } ZVAL_LONG(&_1, 1); - ZEPHIR_CALL_FUNCTION(&_2, "flock", NULL, 122, &pointer, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "flock", NULL, 128, &pointer, &_1); zephir_check_call_status(); if (EXPECTED(ZEPHIR_IS_TRUE_IDENTICAL(&_2))) { ZEPHIR_CALL_METHOD(&payload, this_ptr, "phpfilegetcontents", NULL, 0, &filepath); @@ -1055,34 +1055,34 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getPayload) array_init(return_value); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 123); + ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 129); 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, 124, &version, &_0, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "version_compare", NULL, 130, &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_1__closure_ce, SL("__invoke")); ZVAL_LONG(&_6$$6, 8); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 125, &_5$$6, &_6$$6); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 131, &_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_2__closure_ce, SL("__invoke")); ZVAL_LONG(&_8$$7, 8); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 125, &_7$$7, &_8$$7); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 131, &_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, 126); + ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 132); zephir_check_call_status(); _10 = ZEPHIR_GLOBAL(warning).enable; if (!(_10)) { @@ -1197,13 +1197,13 @@ 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, 116, &key); + ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 122, &key); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_0, "is_dir", NULL, 127, &directory); + ZEPHIR_CALL_FUNCTION(&_0, "is_dir", NULL, 133, &directory); zephir_check_call_status(); if (!(zephir_is_true(&_0))) { ZVAL_LONG(&_1$$3, 0777); - ZEPHIR_CALL_FUNCTION(NULL, "mkdir", NULL, 128, &directory, &_1$$3, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "mkdir", NULL, 134, &directory, &_1$$3, &__$true); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_3); @@ -1306,7 +1306,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, phpFilePutContents) ZVAL_LONG(&_0, flags); - ZEPHIR_RETURN_CALL_FUNCTION("file_put_contents", NULL, 129, &filename, data, &_0, context); + ZEPHIR_RETURN_CALL_FUNCTION("file_put_contents", NULL, 135, &filename, data, &_0, context); zephir_check_call_status(); RETURN_MM(); } @@ -1336,7 +1336,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, phpFopen) zephir_get_strval(&mode, mode_param); - ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 130, &filename, &mode); + ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 136, &filename, &mode); zephir_check_call_status(); RETURN_MM(); } @@ -1363,7 +1363,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, phpUnlink) zephir_get_strval(&filename, filename_param); - ZEPHIR_RETURN_CALL_FUNCTION("unlink", NULL, 113, &filename); + ZEPHIR_RETURN_CALL_FUNCTION("unlink", NULL, 119, &filename); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/storage/adapter/weak.zep.c b/ext/phalcon/storage/adapter/weak.zep.c new file mode 100644 index 0000000000..ffbba6aaff --- /dev/null +++ b/ext/phalcon/storage/adapter/weak.zep.c @@ -0,0 +1,634 @@ + +#ifdef HAVE_CONFIG_H +#include "../../../ext_config.h" +#endif + +#include +#include "../../../php_ext.h" +#include "../../../ext.h" + +#include +#include +#include + +#include "kernel/main.h" +#include "kernel/object.h" +#include "kernel/memory.h" +#include "ext/spl/spl_exceptions.h" +#include "kernel/exception.h" +#include "kernel/operators.h" +#include "kernel/array.h" +#include "kernel/fcall.h" +#include "kernel/string.h" + + +/** + * 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. + */ +/** +* Weak Adapter +*/ +ZEPHIR_INIT_CLASS(Phalcon_Storage_Adapter_Weak) +{ + ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Storage\\Adapter, Weak, phalcon, storage_adapter_weak, phalcon_storage_adapter_abstractadapter_ce, phalcon_storage_adapter_weak_method_entry, 0); + + /** + * + * + * @var int|null + */ + zend_declare_property_null(phalcon_storage_adapter_weak_ce, SL("fetching"), ZEND_ACC_PROTECTED); + /** + * @var array + */ + zend_declare_property_null(phalcon_storage_adapter_weak_ce, SL("weakList"), ZEND_ACC_PROTECTED); + /** + * @var array + */ + zend_declare_property_null(phalcon_storage_adapter_weak_ce, SL("options"), ZEND_ACC_PROTECTED); + phalcon_storage_adapter_weak_ce->create_object = zephir_init_properties_Phalcon_Storage_Adapter_Weak; + + return SUCCESS; +} + +/** + * Constructor, there are no options + * + * @param array options = [] + * @throws SupportException + */ +PHP_METHOD(Phalcon_Storage_Adapter_Weak, __construct) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval options; + zval *factory, factory_sub, *options_param = NULL, _0; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&factory_sub); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&options); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 2) + Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_storage_serializerfactory_ce) + Z_PARAM_OPTIONAL + Z_PARAM_ARRAY(options) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 1, &factory, &options_param); + if (!options_param) { + ZEPHIR_INIT_VAR(&options); + array_init(&options); + } else { + ZEPHIR_OBS_COPY_OR_DUP(&options, options_param); + } + + + ZEPHIR_INIT_VAR(&_0); + ZEPHIR_INIT_NVAR(&_0); + ZVAL_STRING(&_0, "none"); + zephir_update_property_zval(this_ptr, ZEND_STRL("defaultSerializer"), &_0); + ZEPHIR_INIT_NVAR(&_0); + ZVAL_STRING(&_0, ""); + zephir_update_property_zval(this_ptr, ZEND_STRL("prefix"), &_0); + zephir_update_property_zval(this_ptr, ZEND_STRL("options"), &options); + ZEPHIR_MM_RESTORE(); +} + +/** + * Flushes/clears the cache + */ +PHP_METHOD(Phalcon_Storage_Adapter_Weak, clear) +{ + zval _0; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&_0); + + + ZEPHIR_MM_GROW(); + + ZEPHIR_INIT_VAR(&_0); + array_init(&_0); + zephir_update_property_zval(this_ptr, ZEND_STRL("weakList"), &_0); + RETURN_MM_BOOL(1); +} + +/** + * Decrements a stored number + * + * @param string $key + * @param int $value + * + * @return bool|int + */ +PHP_METHOD(Phalcon_Storage_Adapter_Weak, decrement) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long value; + zval *key_param = NULL, *value_param = NULL; + zval key; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&key); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 2) + Z_PARAM_STR(key) + Z_PARAM_OPTIONAL + Z_PARAM_LONG(value) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 1, &key_param, &value_param); + if (UNEXPECTED(Z_TYPE_P(key_param) != IS_STRING && Z_TYPE_P(key_param) != IS_NULL)) { + zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'key' must be of the type string")); + RETURN_MM_NULL(); + } + if (EXPECTED(Z_TYPE_P(key_param) == IS_STRING)) { + zephir_get_strval(&key, key_param); + } else { + ZEPHIR_INIT_VAR(&key); + } + if (!value_param) { + value = 1; + } else { + value = zephir_get_intval(value_param); + } + + + RETURN_MM_BOOL(0); +} + +/** + * Deletes data from the adapter + * + * @param string $key + * + * @return bool + */ +PHP_METHOD(Phalcon_Storage_Adapter_Weak, delete) +{ + zend_bool exists = 0; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *key_param = NULL, _0, _1, _2; + zval key; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&key); + 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_STR(key) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &key_param); + if (UNEXPECTED(Z_TYPE_P(key_param) != IS_STRING && Z_TYPE_P(key_param) != IS_NULL)) { + zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'key' must be of the type string")); + RETURN_MM_NULL(); + } + if (EXPECTED(Z_TYPE_P(key_param) == IS_STRING)) { + zephir_get_strval(&key, key_param); + } else { + ZEPHIR_INIT_VAR(&key); + } + + + zephir_read_property(&_0, this_ptr, ZEND_STRL("fetching"), PH_NOISY_CC | PH_READONLY); + if (ZEPHIR_IS_IDENTICAL(&key, &_0)) { + RETURN_MM_BOOL(0); + } + zephir_read_property(&_1, this_ptr, ZEND_STRL("weakList"), PH_NOISY_CC | PH_READONLY); + exists = zephir_array_isset(&_1, &key); + zephir_unset_property_array(this_ptr, ZEND_STRL("weakList"), &key); + zephir_read_property(&_2, this_ptr, ZEND_STRL("weakList"), PH_NOISY_CC | PH_READONLY); + zephir_array_unset(&_2, &key, PH_SEPARATE); + RETURN_MM_BOOL(exists); +} + +/** + * Stores data in the adapter + * + * @param string $prefix + * + * @return array + */ +PHP_METHOD(Phalcon_Storage_Adapter_Weak, getKeys) +{ + zval results; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *prefix_param = NULL, keys, key, _0, _1, *_2$$3, _3$$3; + zval prefix; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&prefix); + ZVAL_UNDEF(&keys); + ZVAL_UNDEF(&key); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_3$$3); + ZVAL_UNDEF(&results); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(0, 1) + Z_PARAM_OPTIONAL + Z_PARAM_STR(prefix) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 0, 1, &prefix_param); + if (!prefix_param) { + ZEPHIR_INIT_VAR(&prefix); + ZVAL_STRING(&prefix, ""); + } else { + zephir_get_strval(&prefix, prefix_param); + } + + + zephir_read_property(&_0, this_ptr, ZEND_STRL("weakList"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_INIT_VAR(&keys); + zephir_array_keys(&keys, &_0); + ZEPHIR_INIT_VAR(&_1); + ZVAL_STRING(&_1, ""); + if (UNEXPECTED(!ZEPHIR_IS_IDENTICAL(&_1, &prefix))) { + ZEPHIR_INIT_VAR(&results); + array_init(&results); + zephir_is_iterable(&keys, 0, "phalcon/Storage/Adapter/Weak.zep", 116); + if (Z_TYPE_P(&keys) == IS_ARRAY) { + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&keys), _2$$3) + { + ZEPHIR_INIT_NVAR(&key); + ZVAL_COPY(&key, _2$$3); + if (zephir_start_with(&key, &prefix, NULL)) { + zephir_array_append(&results, &key, PH_SEPARATE, "phalcon/Storage/Adapter/Weak.zep", 113); + } + } ZEND_HASH_FOREACH_END(); + } else { + ZEPHIR_CALL_METHOD(NULL, &keys, "rewind", NULL, 0); + zephir_check_call_status(); + while (1) { + ZEPHIR_CALL_METHOD(&_3$$3, &keys, "valid", NULL, 0); + zephir_check_call_status(); + if (!zend_is_true(&_3$$3)) { + break; + } + ZEPHIR_CALL_METHOD(&key, &keys, "current", NULL, 0); + zephir_check_call_status(); + if (zephir_start_with(&key, &prefix, NULL)) { + zephir_array_append(&results, &key, PH_SEPARATE, "phalcon/Storage/Adapter/Weak.zep", 113); + } + ZEPHIR_CALL_METHOD(NULL, &keys, "next", NULL, 0); + zephir_check_call_status(); + } + } + ZEPHIR_INIT_NVAR(&key); + RETURN_CTOR(&results); + } + RETURN_CCTOR(&keys); +} + +/** + * Increments a stored number + * + * @param string $key + * @param int $value + * + * @return bool|int + */ +PHP_METHOD(Phalcon_Storage_Adapter_Weak, increment) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long value; + zval *key_param = NULL, *value_param = NULL; + zval key; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&key); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 2) + Z_PARAM_STR(key) + Z_PARAM_OPTIONAL + Z_PARAM_LONG(value) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 1, &key_param, &value_param); + if (UNEXPECTED(Z_TYPE_P(key_param) != IS_STRING && Z_TYPE_P(key_param) != IS_NULL)) { + zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'key' must be of the type string")); + RETURN_MM_NULL(); + } + if (EXPECTED(Z_TYPE_P(key_param) == IS_STRING)) { + zephir_get_strval(&key, key_param); + } else { + ZEPHIR_INIT_VAR(&key); + } + if (!value_param) { + value = 1; + } else { + value = zephir_get_intval(value_param); + } + + + RETURN_MM_BOOL(0); +} + +/** + * Reads data from the adapter + * + * @param string key + * @param mixed|null defaultValue + * + * @return mixed + */ +PHP_METHOD(Phalcon_Storage_Adapter_Weak, get) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *key_param = NULL, *defaultValue = NULL, defaultValue_sub, __$null, value, wr, _0, _1; + zval key; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&key); + ZVAL_UNDEF(&defaultValue_sub); + ZVAL_NULL(&__$null); + ZVAL_UNDEF(&value); + ZVAL_UNDEF(&wr); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 2) + Z_PARAM_STR(key) + Z_PARAM_OPTIONAL + Z_PARAM_ZVAL_OR_NULL(defaultValue) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 1, &key_param, &defaultValue); + if (UNEXPECTED(Z_TYPE_P(key_param) != IS_STRING && Z_TYPE_P(key_param) != IS_NULL)) { + zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'key' must be of the type string")); + RETURN_MM_NULL(); + } + if (EXPECTED(Z_TYPE_P(key_param) == IS_STRING)) { + zephir_get_strval(&key, key_param); + } else { + ZEPHIR_INIT_VAR(&key); + } + if (!defaultValue) { + defaultValue = &defaultValue_sub; + defaultValue = &__$null; + } + + + zephir_update_property_zval(this_ptr, ZEND_STRL("fetching"), &key); + zephir_read_property(&_0, this_ptr, ZEND_STRL("weakList"), PH_NOISY_CC | PH_READONLY); + if (0 == zephir_array_isset(&_0, &key)) { + zephir_update_property_zval(this_ptr, ZEND_STRL("fetching"), &__$null); + RETVAL_ZVAL(defaultValue, 1, 0); + RETURN_MM(); + } + zephir_read_property(&_1, this_ptr, ZEND_STRL("weakList"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_OBS_VAR(&wr); + zephir_array_fetch(&wr, &_1, &key, PH_NOISY, "phalcon/Storage/Adapter/Weak.zep", 156); + ZEPHIR_CALL_METHOD(&value, &wr, "get", NULL, 0); + zephir_check_call_status(); + zephir_update_property_zval(this_ptr, ZEND_STRL("fetching"), &__$null); + if (Z_TYPE_P(&value) == IS_NULL) { + ZEPHIR_CALL_METHOD(NULL, this_ptr, "delete", NULL, 0, &key); + zephir_check_call_status(); + } + RETURN_CCTOR(&value); +} + +/** + * Checks if an element exists in the cache + * + * @param string key + * + * @return bool + */ +PHP_METHOD(Phalcon_Storage_Adapter_Weak, has) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *key_param = NULL, _0; + zval key; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&key); + ZVAL_UNDEF(&_0); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_STR(key) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &key_param); + if (UNEXPECTED(Z_TYPE_P(key_param) != IS_STRING && Z_TYPE_P(key_param) != IS_NULL)) { + zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'key' must be of the type string")); + RETURN_MM_NULL(); + } + if (EXPECTED(Z_TYPE_P(key_param) == IS_STRING)) { + zephir_get_strval(&key, key_param); + } else { + ZEPHIR_INIT_VAR(&key); + } + + + zephir_read_property(&_0, this_ptr, ZEND_STRL("weakList"), PH_NOISY_CC | PH_READONLY); + RETURN_MM_BOOL(zephir_array_isset(&_0, &key)); +} + +/** + * Stores data in the adapter. If the TTL is `null` (default) or not defined + * then the default TTL will be used, as set in this adapter. If the TTL + * is `0` or a negative number, a `delete()` will be issued, since this + * item has expired. If you need to set this key forever, you should use + * the `setForever()` method. + * + * @param string $key + * @param mixed $value + * @param DateInterval|int|null $ttl + * + * @return bool + * @throws BaseException + */ +PHP_METHOD(Phalcon_Storage_Adapter_Weak, set) +{ + zend_class_entry *_2$$4; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *key_param = NULL, *value, value_sub, *ttl = NULL, ttl_sub, __$null, _0, _1$$4; + zval key; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&key); + ZVAL_UNDEF(&value_sub); + ZVAL_UNDEF(&ttl_sub); + ZVAL_NULL(&__$null); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1$$4); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(2, 3) + Z_PARAM_STR(key) + Z_PARAM_ZVAL(value) + Z_PARAM_OPTIONAL + Z_PARAM_ZVAL_OR_NULL(ttl) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 2, 1, &key_param, &value, &ttl); + if (UNEXPECTED(Z_TYPE_P(key_param) != IS_STRING && Z_TYPE_P(key_param) != IS_NULL)) { + zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'key' must be of the type string")); + RETURN_MM_NULL(); + } + if (EXPECTED(Z_TYPE_P(key_param) == IS_STRING)) { + zephir_get_strval(&key, key_param); + } else { + ZEPHIR_INIT_VAR(&key); + } + if (!ttl) { + ttl = &ttl_sub; + ttl = &__$null; + } + + + if (Z_TYPE_P(value) != IS_OBJECT) { + RETURN_MM_BOOL(0); + } + zephir_read_property(&_0, this_ptr, ZEND_STRL("weakList"), PH_NOISY_CC | PH_READONLY); + if (0 == zephir_array_isset(&_0, &key)) { + _2$$4 = zephir_fetch_class_str_ex(SL("WeakReference"), ZEND_FETCH_CLASS_AUTO); + ZEPHIR_CALL_CE_STATIC(&_1$$4, _2$$4, "create", NULL, 0, value); + zephir_check_call_status(); + zephir_update_property_array(this_ptr, SL("weakList"), &key, &_1$$4); + } + RETURN_MM_BOOL(1); +} + +/** + * For compatiblity only, there is no Forever with WeakReference. + * + * @param string $key + * @param mixed $value + * + * @return bool + */ +PHP_METHOD(Phalcon_Storage_Adapter_Weak, setForever) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *key_param = NULL, *value, value_sub; + zval key; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&key); + ZVAL_UNDEF(&value_sub); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(2, 2) + Z_PARAM_STR(key) + Z_PARAM_ZVAL(value) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 2, 0, &key_param, &value); + zephir_get_strval(&key, key_param); + + + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "set", NULL, 0, &key, value); + zephir_check_call_status(); + RETURN_MM(); +} + +/** + * will never set a serializer, WeakReference cannot be serialized + * @param string $serializer + */ +PHP_METHOD(Phalcon_Storage_Adapter_Weak, setDefaultSerializer) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *serializer_param = NULL; + zval serializer; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&serializer); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_STR(serializer) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &serializer_param); + zephir_get_strval(&serializer, serializer_param); + + +} + +zend_object *zephir_init_properties_Phalcon_Storage_Adapter_Weak(zend_class_entry *class_type) +{ + zval _0, _2, _1$$3, _3$$4; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_1$$3); + ZVAL_UNDEF(&_3$$4); + + + 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("options"), 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("options"), &_1$$3); + } + zephir_read_property_ex(&_2, this_ptr, ZEND_STRL("weakList"), 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("weakList"), &_3$$4); + } + ZEPHIR_MM_RESTORE(); + return Z_OBJ_P(this_ptr); + } +} + diff --git a/ext/phalcon/storage/adapter/weak.zep.h b/ext/phalcon/storage/adapter/weak.zep.h new file mode 100644 index 0000000000..cf07655258 --- /dev/null +++ b/ext/phalcon/storage/adapter/weak.zep.h @@ -0,0 +1,90 @@ + +extern zend_class_entry *phalcon_storage_adapter_weak_ce; + +ZEPHIR_INIT_CLASS(Phalcon_Storage_Adapter_Weak); + +PHP_METHOD(Phalcon_Storage_Adapter_Weak, __construct); +PHP_METHOD(Phalcon_Storage_Adapter_Weak, clear); +PHP_METHOD(Phalcon_Storage_Adapter_Weak, decrement); +PHP_METHOD(Phalcon_Storage_Adapter_Weak, delete); +PHP_METHOD(Phalcon_Storage_Adapter_Weak, getKeys); +PHP_METHOD(Phalcon_Storage_Adapter_Weak, increment); +PHP_METHOD(Phalcon_Storage_Adapter_Weak, get); +PHP_METHOD(Phalcon_Storage_Adapter_Weak, has); +PHP_METHOD(Phalcon_Storage_Adapter_Weak, set); +PHP_METHOD(Phalcon_Storage_Adapter_Weak, setForever); +PHP_METHOD(Phalcon_Storage_Adapter_Weak, setDefaultSerializer); +zend_object *zephir_init_properties_Phalcon_Storage_Adapter_Weak(zend_class_entry *class_type); + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_adapter_weak___construct, 0, 0, 1) + ZEND_ARG_OBJ_INFO(0, factory, Phalcon\\Storage\\SerializerFactory, 0) +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "[]") +#else + ZEND_ARG_ARRAY_INFO(0, options, 0) +#endif +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_adapter_weak_clear, 0, 0, _IS_BOOL, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_adapter_weak_decrement, 0, 0, 1) + ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, value, IS_LONG, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_adapter_weak_delete, 0, 1, _IS_BOOL, 0) + ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_adapter_weak_getkeys, 0, 0, IS_ARRAY, 0) + ZEND_ARG_TYPE_INFO(0, prefix, IS_STRING, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_adapter_weak_increment, 0, 0, 1) + ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, value, IS_LONG, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_adapter_weak_get, 0, 0, 1) + ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) + ZEND_ARG_INFO(0, defaultValue) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_adapter_weak_has, 0, 1, _IS_BOOL, 0) + ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_adapter_weak_set, 0, 2, _IS_BOOL, 0) + ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) + ZEND_ARG_INFO(0, value) + ZEND_ARG_INFO(0, ttl) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_adapter_weak_setforever, 0, 2, _IS_BOOL, 0) + ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) + ZEND_ARG_INFO(0, value) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_adapter_weak_setdefaultserializer, 0, 1, IS_VOID, 0) + + ZEND_ARG_TYPE_INFO(0, serializer, IS_STRING, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_adapter_weak_zephir_init_properties_phalcon_storage_adapter_weak, 0, 0, 0) +ZEND_END_ARG_INFO() + +ZEPHIR_INIT_FUNCS(phalcon_storage_adapter_weak_method_entry) { + PHP_ME(Phalcon_Storage_Adapter_Weak, __construct, arginfo_phalcon_storage_adapter_weak___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) + PHP_ME(Phalcon_Storage_Adapter_Weak, clear, arginfo_phalcon_storage_adapter_weak_clear, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Storage_Adapter_Weak, decrement, arginfo_phalcon_storage_adapter_weak_decrement, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Storage_Adapter_Weak, delete, arginfo_phalcon_storage_adapter_weak_delete, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Storage_Adapter_Weak, getKeys, arginfo_phalcon_storage_adapter_weak_getkeys, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Storage_Adapter_Weak, increment, arginfo_phalcon_storage_adapter_weak_increment, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Storage_Adapter_Weak, get, arginfo_phalcon_storage_adapter_weak_get, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Storage_Adapter_Weak, has, arginfo_phalcon_storage_adapter_weak_has, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Storage_Adapter_Weak, set, arginfo_phalcon_storage_adapter_weak_set, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Storage_Adapter_Weak, setForever, arginfo_phalcon_storage_adapter_weak_setforever, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Storage_Adapter_Weak, setDefaultSerializer, arginfo_phalcon_storage_adapter_weak_setdefaultserializer, ZEND_ACC_PUBLIC) + PHP_FE_END +}; diff --git a/ext/phalcon/storage/adapterfactory.zep.c b/ext/phalcon/storage/adapterfactory.zep.c index 7cb6f1f89c..ecc146be7d 100644 --- a/ext/phalcon/storage/adapterfactory.zep.c +++ b/ext/phalcon/storage/adapterfactory.zep.c @@ -56,7 +56,7 @@ PHP_METHOD(Phalcon_Storage_AdapterFactory, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(factory, zephir_get_internal_ce(SL("phalcon\\storage\\serializerfactory"))) + Z_PARAM_OBJECT_OF_CLASS(factory, phalcon_storage_serializerfactory_ce) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(services) ZEND_PARSE_PARAMETERS_END(); @@ -185,12 +185,13 @@ PHP_METHOD(Phalcon_Storage_AdapterFactory, getServices) - zephir_create_array(return_value, 5, 0); + zephir_create_array(return_value, 6, 0); add_assoc_stringl_ex(return_value, SL("apcu"), SL("Phalcon\\Storage\\Adapter\\Apcu")); add_assoc_stringl_ex(return_value, SL("libmemcached"), SL("Phalcon\\Storage\\Adapter\\Libmemcached")); add_assoc_stringl_ex(return_value, SL("memory"), SL("Phalcon\\Storage\\Adapter\\Memory")); add_assoc_stringl_ex(return_value, SL("redis"), SL("Phalcon\\Storage\\Adapter\\Redis")); add_assoc_stringl_ex(return_value, SL("stream"), SL("Phalcon\\Storage\\Adapter\\Stream")); + add_assoc_stringl_ex(return_value, SL("weak"), SL("Phalcon\\Storage\\Adapter\\Weak")); return; } diff --git a/ext/phalcon/storage/serializer/base64.zep.c b/ext/phalcon/storage/serializer/base64.zep.c index 827263ef6d..29f7dd1432 100644 --- a/ext/phalcon/storage/serializer/base64.zep.c +++ b/ext/phalcon/storage/serializer/base64.zep.c @@ -60,7 +60,7 @@ 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, 224, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 227, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -166,7 +166,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Base64, phpBase64Decode) ZVAL_BOOL(&_0, (strict ? 1 : 0)); - ZEPHIR_RETURN_CALL_FUNCTION("base64_decode", NULL, 223, &input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("base64_decode", NULL, 226, &input, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/storage/serializer/igbinary.zep.c b/ext/phalcon/storage/serializer/igbinary.zep.c index cb72a3541b..69ed1d67a6 100644 --- a/ext/phalcon/storage/serializer/igbinary.zep.c +++ b/ext/phalcon/storage/serializer/igbinary.zep.c @@ -128,33 +128,33 @@ 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, 123); + ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 129); 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, 124, &version, &_1$$4, &_2$$4); + ZEPHIR_CALL_FUNCTION(&_3$$4, "version_compare", NULL, 130, &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_3__closure_ce, SL("__invoke")); ZVAL_LONG(&_5$$5, 2); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 125, &_4$$5, &_5$$5); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 131, &_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_4__closure_ce, SL("__invoke")); ZVAL_LONG(&_7$$6, 2); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 125, &_6$$6, &_7$$6); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 131, &_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, 126); + ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 132); zephir_check_call_status(); _8$$4 = ZEPHIR_GLOBAL(warning).enable; if (!(_8$$4)) { @@ -207,7 +207,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, phpIgbinarySerialize) zephir_fetch_params(1, 1, 0, &value); - ZEPHIR_RETURN_CALL_FUNCTION("igbinary_serialize", NULL, 131, value); + ZEPHIR_RETURN_CALL_FUNCTION("igbinary_serialize", NULL, 137, value); zephir_check_call_status(); RETURN_MM(); } @@ -271,7 +271,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, doUnserialize) zephir_fetch_params(1, 1, 0, &value); - ZEPHIR_RETURN_CALL_FUNCTION("igbinary_unserialize", NULL, 132, value); + ZEPHIR_RETURN_CALL_FUNCTION("igbinary_unserialize", NULL, 138, value); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/storage/serializer/json.zep.c b/ext/phalcon/storage/serializer/json.zep.c index e5ca535eed..ea54e24e98 100644 --- a/ext/phalcon/storage/serializer/json.zep.c +++ b/ext/phalcon/storage/serializer/json.zep.c @@ -13,13 +13,12 @@ #include "kernel/main.h" #include "kernel/memory.h" +#include "kernel/fcall.h" #include "kernel/object.h" #include "kernel/exception.h" #include "ext/spl/spl_exceptions.h" -#include "kernel/fcall.h" #include "kernel/concat.h" #include "kernel/operators.h" -#include "kernel/string.h" /** @@ -34,9 +33,72 @@ ZEPHIR_INIT_CLASS(Phalcon_Storage_Serializer_Json) { ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Storage\\Serializer, Json, phalcon, storage_serializer_json, phalcon_storage_serializer_abstractserializer_ce, phalcon_storage_serializer_json_method_entry, 0); + /** + * @var Decode + */ + zend_declare_property_null(phalcon_storage_serializer_json_ce, SL("decode"), ZEND_ACC_PRIVATE); + /** + * @var Encode + */ + zend_declare_property_null(phalcon_storage_serializer_json_ce, SL("encode"), ZEND_ACC_PRIVATE); return SUCCESS; } +/** + * AbstractSerializer constructor. + * + * @param mixed|null $data + */ +PHP_METHOD(Phalcon_Storage_Serializer_Json, __construct) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zephir_fcall_cache_entry *_2 = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *data = NULL, data_sub, __$null, _0, _1; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&data_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_ZVAL_OR_NULL(data) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 0, 1, &data); + if (!data) { + data = &data_sub; + data = &__$null; + } + + + ZEPHIR_INIT_VAR(&_0); + object_init_ex(&_0, phalcon_support_helper_json_encode_ce); + if (zephir_has_constructor(&_0)) { + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 0); + zephir_check_call_status(); + } + + zephir_update_property_zval(this_ptr, ZEND_STRL("encode"), &_0); + ZEPHIR_INIT_VAR(&_1); + object_init_ex(&_1, phalcon_support_helper_json_decode_ce); + if (zephir_has_constructor(&_1)) { + ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 0); + zephir_check_call_status(); + } + + zephir_update_property_zval(this_ptr, ZEND_STRL("decode"), &_1); + ZEPHIR_CALL_PARENT(NULL, phalcon_storage_serializer_json_ce, getThis(), "__construct", &_2, 0, data); + zephir_check_call_status(); + ZEPHIR_MM_RESTORE(); +} + /** * Serializes data * @@ -46,7 +108,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Json, serialize) { zval _4$$3; zend_bool _1; - zval _0, _2, _5, _6, _7, _3$$3; + zval _0, _2, _5, _6, _7, _8, _3$$3; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); @@ -56,6 +118,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Json, serialize) ZVAL_UNDEF(&_5); ZVAL_UNDEF(&_6); ZVAL_UNDEF(&_7); + ZVAL_UNDEF(&_8); ZVAL_UNDEF(&_3$$3); ZVAL_UNDEF(&_4$$3); @@ -75,9 +138,9 @@ 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, 189, &_4$$3); + ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 196, &_4$$3); zephir_check_call_status(); - zephir_throw_exception_debug(&_3$$3, "phalcon/Storage/Serializer/Json.zep", 29); + zephir_throw_exception_debug(&_3$$3, "phalcon/Storage/Serializer/Json.zep", 54); ZEPHIR_MM_RESTORE(); return; } @@ -87,8 +150,9 @@ PHP_METHOD(Phalcon_Storage_Serializer_Json, serialize) if (!ZEPHIR_IS_TRUE_IDENTICAL(&_5)) { RETURN_MM_MEMBER(getThis(), "data"); } - zephir_read_property(&_7, this_ptr, ZEND_STRL("data"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getencode", NULL, 0, &_7); + zephir_read_property(&_7, this_ptr, ZEND_STRL("encode"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_8, this_ptr, ZEND_STRL("data"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_RETURN_CALL_METHOD(&_7, "__invoke", NULL, 0, &_8); zephir_check_call_status(); RETURN_MM(); } @@ -104,13 +168,14 @@ PHP_METHOD(Phalcon_Storage_Serializer_Json, unserialize) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval data_sub, _0, _1$$4; + zval data_sub, _0, _1$$4, _2$$4; zval *data; zval *this_ptr = getThis(); ZVAL_UNDEF(&data_sub); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1$$4); + ZVAL_UNDEF(&_2$$4); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -128,159 +193,11 @@ PHP_METHOD(Phalcon_Storage_Serializer_Json, unserialize) if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); } else { - ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "getdecode", NULL, 0, data); + zephir_read_property(&_1$$4, this_ptr, ZEND_STRL("decode"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(&_2$$4, &_1$$4, "__invoke", NULL, 0, data); zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &_1$$4); + zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &_2$$4); } ZEPHIR_MM_RESTORE(); } -/** - * @todo Remove this when we get traits - */ -PHP_METHOD(Phalcon_Storage_Serializer_Json, getDecode) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long depth, options, ZEPHIR_LAST_CALL_STATUS; - zend_bool associative; - zval *data_param = NULL, *associative_param = NULL, *depth_param = NULL, *options_param = NULL, decoded, _0, _1, _2, _3, _4$$3, _5$$3, _6$$3; - zval data; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&data); - ZVAL_UNDEF(&decoded); - 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, 4) - Z_PARAM_STR(data) - Z_PARAM_OPTIONAL - Z_PARAM_BOOL(associative) - Z_PARAM_LONG(depth) - Z_PARAM_LONG(options) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 3, &data_param, &associative_param, &depth_param, &options_param); - if (UNEXPECTED(Z_TYPE_P(data_param) != IS_STRING && Z_TYPE_P(data_param) != IS_NULL)) { - zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'data' must be of the type string")); - RETURN_MM_NULL(); - } - if (EXPECTED(Z_TYPE_P(data_param) == IS_STRING)) { - zephir_get_strval(&data, data_param); - } else { - ZEPHIR_INIT_VAR(&data); - } - if (!associative_param) { - associative = 0; - } else { - associative = zephir_get_boolval(associative_param); - } - if (!depth_param) { - depth = 512; - } else { - depth = zephir_get_intval(depth_param); - } - if (!options_param) { - options = 0; - } else { - options = zephir_get_intval(options_param); - } - - - ZVAL_BOOL(&_0, (associative ? 1 : 0)); - ZVAL_LONG(&_1, depth); - 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, 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, 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, 189, &_6$$3); - zephir_check_call_status(); - zephir_throw_exception_debug(&_4$$3, "phalcon/Storage/Serializer/Json.zep", 71); - ZEPHIR_MM_RESTORE(); - return; - } - RETURN_CCTOR(&decoded); -} - -/** - * @todo Remove this when we get traits - */ -PHP_METHOD(Phalcon_Storage_Serializer_Json, getEncode) -{ - 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, 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, 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(&_3$$3, "phalcon/Storage/Serializer/Json.zep", 92); - ZEPHIR_MM_RESTORE(); - return; - } - RETURN_CCTOR(&encoded); -} - diff --git a/ext/phalcon/storage/serializer/json.zep.h b/ext/phalcon/storage/serializer/json.zep.h index 732da81681..2a0d2e97db 100644 --- a/ext/phalcon/storage/serializer/json.zep.h +++ b/ext/phalcon/storage/serializer/json.zep.h @@ -3,10 +3,13 @@ extern zend_class_entry *phalcon_storage_serializer_json_ce; ZEPHIR_INIT_CLASS(Phalcon_Storage_Serializer_Json); +PHP_METHOD(Phalcon_Storage_Serializer_Json, __construct); PHP_METHOD(Phalcon_Storage_Serializer_Json, serialize); PHP_METHOD(Phalcon_Storage_Serializer_Json, unserialize); -PHP_METHOD(Phalcon_Storage_Serializer_Json, getDecode); -PHP_METHOD(Phalcon_Storage_Serializer_Json, getEncode); + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_json___construct, 0, 0, 0) + ZEND_ARG_INFO(0, data) +ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_json_serialize, 0, 0, 0) ZEND_END_ARG_INFO() @@ -21,27 +24,13 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_json_ 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) - ZEND_ARG_TYPE_INFO(0, associative, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, depth, IS_LONG, 0) - ZEND_ARG_TYPE_INFO(0, options, IS_LONG, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_json_getencode, 0, 1, IS_STRING, 0) - ZEND_ARG_INFO(0, data) - ZEND_ARG_TYPE_INFO(0, options, IS_LONG, 0) - ZEND_ARG_TYPE_INFO(0, depth, IS_LONG, 0) -ZEND_END_ARG_INFO() - ZEPHIR_INIT_FUNCS(phalcon_storage_serializer_json_method_entry) { + PHP_ME(Phalcon_Storage_Serializer_Json, __construct, arginfo_phalcon_storage_serializer_json___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) #if PHP_VERSION_ID >= 80000 PHP_ME(Phalcon_Storage_Serializer_Json, serialize, arginfo_phalcon_storage_serializer_json_serialize, ZEND_ACC_PUBLIC) #else PHP_ME(Phalcon_Storage_Serializer_Json, serialize, NULL, ZEND_ACC_PUBLIC) #endif PHP_ME(Phalcon_Storage_Serializer_Json, unserialize, arginfo_phalcon_storage_serializer_json_unserialize, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Storage_Serializer_Json, getDecode, arginfo_phalcon_storage_serializer_json_getdecode, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Storage_Serializer_Json, getEncode, arginfo_phalcon_storage_serializer_json_getencode, ZEND_ACC_PRIVATE) PHP_FE_END }; diff --git a/ext/phalcon/storage/serializer/php.zep.c b/ext/phalcon/storage/serializer/php.zep.c index f785305d33..180df33a07 100644 --- a/ext/phalcon/storage/serializer/php.zep.c +++ b/ext/phalcon/storage/serializer/php.zep.c @@ -109,33 +109,33 @@ PHP_METHOD(Phalcon_Storage_Serializer_Php, unserialize) zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); RETURN_MM_NULL(); } - ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 123); + ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 129); 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, 124, &version, &_1, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "version_compare", NULL, 130, &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, 125, &_4$$4, &_5$$4); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 131, &_4$$4, &_5$$4); zephir_check_call_status(); } 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, 125, &_6$$5, &_7$$5); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 131, &_6$$5, &_7$$5); 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, 126); + ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 132); zephir_check_call_status(); _8 = ZEPHIR_GLOBAL(warning).enable; if (!(_8)) { diff --git a/ext/phalcon/support/collection.zep.c b/ext/phalcon/support/collection.zep.c index 7721fa60b9..7ee474cc15 100644 --- a/ext/phalcon/support/collection.zep.c +++ b/ext/phalcon/support/collection.zep.c @@ -362,7 +362,7 @@ PHP_METHOD(Phalcon_Support_Collection, get) } if (UNEXPECTED(zephir_is_true(&cast))) { ZEPHIR_MAKE_REF(&value); - ZEPHIR_CALL_FUNCTION(NULL, "settype", NULL, 12, &value, &cast); + ZEPHIR_CALL_FUNCTION(NULL, "settype", NULL, 11, &value, &cast); ZEPHIR_UNREF(&value); zephir_check_call_status(); } diff --git a/ext/phalcon/support/debug.zep.c b/ext/phalcon/support/debug.zep.c index 134cad9a21..992a971afd 100644 --- a/ext/phalcon/support/debug.zep.c +++ b/ext/phalcon/support/debug.zep.c @@ -362,7 +362,7 @@ 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, 125, &_0); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 131, &_0); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); zephir_create_array(&_2, 2, 0); @@ -1582,7 +1582,7 @@ 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, 144, &className); + ZEPHIR_CALL_METHOD(NULL, &classReflection, "__construct", NULL, 150, &className); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_11$$5, &classReflection, "isinternal", NULL, 0); zephir_check_call_status(); @@ -1615,7 +1615,7 @@ 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, 141, &functionName); + ZEPHIR_CALL_METHOD(NULL, &functionReflection, "__construct", NULL, 147, &functionName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_17$$10, &functionReflection, "isinternal", NULL, 0); zephir_check_call_status(); diff --git a/ext/phalcon/support/debug/dump.zep.c b/ext/phalcon/support/debug/dump.zep.c index fc6369f279..961270d22f 100644 --- a/ext/phalcon/support/debug/dump.zep.c +++ b/ext/phalcon/support/debug/dump.zep.c @@ -12,9 +12,9 @@ #include #include "kernel/main.h" +#include "kernel/memory.h" #include "kernel/fcall.h" #include "kernel/object.h" -#include "kernel/memory.h" #include "ext/spl/spl_exceptions.h" #include "kernel/exception.h" #include "kernel/operators.h" @@ -65,6 +65,10 @@ ZEPHIR_INIT_CLASS(Phalcon_Support_Debug_Dump) * @var array */ zend_declare_property_null(phalcon_support_debug_dump_ce, SL("styles"), ZEND_ACC_PROTECTED); + /** + * @var Encode + */ + zend_declare_property_null(phalcon_support_debug_dump_ce, SL("encode"), ZEND_ACC_PRIVATE); phalcon_support_debug_dump_ce->create_object = zephir_init_properties_Phalcon_Support_Debug_Dump; return SUCCESS; @@ -78,13 +82,14 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, __construct) zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zend_bool detailed; - zval *styles_param = NULL, *detailed_param = NULL, __$true, __$false; + zval *styles_param = NULL, *detailed_param = NULL, __$true, __$false, _0; zval styles; zval *this_ptr = getThis(); ZVAL_UNDEF(&styles); ZVAL_BOOL(&__$true, 1); ZVAL_BOOL(&__$false, 0); + ZVAL_UNDEF(&_0); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 2) @@ -110,6 +115,14 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, __construct) } + ZEPHIR_INIT_VAR(&_0); + object_init_ex(&_0, phalcon_support_helper_json_encode_ce); + if (zephir_has_constructor(&_0)) { + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 0); + zephir_check_call_status(); + } + + zephir_update_property_zval(this_ptr, ZEND_STRL("encode"), &_0); ZEPHIR_CALL_METHOD(NULL, this_ptr, "setstyles", NULL, 0, &styles); zephir_check_call_status(); if (detailed) { @@ -294,11 +307,12 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, toJson) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *variable, variable_sub, _0; + zval *variable, variable_sub, _0, _1; zval *this_ptr = getThis(); ZVAL_UNDEF(&variable_sub); ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -311,8 +325,9 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, toJson) zephir_fetch_params(1, 1, 0, &variable); - ZVAL_LONG(&_0, ((128 | 64) | 256)); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "encode", NULL, 0, variable, &_0); + zephir_read_property(&_0, this_ptr, ZEND_STRL("encode"), PH_NOISY_CC | PH_READONLY); + ZVAL_LONG(&_1, ((128 | 64) | 256)); + ZEPHIR_RETURN_CALL_METHOD(&_0, "__invoke", NULL, 0, variable, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -413,7 +428,7 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, variables) ZEPHIR_INIT_VAR(&output); ZEPHIR_INIT_VAR(&_0); zephir_get_args(&_0); - zephir_is_iterable(&_0, 0, "phalcon/Support/Debug/Dump.zep", 191); + zephir_is_iterable(&_0, 0, "phalcon/Support/Debug/Dump.zep", 198); if (Z_TYPE_P(&_0) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_0), _3, _4, _1) { @@ -716,7 +731,7 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, output) ZEPHIR_CALL_FUNCTION(&_2$$4, "strtr", NULL, 5, &_3$$4, &_1$$4); zephir_check_call_status(); zephir_concat_self(&output, &_2$$4); - zephir_is_iterable(variable, 0, "phalcon/Support/Debug/Dump.zep", 241); + zephir_is_iterable(variable, 0, "phalcon/Support/Debug/Dump.zep", 248); if (Z_TYPE_P(variable) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(variable), _6$$4, _7$$4, _4$$4) { @@ -887,7 +902,7 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, output) } else if (_42$$9) { ZEPHIR_CALL_FUNCTION(&_46$$12, "get_object_vars", NULL, 423, variable); zephir_check_call_status(); - zephir_is_iterable(&_46$$12, 0, "phalcon/Support/Debug/Dump.zep", 273); + zephir_is_iterable(&_46$$12, 0, "phalcon/Support/Debug/Dump.zep", 280); if (Z_TYPE_P(&_46$$12) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_46$$12), _49$$12, _50$$12, _47$$12) { @@ -976,12 +991,12 @@ 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, 144, variable); + ZEPHIR_CALL_METHOD(NULL, &reflect$$15, "__construct", NULL, 150, variable); zephir_check_call_status(); ZVAL_LONG(&_67$$15, ((1 | 2) | 4)); - ZEPHIR_CALL_METHOD(&props$$15, &reflect$$15, "getproperties", NULL, 155, &_67$$15); + ZEPHIR_CALL_METHOD(&props$$15, &reflect$$15, "getproperties", NULL, 161, &_67$$15); zephir_check_call_status(); - zephir_is_iterable(&props$$15, 0, "phalcon/Support/Debug/Dump.zep", 299); + zephir_is_iterable(&props$$15, 0, "phalcon/Support/Debug/Dump.zep", 306); if (Z_TYPE_P(&props$$15) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&props$$15), _68$$15) { @@ -1121,7 +1136,7 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, output) ZEPHIR_CONCAT_VS(&_110$$18, &_109$$18, "[already listed]\n"); zephir_concat_self(&output, &_110$$18); } else { - zephir_is_iterable(&attr, 0, "phalcon/Support/Debug/Dump.zep", 317); + zephir_is_iterable(&attr, 0, "phalcon/Support/Debug/Dump.zep", 324); if (Z_TYPE_P(&attr) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attr), _111$$19) { @@ -1257,7 +1272,7 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, output) ZEPHIR_CONCAT_VV(return_value, &output, &_145$$26); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_147, "is_float", NULL, 207, variable); + ZEPHIR_CALL_FUNCTION(&_147, "is_float", NULL, 210, variable); zephir_check_call_status(); if (zephir_is_true(&_147)) { ZEPHIR_INIT_VAR(&_148$$27); @@ -1371,71 +1386,6 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, output) RETURN_MM(); } -/** - * @todo This will be removed when traits are introduced - */ -PHP_METHOD(Phalcon_Support_Debug_Dump, 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, 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, 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(&_3$$3, "phalcon/Support/Debug/Dump.zep", 366); - ZEPHIR_MM_RESTORE(); - return; - } - RETURN_CCTOR(&encoded); -} - zend_object *zephir_init_properties_Phalcon_Support_Debug_Dump(zend_class_entry *class_type) { zval _0, _2, _1$$3, _3$$4; diff --git a/ext/phalcon/support/debug/dump.zep.h b/ext/phalcon/support/debug/dump.zep.h index 10f0753e7b..75dd21c59f 100644 --- a/ext/phalcon/support/debug/dump.zep.h +++ b/ext/phalcon/support/debug/dump.zep.h @@ -14,7 +14,6 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, variable); PHP_METHOD(Phalcon_Support_Debug_Dump, variables); PHP_METHOD(Phalcon_Support_Debug_Dump, getStyle); PHP_METHOD(Phalcon_Support_Debug_Dump, output); -PHP_METHOD(Phalcon_Support_Debug_Dump, encode); zend_object *zephir_init_properties_Phalcon_Support_Debug_Dump(zend_class_entry *class_type); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_support_debug_dump___construct, 0, 0, 0) @@ -72,12 +71,6 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_debug_dump_outpu ZEND_ARG_TYPE_INFO(0, tab, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_debug_dump_encode, 0, 1, IS_STRING, 0) - ZEND_ARG_INFO(0, data) - ZEND_ARG_TYPE_INFO(0, options, IS_LONG, 0) - ZEND_ARG_TYPE_INFO(0, depth, IS_LONG, 0) -ZEND_END_ARG_INFO() - ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_support_debug_dump_zephir_init_properties_phalcon_support_debug_dump, 0, 0, 0) ZEND_END_ARG_INFO() @@ -93,6 +86,5 @@ ZEPHIR_INIT_FUNCS(phalcon_support_debug_dump_method_entry) { PHP_ME(Phalcon_Support_Debug_Dump, variables, arginfo_phalcon_support_debug_dump_variables, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Support_Debug_Dump, getStyle, arginfo_phalcon_support_debug_dump_getstyle, ZEND_ACC_PROTECTED) PHP_ME(Phalcon_Support_Debug_Dump, output, arginfo_phalcon_support_debug_dump_output, ZEND_ACC_PROTECTED) - PHP_ME(Phalcon_Support_Debug_Dump, encode, arginfo_phalcon_support_debug_dump_encode, ZEND_ACC_PRIVATE) PHP_FE_END }; diff --git a/ext/phalcon/support/helper/arr/get.zep.c b/ext/phalcon/support/helper/arr/get.zep.c index 425fa70458..ad49f39219 100644 --- a/ext/phalcon/support/helper/arr/get.zep.c +++ b/ext/phalcon/support/helper/arr/get.zep.c @@ -95,7 +95,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_Get, __invoke) } if (!(ZEPHIR_IS_EMPTY(&cast))) { ZEPHIR_MAKE_REF(&value); - ZEPHIR_CALL_FUNCTION(NULL, "settype", NULL, 12, &value, &cast); + ZEPHIR_CALL_FUNCTION(NULL, "settype", NULL, 11, &value, &cast); ZEPHIR_UNREF(&value); zephir_check_call_status(); } diff --git a/ext/phalcon/support/helper/arr/group.zep.c b/ext/phalcon/support/helper/arr/group.zep.c index 72a1849069..91b6838003 100644 --- a/ext/phalcon/support/helper/arr/group.zep.c +++ b/ext/phalcon/support/helper/arr/group.zep.c @@ -193,7 +193,7 @@ 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, 178, method, element); + ZEPHIR_CALL_FUNCTION(&key, "call_user_func", NULL, 184, method, element); zephir_check_call_status(); zephir_array_update_multi(&output, element, SL("za"), 2, &key); } diff --git a/ext/phalcon/support/helper/arr/isunique.zep.c b/ext/phalcon/support/helper/arr/isunique.zep.c index 2149493fb4..2ecd22335e 100644 --- a/ext/phalcon/support/helper/arr/isunique.zep.c +++ b/ext/phalcon/support/helper/arr/isunique.zep.c @@ -65,7 +65,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_IsUnique, __invoke) zephir_get_arrval(&collection, collection_param); - ZEPHIR_CALL_FUNCTION(&_0, "array_unique", NULL, 170, &collection); + ZEPHIR_CALL_FUNCTION(&_0, "array_unique", NULL, 176, &collection); zephir_check_call_status(); RETURN_MM_BOOL(zephir_fast_count_int(&collection) == zephir_fast_count_int(&_0)); } diff --git a/ext/phalcon/support/helper/arr/last.zep.c b/ext/phalcon/support/helper/arr/last.zep.c index ca1a934bbc..196ed067c4 100644 --- a/ext/phalcon/support/helper/arr/last.zep.c +++ b/ext/phalcon/support/helper/arr/last.zep.c @@ -77,7 +77,7 @@ 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, 318, &filtered); + ZEPHIR_RETURN_CALL_FUNCTION("end", NULL, 319, &filtered); ZEPHIR_UNREF(&filtered); zephir_check_call_status(); RETURN_MM(); diff --git a/ext/phalcon/support/helper/json/decode.zep.c b/ext/phalcon/support/helper/json/decode.zep.c index 1b152bf4ff..f242c71092 100644 --- a/ext/phalcon/support/helper/json/decode.zep.c +++ b/ext/phalcon/support/helper/json/decode.zep.c @@ -13,12 +13,11 @@ #include "kernel/main.h" #include "kernel/string.h" -#include "kernel/operators.h" #include "kernel/memory.h" +#include "kernel/operators.h" #include "kernel/fcall.h" #include "kernel/exception.h" #include "ext/spl/spl_exceptions.h" -#include "kernel/concat.h" #include "kernel/object.h" @@ -33,6 +32,15 @@ /** * Decodes a string using `json_decode` and throws an exception if the * JSON data cannot be decoded + * + * The following options are used if none specified for json_encode + * + * JSON_HEX_TAG, JSON_HEX_APOS, JSON_HEX_AMP, JSON_HEX_QUOT, + * JSON_UNESCAPED_SLASHES + * + * If JSON_THROW_ON_ERROR is defined in the options a JsonException will be + * thrown in the case of an error. Otherwise, any error will throw + * InvalidArgumentException */ ZEPHIR_INIT_CLASS(Phalcon_Support_Helper_Json_Decode) { @@ -57,19 +65,20 @@ PHP_METHOD(Phalcon_Support_Helper_Json_Decode, __invoke) zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long depth, options, ZEPHIR_LAST_CALL_STATUS; zend_bool associative; - zval *data_param = NULL, *associative_param = NULL, *depth_param = NULL, *options_param = NULL, decoded, _0, _1, _2, _3, _4$$3, _5$$3, _6$$3; + zval *data_param = NULL, *associative_param = NULL, *depth_param = NULL, *options_param = NULL, __$null, decoded, error, message, _0, _1, _2, _3$$3, _4$$3; zval data; zval *this_ptr = getThis(); ZVAL_UNDEF(&data); + ZVAL_NULL(&__$null); ZVAL_UNDEF(&decoded); + ZVAL_UNDEF(&error); + ZVAL_UNDEF(&message); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1); ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_3$$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, 4) @@ -96,29 +105,31 @@ PHP_METHOD(Phalcon_Support_Helper_Json_Decode, __invoke) depth = zephir_get_intval(depth_param); } if (!options_param) { - options = 0; + options = 79; } else { options = zephir_get_intval(options_param); } + ZEPHIR_INIT_VAR(&decoded); + zephir_json_encode(&decoded, &__$null, 0 ); ZVAL_BOOL(&_0, (associative ? 1 : 0)); ZVAL_LONG(&_1, depth); ZVAL_LONG(&_2, options); - ZEPHIR_INIT_VAR(&decoded); + ZEPHIR_INIT_NVAR(&decoded); zephir_json_decode(&decoded, &data, zephir_get_intval(&_0) ); - ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 187); + ZEPHIR_CALL_FUNCTION(&error, "json_last_error", NULL, 0); zephir_check_call_status(); - if (!ZEPHIR_IS_LONG_IDENTICAL(&_3, 0)) { + ZEPHIR_CALL_FUNCTION(&message, "json_last_error_msg", NULL, 0); + zephir_check_call_status(); + if (!ZEPHIR_IS_LONG_IDENTICAL(&error, 0)) { + ZEPHIR_INIT_VAR(&_3$$3); + zephir_json_encode(&_3$$3, &__$null, 0 ); ZEPHIR_INIT_VAR(&_4$$3); object_init_ex(&_4$$3, spl_ce_InvalidArgumentException); - 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, 189, &_6$$3); + ZEPHIR_CALL_METHOD(NULL, &_4$$3, "__construct", NULL, 196, &message, &error); zephir_check_call_status(); - zephir_throw_exception_debug(&_4$$3, "phalcon/Support/Helper/Json/Decode.zep", 45); + zephir_throw_exception_debug(&_4$$3, "phalcon/Support/Helper/Json/Decode.zep", 64); ZEPHIR_MM_RESTORE(); return; } diff --git a/ext/phalcon/support/helper/json/encode.zep.c b/ext/phalcon/support/helper/json/encode.zep.c index f910cdce33..297954ef95 100644 --- a/ext/phalcon/support/helper/json/encode.zep.c +++ b/ext/phalcon/support/helper/json/encode.zep.c @@ -17,6 +17,7 @@ #include "kernel/operators.h" #include "kernel/fcall.h" #include "kernel/exception.h" +#include "ext/spl/spl_exceptions.h" #include "kernel/object.h" @@ -35,7 +36,11 @@ * The following options are used if none specified for json_encode * * JSON_HEX_TAG, JSON_HEX_APOS, JSON_HEX_AMP, JSON_HEX_QUOT, - * JSON_UNESCAPED_SLASHES, JSON_THROW_ON_ERROR + * JSON_UNESCAPED_SLASHES + * + * If JSON_THROW_ON_ERROR is defined in the options a JsonException will be + * thrown in the case of an error. Otherwise, any error will throw + * InvalidArgumentException * * @see https://www.ietf.org/rfc/rfc4627.txt */ @@ -48,32 +53,32 @@ ZEPHIR_INIT_CLASS(Phalcon_Support_Helper_Json_Encode) /** * @param mixed $data JSON data to parse - * @param int $options Bitmask of JSON decode options. + * @param int $options Bitmask of JSON encode options. * @param int $depth Recursion depth. * * @return string * - * @throws JsonException if the JSON cannot be encoded. + * @throws InvalidArgumentException if the JSON cannot be encoded. * @link https://www.php.net/manual/en/function.json-encode.php */ PHP_METHOD(Phalcon_Support_Helper_Json_Encode, __invoke) { - zval _7; + zval _4; 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, _4$$3, _5$$3, _6$$3; + zval *data, data_sub, *options_param = NULL, *depth_param = NULL, __$null, encoded, error, message, _0, _1, _2$$3, _3$$3; zval *this_ptr = getThis(); ZVAL_UNDEF(&data_sub); + ZVAL_NULL(&__$null); ZVAL_UNDEF(&encoded); + ZVAL_UNDEF(&error); + ZVAL_UNDEF(&message); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_3); - ZVAL_UNDEF(&_4$$3); - ZVAL_UNDEF(&_5$$3); - ZVAL_UNDEF(&_6$$3); - ZVAL_UNDEF(&_7); + ZVAL_UNDEF(&_2$$3); + ZVAL_UNDEF(&_3$$3); + ZVAL_UNDEF(&_4); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 3) @@ -88,7 +93,7 @@ PHP_METHOD(Phalcon_Support_Helper_Json_Encode, __invoke) ZEPHIR_MM_GROW(); zephir_fetch_params(1, 1, 2, &data, &options_param, &depth_param); if (!options_param) { - options = 4194383; + options = 79; } else { options = zephir_get_intval(options_param); } @@ -99,29 +104,28 @@ PHP_METHOD(Phalcon_Support_Helper_Json_Encode, __invoke) } - ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, ""); ZEPHIR_INIT_VAR(&encoded); - zephir_json_encode(&encoded, &_0, 0 ); - ZVAL_LONG(&_1, options); - ZVAL_LONG(&_2, depth); + zephir_json_encode(&encoded, &__$null, 0 ); + ZVAL_LONG(&_0, options); + ZVAL_LONG(&_1, depth); ZEPHIR_INIT_NVAR(&encoded); - zephir_json_encode(&encoded, data, zephir_get_intval(&_1) ); - ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 187); + zephir_json_encode(&encoded, data, zephir_get_intval(&_0) ); + ZEPHIR_CALL_FUNCTION(&error, "json_last_error", NULL, 0); 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, 188); - zephir_check_call_status(); - ZVAL_LONG(&_6$$3, 5); - ZEPHIR_CALL_METHOD(NULL, &_4$$3, "__construct", NULL, 0, &_5$$3, &_6$$3); + ZEPHIR_CALL_FUNCTION(&message, "json_last_error_msg", NULL, 0); + zephir_check_call_status(); + if (!ZEPHIR_IS_LONG_IDENTICAL(&error, 0)) { + ZEPHIR_INIT_VAR(&_2$$3); + zephir_json_encode(&_2$$3, &__$null, 0 ); + ZEPHIR_INIT_VAR(&_3$$3); + object_init_ex(&_3$$3, spl_ce_InvalidArgumentException); + ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 196, &message, &error); zephir_check_call_status(); - zephir_throw_exception_debug(&_4$$3, "phalcon/Support/Helper/Json/Encode.zep", 56); + zephir_throw_exception_debug(&_3$$3, "phalcon/Support/Helper/Json/Encode.zep", 64); ZEPHIR_MM_RESTORE(); return; } - zephir_cast_to_string(&_7, &encoded); - RETURN_CTOR(&_7); + zephir_cast_to_string(&_4, &encoded); + RETURN_CTOR(&_4); } diff --git a/ext/phalcon/support/helper/str/abstractstr.zep.c b/ext/phalcon/support/helper/str/abstractstr.zep.c index b061a753aa..c72fd97ba4 100644 --- a/ext/phalcon/support/helper/str/abstractstr.zep.c +++ b/ext/phalcon/support/helper/str/abstractstr.zep.c @@ -261,7 +261,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_AbstractStr, toLower) ZVAL_LONG(&_0, 1); - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_case", NULL, 11, &text, &_0, &encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_case", NULL, 12, &text, &_0, &encoding); zephir_check_call_status(); RETURN_MM(); } @@ -369,7 +369,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_AbstractStr, toUpper) ZVAL_LONG(&_0, 0); - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_case", NULL, 11, &text, &_0, &encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_case", NULL, 12, &text, &_0, &encoding); 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 8a5779116f..e0446898ab 100644 --- a/ext/phalcon/support/helper/str/concat.zep.c +++ b/ext/phalcon/support/helper/str/concat.zep.c @@ -93,7 +93,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Concat, __invoke) ZEPHIR_UNREF(&arguments); zephir_check_call_status(); ZEPHIR_MAKE_REF(&arguments); - ZEPHIR_CALL_FUNCTION(&last, "end", NULL, 318, &arguments); + ZEPHIR_CALL_FUNCTION(&last, "end", NULL, 319, &arguments); ZEPHIR_UNREF(&arguments); zephir_check_call_status(); ZEPHIR_INIT_VAR(&prefix); diff --git a/ext/phalcon/support/helper/str/decapitalize.zep.c b/ext/phalcon/support/helper/str/decapitalize.zep.c index 21ae978f97..259e7f308f 100644 --- a/ext/phalcon/support/helper/str/decapitalize.zep.c +++ b/ext/phalcon/support/helper/str/decapitalize.zep.c @@ -91,7 +91,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Decapitalize, __invoke) ZVAL_LONG(&_0, 1); - ZEPHIR_CALL_FUNCTION(&substr, "mb_substr", NULL, 221, &text, &_0); + ZEPHIR_CALL_FUNCTION(&substr, "mb_substr", NULL, 224, &text, &_0); zephir_check_call_status(); if (upperRest) { ZEPHIR_CALL_METHOD(&suffix, this_ptr, "toupper", NULL, 0, &substr, &encoding); @@ -101,7 +101,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Decapitalize, __invoke) } ZVAL_LONG(&_0, 0); ZVAL_LONG(&_2, 1); - ZEPHIR_CALL_FUNCTION(&_3, "mb_substr", NULL, 221, &text, &_0, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "mb_substr", NULL, 224, &text, &_0, &_2); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_1, this_ptr, "tolower", NULL, 0, &_3, &encoding); zephir_check_call_status(); diff --git a/ext/phalcon/support/helper/str/dirfromfile.zep.c b/ext/phalcon/support/helper/str/dirfromfile.zep.c index 3375130598..4efae797bc 100644 --- a/ext/phalcon/support/helper/str/dirfromfile.zep.c +++ b/ext/phalcon/support/helper/str/dirfromfile.zep.c @@ -79,12 +79,12 @@ PHP_METHOD(Phalcon_Support_Helper_Str_DirFromFile, __invoke) zephir_check_call_status(); ZVAL_LONG(&_0, 0); ZVAL_LONG(&_1, -2); - ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 221, &name, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 224, &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, 221, &name, &_2$$3, &_3$$3); + ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 224, &name, &_2$$3, &_3$$3); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_4); diff --git a/ext/phalcon/support/helper/str/dynamic.zep.c b/ext/phalcon/support/helper/str/dynamic.zep.c index ea224736db..09807982a0 100644 --- a/ext/phalcon/support/helper/str/dynamic.zep.c +++ b/ext/phalcon/support/helper/str/dynamic.zep.c @@ -174,7 +174,7 @@ 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, 194, &words); + ZEPHIR_CALL_FUNCTION(&_10$$6, "array_rand", &_11, 198, &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); @@ -209,7 +209,7 @@ 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, 194, &words); + ZEPHIR_CALL_FUNCTION(&_19$$8, "array_rand", &_11, 198, &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); diff --git a/ext/phalcon/support/helper/str/friendly.zep.c b/ext/phalcon/support/helper/str/friendly.zep.c index 3bbc2341dd..458afb0361 100644 --- a/ext/phalcon/support/helper/str/friendly.zep.c +++ b/ext/phalcon/support/helper/str/friendly.zep.c @@ -241,7 +241,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Friendly, getMatrix) ZEPHIR_INIT_VAR(&matrix); - zephir_create_array(&matrix, 78, 0); + zephir_create_array(&matrix, 79, 0); add_assoc_stringl_ex(&matrix, SL("Š"), SL("S")); add_assoc_stringl_ex(&matrix, SL("š"), SL("s")); add_assoc_stringl_ex(&matrix, SL("Đ"), SL("Dj")); diff --git a/ext/phalcon/support/helper/str/len.zep.c b/ext/phalcon/support/helper/str/len.zep.c index 89c732ae85..bab81913b8 100644 --- a/ext/phalcon/support/helper/str/len.zep.c +++ b/ext/phalcon/support/helper/str/len.zep.c @@ -73,7 +73,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Len, __invoke) } - ZEPHIR_RETURN_CALL_FUNCTION("mb_strlen", NULL, 227, &text, &encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strlen", NULL, 230, &text, &encoding); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/support/helper/str/random.zep.c b/ext/phalcon/support/helper/str/random.zep.c index 80c8d6e29e..cf284ec55f 100644 --- a/ext/phalcon/support/helper/str/random.zep.c +++ b/ext/phalcon/support/helper/str/random.zep.c @@ -134,37 +134,37 @@ 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, 312, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&_5, "range", NULL, 313, &_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, 312, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&_6, "range", NULL, 313, &_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, 312, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_9, "range", NULL, 313, &_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, 312, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&_10, "range", NULL, 313, &_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, 312, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 313, &_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, 312, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 313, &_7, &_8); zephir_check_call_status(); zephir_array_update_long(&pools, 4, &_11, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); ZEPHIR_INIT_NVAR(&_2); @@ -174,21 +174,21 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Random, __invoke) 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, 312, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 313, &_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, 312, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_12, "range", NULL, 313, &_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, 312, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_13, "range", NULL, 313, &_2, &_3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_14, "array_merge", NULL, 328, &_11, &_12, &_13); + ZEPHIR_CALL_FUNCTION(&_14, "array_merge", NULL, 329, &_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); diff --git a/ext/phalcon/support/helper/str/ucwords.zep.c b/ext/phalcon/support/helper/str/ucwords.zep.c index 52a9033d8a..6fa5df7942 100644 --- a/ext/phalcon/support/helper/str/ucwords.zep.c +++ b/ext/phalcon/support/helper/str/ucwords.zep.c @@ -75,7 +75,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Ucwords, __invoke) ZVAL_LONG(&_0, 2); - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_case", NULL, 11, &text, &_0, &encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_case", NULL, 12, &text, &_0, &encoding); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/support/version.zep.c b/ext/phalcon/support/version.zep.c index 307eb7471e..d4d0157531 100644 --- a/ext/phalcon/support/version.zep.c +++ b/ext/phalcon/support/version.zep.c @@ -117,7 +117,7 @@ PHP_METHOD(Phalcon_Support_Version, getVersion) ZVAL_LONG(&_0, 2); zephir_array_fast_append(return_value, &_0); ZEPHIR_INIT_NVAR(&_0); - ZVAL_LONG(&_0, 2); + ZVAL_LONG(&_0, 3); zephir_array_fast_append(return_value, &_0); ZEPHIR_INIT_NVAR(&_0); ZVAL_LONG(&_0, 4); @@ -271,11 +271,11 @@ PHP_METHOD(Phalcon_Support_Version, getId) zephir_array_fetch_long(&specialNumber, &version, 4, PH_NOISY, "phalcon/Support/Version.zep", 164); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "%02s"); - ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 107, &_0, &medium); + ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 113, &_0, &medium); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "%02s"); - ZEPHIR_CALL_FUNCTION(&_2, "sprintf", NULL, 107, &_0, &minor); + ZEPHIR_CALL_FUNCTION(&_2, "sprintf", NULL, 113, &_0, &minor); zephir_check_call_status(); ZEPHIR_CONCAT_VVVVV(return_value, &major, &_1, &_2, &special, &specialNumber); RETURN_MM(); diff --git a/ext/phalcon/tag.zep.c b/ext/phalcon/tag.zep.c index ee88d899bf..a2227e43cd 100644 --- a/ext/phalcon/tag.zep.c +++ b/ext/phalcon/tag.zep.c @@ -960,7 +960,7 @@ 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, 291, &documentPrependTitle); + ZEPHIR_CALL_FUNCTION(&tmp$$5, "array_reverse", NULL, 292, &documentPrependTitle); zephir_check_call_status(); zephir_is_iterable(&tmp$$5, 0, "phalcon/Tag.zep", 443); if (Z_TYPE_P(&tmp$$5) == IS_ARRAY) { @@ -2588,7 +2588,7 @@ PHP_METHOD(Phalcon_Tag, setDI) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(container, zephir_get_internal_ce(SL("phalcon\\di\\diinterface"))) + Z_PARAM_OBJECT_OF_CLASS(container, phalcon_di_diinterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif @@ -3110,7 +3110,7 @@ PHP_METHOD(Phalcon_Tag, textArea) ZVAL_STRING(&_1, "", &_2, ""); diff --git a/ext/phalcon/tag/select.zep.c b/ext/phalcon/tag/select.zep.c index 1906a50862..ee43b9d3b2 100644 --- a/ext/phalcon/tag/select.zep.c +++ b/ext/phalcon/tag/select.zep.c @@ -292,7 +292,7 @@ PHP_METHOD(Phalcon_Tag_Select, optionsFromArray) } ZEPHIR_INIT_NVAR(&optionText); ZVAL_COPY(&optionText, _0); - ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_4, 281, &optionValue); + ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_4, 282, &optionValue); zephir_check_call_status(); if (Z_TYPE_P(&optionText) == IS_ARRAY) { ZEPHIR_INIT_NVAR(&_5$$4); @@ -345,7 +345,7 @@ PHP_METHOD(Phalcon_Tag_Select, optionsFromArray) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&optionText, &data, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_4, 281, &optionValue); + ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_4, 282, &optionValue); zephir_check_call_status(); if (Z_TYPE_P(&optionText) == IS_ARRAY) { ZEPHIR_INIT_NVAR(&_16$$12); @@ -434,7 +434,7 @@ PHP_METHOD(Phalcon_Tag_Select, optionsFromResultset) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(4, 4) - Z_PARAM_OBJECT_OF_CLASS(resultset, zephir_get_internal_ce(SL("phalcon\\mvc\\model\\resultsetinterface"))) + Z_PARAM_OBJECT_OF_CLASS(resultset, phalcon_mvc_model_resultsetinterface_ce) Z_PARAM_ZVAL(using) Z_PARAM_ZVAL(value) Z_PARAM_STR(closeOption) diff --git a/ext/phalcon/translate/adapter/abstractadapter.zep.c b/ext/phalcon/translate/adapter/abstractadapter.zep.c index 6ef46b1a4c..a4305798b7 100644 --- a/ext/phalcon/translate/adapter/abstractadapter.zep.c +++ b/ext/phalcon/translate/adapter/abstractadapter.zep.c @@ -72,7 +72,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_AbstractAdapter, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(interpolator, zephir_get_internal_ce(SL("phalcon\\translate\\interpolatorfactory"))) + Z_PARAM_OBJECT_OF_CLASS(interpolator, phalcon_translate_interpolatorfactory_ce) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/phalcon/translate/adapter/csv.zep.c b/ext/phalcon/translate/adapter/csv.zep.c index f94010be04..b325f8d87b 100644 --- a/ext/phalcon/translate/adapter/csv.zep.c +++ b/ext/phalcon/translate/adapter/csv.zep.c @@ -83,7 +83,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Csv, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(interpolator, zephir_get_internal_ce(SL("phalcon\\translate\\interpolatorfactory"))) + Z_PARAM_OBJECT_OF_CLASS(interpolator, phalcon_translate_interpolatorfactory_ce) Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); #endif @@ -403,7 +403,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Csv, phpFopen) zephir_get_strval(&mode, mode_param); - ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 130, &filename, &mode); + ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 136, &filename, &mode); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/translate/adapter/gettext.zep.c b/ext/phalcon/translate/adapter/gettext.zep.c index 110fc7b2ee..0dfc34ae75 100644 --- a/ext/phalcon/translate/adapter/gettext.zep.c +++ b/ext/phalcon/translate/adapter/gettext.zep.c @@ -106,7 +106,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(interpolator, zephir_get_internal_ce(SL("phalcon\\translate\\interpolatorfactory"))) + Z_PARAM_OBJECT_OF_CLASS(interpolator, phalcon_translate_interpolatorfactory_ce) Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/translate/adapter/nativearray.zep.c b/ext/phalcon/translate/adapter/nativearray.zep.c index 810514d131..0ae5ca81fc 100644 --- a/ext/phalcon/translate/adapter/nativearray.zep.c +++ b/ext/phalcon/translate/adapter/nativearray.zep.c @@ -87,7 +87,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_NativeArray, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_OBJECT_OF_CLASS(interpolator, zephir_get_internal_ce(SL("phalcon\\translate\\interpolatorfactory"))) + Z_PARAM_OBJECT_OF_CLASS(interpolator, phalcon_translate_interpolatorfactory_ce) Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); #endif diff --git a/ext/phalcon/translate/interpolator/indexedarray.zep.c b/ext/phalcon/translate/interpolator/indexedarray.zep.c index 51032b1eed..18eb35e2f6 100644 --- a/ext/phalcon/translate/interpolator/indexedarray.zep.c +++ b/ext/phalcon/translate/interpolator/indexedarray.zep.c @@ -92,7 +92,7 @@ PHP_METHOD(Phalcon_Translate_Interpolator_IndexedArray, replacePlaceholders) if (1 != ZEPHIR_IS_EMPTY(&placeholders)) { ZEPHIR_MAKE_REF(&placeholders); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 265, &placeholders, &translation); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 266, &placeholders, &translation); ZEPHIR_UNREF(&placeholders); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0$$3); diff --git a/ext/phalcon/translate/translatefactory.zep.c b/ext/phalcon/translate/translatefactory.zep.c index 2c8d6843ae..146e1987a4 100644 --- a/ext/phalcon/translate/translatefactory.zep.c +++ b/ext/phalcon/translate/translatefactory.zep.c @@ -66,7 +66,7 @@ PHP_METHOD(Phalcon_Translate_TranslateFactory, __construct) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_OBJECT_OF_CLASS(interpolator, zephir_get_internal_ce(SL("phalcon\\translate\\interpolatorfactory"))) + Z_PARAM_OBJECT_OF_CLASS(interpolator, phalcon_translate_interpolatorfactory_ce) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(services) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/php_phalcon.h b/ext/php_phalcon.h index eb8532d13b..c9f769c270 100644 --- a/ext/php_phalcon.h +++ b/ext/php_phalcon.h @@ -11,7 +11,7 @@ #include "kernel/globals.h" #define PHP_PHALCON_NAME "phalcon" -#define PHP_PHALCON_VERSION "5.2.2" +#define PHP_PHALCON_VERSION "5.2.3" #define PHP_PHALCON_EXTNAME "phalcon" #define PHP_PHALCON_AUTHOR "Phalcon Team and contributors" #define PHP_PHALCON_ZEPVERSION "0.17.0-9f99da6" From 5546a7fbd7ee0944bd8e0a1b5453d36b5553165b Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Wed, 26 Jul 2023 09:59:09 -0400 Subject: [PATCH 35/35] updating composer --- composer.lock | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/composer.lock b/composer.lock index 4f61810196..9d6337e150 100644 --- a/composer.lock +++ b/composer.lock @@ -1719,16 +1719,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.20.0", + "version": "v3.22.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "0e8249e0b15e2bc022fbbd1090ce29d071481e69" + "reference": "92b019f6c8d79aa26349d0db7671d37440dc0ff3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/0e8249e0b15e2bc022fbbd1090ce29d071481e69", - "reference": "0e8249e0b15e2bc022fbbd1090ce29d071481e69", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/92b019f6c8d79aa26349d0db7671d37440dc0ff3", + "reference": "92b019f6c8d79aa26349d0db7671d37440dc0ff3", "shasum": "" }, "require": { @@ -1752,6 +1752,7 @@ "symfony/stopwatch": "^5.4 || ^6.0" }, "require-dev": { + "facile-it/paraunit": "^1.3 || ^2.0", "justinrainbow/json-schema": "^5.2", "keradus/cli-executor": "^2.0", "mikey179/vfsstream": "^1.6.11", @@ -1803,7 +1804,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.20.0" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.22.0" }, "funding": [ { @@ -1811,7 +1812,7 @@ "type": "github" } ], - "time": "2023-06-27T20:22:39+00:00" + "time": "2023-07-16T23:08:06+00:00" }, { "name": "graham-campbell/result-type", @@ -3082,16 +3083,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.22.0", + "version": "1.23.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "ec58baf7b3c7f1c81b3b00617c953249fb8cf30c" + "reference": "a2b24135c35852b348894320d47b3902a94bc494" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/ec58baf7b3c7f1c81b3b00617c953249fb8cf30c", - "reference": "ec58baf7b3c7f1c81b3b00617c953249fb8cf30c", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/a2b24135c35852b348894320d47b3902a94bc494", + "reference": "a2b24135c35852b348894320d47b3902a94bc494", "shasum": "" }, "require": { @@ -3123,22 +3124,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.22.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.23.0" }, - "time": "2023-06-01T12:35:21+00:00" + "time": "2023-07-23T22:17:56+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.26", + "version": "9.2.27", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1" + "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/443bc6912c9bd5b409254a40f4b0f4ced7c80ea1", - "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/b0a88255cb70d52653d80c890bd7f38740ea50d1", + "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1", "shasum": "" }, "require": { @@ -3194,7 +3195,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.26" + "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.27" }, "funding": [ { @@ -3202,7 +3204,7 @@ "type": "github" } ], - "time": "2023-03-06T12:58:08+00:00" + "time": "2023-07-26T13:44:30+00:00" }, { "name": "phpunit/php-file-iterator", @@ -3447,16 +3449,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.9", + "version": "9.6.10", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a9aceaf20a682aeacf28d582654a1670d8826778" + "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a9aceaf20a682aeacf28d582654a1670d8826778", - "reference": "a9aceaf20a682aeacf28d582654a1670d8826778", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a6d351645c3fe5a30f5e86be6577d946af65a328", + "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328", "shasum": "" }, "require": { @@ -3530,7 +3532,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.9" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.10" }, "funding": [ { @@ -3546,7 +3548,7 @@ "type": "tidelift" } ], - "time": "2023-06-11T06:13:56+00:00" + "time": "2023-07-10T04:04:23+00:00" }, { "name": "predis/predis",