From 1c63f87084ccbc72ef28b4e646ac8245e9301ac2 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Sat, 6 Nov 2021 13:33:56 -0400 Subject: [PATCH 1/3] renamed support/collection/readonly to support/collection/readonlycollection and adjusted tests --- ext/phalcon/support/collection/readonly.zep.c | 96 ------------------- ext/phalcon/support/collection/readonly.zep.h | 24 ----- .../{ReadOnly.zep => ReadOnlyCollection.zep} | 4 +- .../ClearCest.php | 10 +- .../ConstructCest.php | 12 +-- .../CountCest.php | 10 +- .../GetCest.php | 16 ++-- .../GetIteratorCest.php | 10 +- .../GetKeysCest.php | 14 +-- .../GetValuesCest.php | 12 +-- .../HasCest.php | 24 ++--- .../InitCest.php | 10 +- .../JsonSerializeCest.php | 12 +-- .../RemoveCest.php | 10 +- .../SerializeCest.php | 10 +- .../SetCest.php | 16 ++-- .../ToArrayCest.php | 10 +- .../ToJsonCest.php | 10 +- .../UnserializeCest.php | 10 +- 19 files changed, 100 insertions(+), 220 deletions(-) delete mode 100644 ext/phalcon/support/collection/readonly.zep.c delete mode 100644 ext/phalcon/support/collection/readonly.zep.h rename phalcon/Support/Collection/{ReadOnly.zep => ReadOnlyCollection.zep} (86%) rename tests/unit/Support/Collection/{ReadOnly => ReadOnlyCollection}/ClearCest.php (73%) rename tests/unit/Support/Collection/{ReadOnly => ReadOnlyCollection}/ConstructCest.php (60%) rename tests/unit/Support/Collection/{ReadOnly => ReadOnlyCollection}/CountCest.php (72%) rename tests/unit/Support/Collection/{ReadOnly => ReadOnlyCollection}/GetCest.php (84%) rename tests/unit/Support/Collection/{ReadOnly => ReadOnlyCollection}/GetIteratorCest.php (70%) rename tests/unit/Support/Collection/{ReadOnly => ReadOnlyCollection}/GetKeysCest.php (72%) rename tests/unit/Support/Collection/{ReadOnly => ReadOnlyCollection}/GetValuesCest.php (65%) rename tests/unit/Support/Collection/{ReadOnly => ReadOnlyCollection}/HasCest.php (75%) rename tests/unit/Support/Collection/{ReadOnly => ReadOnlyCollection}/InitCest.php (74%) rename tests/unit/Support/Collection/{ReadOnly => ReadOnlyCollection}/JsonSerializeCest.php (76%) rename tests/unit/Support/Collection/{ReadOnly => ReadOnlyCollection}/RemoveCest.php (83%) rename tests/unit/Support/Collection/{ReadOnly => ReadOnlyCollection}/SerializeCest.php (70%) rename tests/unit/Support/Collection/{ReadOnly => ReadOnlyCollection}/SetCest.php (71%) rename tests/unit/Support/Collection/{ReadOnly => ReadOnlyCollection}/ToArrayCest.php (69%) rename tests/unit/Support/Collection/{ReadOnly => ReadOnlyCollection}/ToJsonCest.php (74%) rename tests/unit/Support/Collection/{ReadOnly => ReadOnlyCollection}/UnserializeCest.php (72%) diff --git a/ext/phalcon/support/collection/readonly.zep.c b/ext/phalcon/support/collection/readonly.zep.c deleted file mode 100644 index ad54cc847cd..00000000000 --- a/ext/phalcon/support/collection/readonly.zep.c +++ /dev/null @@ -1,96 +0,0 @@ - -#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/exception.h" -#include "kernel/operators.h" -#include "kernel/memory.h" -#include "kernel/object.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. -*/ -/** - * Phalcon\Support\Collection\ReadOnly is a read only Collection object - */ -ZEPHIR_INIT_CLASS(Phalcon_Support_Collection_ReadOnly) -{ - ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Support\\Collection, ReadOnly, phalcon, support_collection_readonly, phalcon_support_collection_ce, phalcon_support_collection_readonly_method_entry, 0); - - return SUCCESS; -} - -/** - * Delete the element from the collection - */ -PHP_METHOD(Phalcon_Support_Collection_ReadOnly, remove) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *element_param = NULL; - zval element; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&element); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR(element) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &element_param); - zephir_get_strval(&element, element_param); - - - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_support_collection_exception_ce, "The object is read only", "phalcon/Support/Collection/ReadOnly.zep", 25); - return; -} - -/** - * Set an element in the collection - */ -PHP_METHOD(Phalcon_Support_Collection_ReadOnly, set) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *element_param = NULL, *value, value_sub; - zval element; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&element); - ZVAL_UNDEF(&value_sub); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_STR(element) - Z_PARAM_ZVAL(value) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 2, 0, &element_param, &value); - zephir_get_strval(&element, element_param); - - - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_support_collection_exception_ce, "The object is read only", "phalcon/Support/Collection/ReadOnly.zep", 33); - return; -} - diff --git a/ext/phalcon/support/collection/readonly.zep.h b/ext/phalcon/support/collection/readonly.zep.h deleted file mode 100644 index bd7c0c4bd69..00000000000 --- a/ext/phalcon/support/collection/readonly.zep.h +++ /dev/null @@ -1,24 +0,0 @@ - -extern zend_class_entry *phalcon_support_collection_readonly_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Support_Collection_ReadOnly); - -PHP_METHOD(Phalcon_Support_Collection_ReadOnly, remove); -PHP_METHOD(Phalcon_Support_Collection_ReadOnly, set); - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_readonly_remove, 0, 1, IS_VOID, 0) - - ZEND_ARG_TYPE_INFO(0, element, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_readonly_set, 0, 2, IS_VOID, 0) - - ZEND_ARG_TYPE_INFO(0, element, IS_STRING, 0) - ZEND_ARG_INFO(0, value) -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_support_collection_readonly_method_entry) { - PHP_ME(Phalcon_Support_Collection_ReadOnly, remove, arginfo_phalcon_support_collection_readonly_remove, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Support_Collection_ReadOnly, set, arginfo_phalcon_support_collection_readonly_set, ZEND_ACC_PUBLIC) - PHP_FE_END -}; diff --git a/phalcon/Support/Collection/ReadOnly.zep b/phalcon/Support/Collection/ReadOnlyCollection.zep similarity index 86% rename from phalcon/Support/Collection/ReadOnly.zep rename to phalcon/Support/Collection/ReadOnlyCollection.zep index 82bcd53ad29..ad1b5ad3039 100644 --- a/phalcon/Support/Collection/ReadOnly.zep +++ b/phalcon/Support/Collection/ReadOnlyCollection.zep @@ -13,9 +13,9 @@ namespace Phalcon\Support\Collection; use Phalcon\Support\Collection; /** - * Phalcon\Support\Collection\ReadOnly is a read only Collection object + * A read only Collection object */ -class ReadOnly extends Collection +class ReadOnlyCollection extends Collection { /** * Delete the element from the collection diff --git a/tests/unit/Support/Collection/ReadOnly/ClearCest.php b/tests/unit/Support/Collection/ReadOnlyCollection/ClearCest.php similarity index 73% rename from tests/unit/Support/Collection/ReadOnly/ClearCest.php rename to tests/unit/Support/Collection/ReadOnlyCollection/ClearCest.php index 21e0488b343..8855a83cc78 100644 --- a/tests/unit/Support/Collection/ReadOnly/ClearCest.php +++ b/tests/unit/Support/Collection/ReadOnlyCollection/ClearCest.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace Phalcon\Tests\Unit\Support\Collection\ReadOnly; +namespace Phalcon\Tests\Unit\Support\Collection\ReadOnlyCollection; -use Phalcon\Support\Collection\ReadOnly; +use Phalcon\Support\Collection\ReadOnlyCollection; use UnitTester; class ClearCest { /** - * Tests Phalcon\Support\Collection\ReadOnly :: clear() + * Tests Phalcon\Support\Collection\ReadOnlyCollection :: clear() * * @param UnitTester $I * @@ -28,7 +28,7 @@ class ClearCest */ public function supportCollectionClear(UnitTester $I) { - $I->wantToTest('Support\Collection\ReadOnly - clear()'); + $I->wantToTest('Support\Collection\ReadOnlyCollection - clear()'); $data = [ 'one' => 'two', @@ -36,7 +36,7 @@ public function supportCollectionClear(UnitTester $I) 'five' => 'six', ]; - $collection = new ReadOnly($data); + $collection = new ReadOnlyCollection($data); $expected = $data; $actual = $collection->toArray(); diff --git a/tests/unit/Support/Collection/ReadOnly/ConstructCest.php b/tests/unit/Support/Collection/ReadOnlyCollection/ConstructCest.php similarity index 60% rename from tests/unit/Support/Collection/ReadOnly/ConstructCest.php rename to tests/unit/Support/Collection/ReadOnlyCollection/ConstructCest.php index 28395570e34..120ba01791e 100644 --- a/tests/unit/Support/Collection/ReadOnly/ConstructCest.php +++ b/tests/unit/Support/Collection/ReadOnlyCollection/ConstructCest.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace Phalcon\Tests\Unit\Support\Collection\ReadOnly; +namespace Phalcon\Tests\Unit\Support\Collection\ReadOnlyCollection; -use Phalcon\Support\Collection\ReadOnly; +use Phalcon\Support\Collection\ReadOnlyCollection; use UnitTester; class ConstructCest { /** - * Tests Phalcon\Support\Collection\ReadOnly :: __construct() + * Tests Phalcon\Support\Collection\ReadOnlyCollection :: __construct() * * @param UnitTester $I * @@ -28,10 +28,10 @@ class ConstructCest */ public function supportCollectionConstruct(UnitTester $I) { - $I->wantToTest('Support\Collection\ReadOnly - __construct()'); - $collection = new ReadOnly(); + $I->wantToTest('Support\Collection\ReadOnlyCollection - __construct()'); + $collection = new ReadOnlyCollection(); - $class = ReadOnly::class; + $class = ReadOnlyCollection::class; $I->assertInstanceOf($class, $collection); } } diff --git a/tests/unit/Support/Collection/ReadOnly/CountCest.php b/tests/unit/Support/Collection/ReadOnlyCollection/CountCest.php similarity index 72% rename from tests/unit/Support/Collection/ReadOnly/CountCest.php rename to tests/unit/Support/Collection/ReadOnlyCollection/CountCest.php index ab460866d9e..2d45d13830c 100644 --- a/tests/unit/Support/Collection/ReadOnly/CountCest.php +++ b/tests/unit/Support/Collection/ReadOnlyCollection/CountCest.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace Phalcon\Tests\Unit\Support\Collection\ReadOnly; +namespace Phalcon\Tests\Unit\Support\Collection\ReadOnlyCollectionCollection; -use Phalcon\Support\Collection\ReadOnly; +use Phalcon\Support\Collection\ReadOnlyCollection; use UnitTester; class CountCest { /** - * Tests Phalcon\Support\Collection\ReadOnly :: count() + * Tests Phalcon\Support\Collection\ReadOnlyCollection :: count() * * @param UnitTester $I * @@ -28,7 +28,7 @@ class CountCest */ public function supportCollectionCount(UnitTester $I) { - $I->wantToTest('Support\Collection\ReadOnly - count()'); + $I->wantToTest('Support\Collection\ReadOnlyCollection - count()'); $data = [ 'one' => 'two', @@ -36,7 +36,7 @@ public function supportCollectionCount(UnitTester $I) 'five' => 'six', ]; - $collection = new ReadOnly($data); + $collection = new ReadOnlyCollection($data); $expected = 3; $actual = $collection->toArray(); diff --git a/tests/unit/Support/Collection/ReadOnly/GetCest.php b/tests/unit/Support/Collection/ReadOnlyCollection/GetCest.php similarity index 84% rename from tests/unit/Support/Collection/ReadOnly/GetCest.php rename to tests/unit/Support/Collection/ReadOnlyCollection/GetCest.php index ae7601a947f..70dae0e73bc 100644 --- a/tests/unit/Support/Collection/ReadOnly/GetCest.php +++ b/tests/unit/Support/Collection/ReadOnlyCollection/GetCest.php @@ -11,17 +11,17 @@ declare(strict_types=1); -namespace Phalcon\Tests\Unit\Support\Collection\ReadOnly; +namespace Phalcon\Tests\Unit\Support\Collection\ReadOnlyCollectionCollection; use Codeception\Example; -use Phalcon\Support\Collection\ReadOnly; +use Phalcon\Support\Collection\ReadOnlyCollection; use stdClass; use UnitTester; class GetCest { /** - * Tests Phalcon\Support\Collection\ReadOnly :: get() + * Tests Phalcon\Support\Collection\ReadOnlyCollection :: get() * * @param UnitTester $I * @@ -30,7 +30,7 @@ class GetCest */ public function supportCollectionGet(UnitTester $I) { - $I->wantToTest('Support\Collection\ReadOnly - get()'); + $I->wantToTest('Support\Collection\ReadOnlyCollection - get()'); $data = [ 'one' => 'two', @@ -38,7 +38,7 @@ public function supportCollectionGet(UnitTester $I) 'five' => 'six', ]; - $collection = new ReadOnly($data); + $collection = new ReadOnlyCollection($data); $expected = 'four'; $actual = $collection->get('three'); @@ -47,7 +47,7 @@ public function supportCollectionGet(UnitTester $I) $actual = $collection->get('THREE'); $I->assertEquals($expected, $actual); - $actual = $collection->get('unknown', 'four'); + $actual = $collection->get(uniqid(), 'four'); $I->assertEquals($expected, $actual); $actual = $collection['three']; @@ -70,9 +70,9 @@ public function supportCollectionGet(UnitTester $I) */ public function helperArrGetCast(UnitTester $I, Example $example) { - $I->wantToTest('Support\Collection\ReadOnly - get() - cast ' . $example[0]); + $I->wantToTest('Support\Collection\ReadOnlyCollection - get() - cast ' . $example[0]); - $collection = new ReadOnly( + $collection = new ReadOnlyCollection( [ 'value' => $example[1], ] diff --git a/tests/unit/Support/Collection/ReadOnly/GetIteratorCest.php b/tests/unit/Support/Collection/ReadOnlyCollection/GetIteratorCest.php similarity index 70% rename from tests/unit/Support/Collection/ReadOnly/GetIteratorCest.php rename to tests/unit/Support/Collection/ReadOnlyCollection/GetIteratorCest.php index b8aa33d552b..260b38ed0ba 100644 --- a/tests/unit/Support/Collection/ReadOnly/GetIteratorCest.php +++ b/tests/unit/Support/Collection/ReadOnlyCollection/GetIteratorCest.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace Phalcon\Tests\Unit\Support\Collection\ReadOnly; +namespace Phalcon\Tests\Unit\Support\Collection\ReadOnlyCollectionCollection; -use Phalcon\Support\Collection\ReadOnly; +use Phalcon\Support\Collection\ReadOnlyCollection; use UnitTester; class GetIteratorCest { /** - * Tests Phalcon\Support\Collection\ReadOnly :: getIterator() + * Tests Phalcon\Support\Collection\ReadOnlyCollection :: getIterator() * * @param UnitTester $I * @@ -28,7 +28,7 @@ class GetIteratorCest */ public function supportCollectionGetIterator(UnitTester $I) { - $I->wantToTest('Support\Collection\ReadOnly - getIterator()'); + $I->wantToTest('Support\Collection\ReadOnlyCollection - getIterator()'); $data = [ 'one' => 'two', @@ -36,7 +36,7 @@ public function supportCollectionGetIterator(UnitTester $I) 'five' => 'six', ]; - $collection = new ReadOnly($data); + $collection = new ReadOnlyCollection($data); foreach ($collection as $key => $value) { $expected = $data[$key]; diff --git a/tests/unit/Support/Collection/ReadOnly/GetKeysCest.php b/tests/unit/Support/Collection/ReadOnlyCollection/GetKeysCest.php similarity index 72% rename from tests/unit/Support/Collection/ReadOnly/GetKeysCest.php rename to tests/unit/Support/Collection/ReadOnlyCollection/GetKeysCest.php index f5a77419cd8..5a0a9e346c0 100644 --- a/tests/unit/Support/Collection/ReadOnly/GetKeysCest.php +++ b/tests/unit/Support/Collection/ReadOnlyCollection/GetKeysCest.php @@ -11,24 +11,24 @@ declare(strict_types=1); -namespace Phalcon\Tests\Unit\Support\Collection\ReadOnly; +namespace Phalcon\Tests\Unit\Support\Collection\ReadOnlyCollection; -use Phalcon\Support\Collection\ReadOnly; +use Phalcon\Support\Collection\ReadOnlyCollection; use UnitTester; class GetKeysCest { /** - * Tests Phalcon\Support\Collection\ReadOnly :: get() + * Tests Phalcon\Support\Collection\ReadOnlyCollection :: get() * * @param UnitTester $I * * @author Phalcon Team * @since 2020-09-09 */ - public function supportCollectionReadOnlyGetKeys(UnitTester $I) + public function supportCollectionReadOnlyCollectionGetKeys(UnitTester $I) { - $I->wantToTest('Support\Collection\ReadOnly - getKeys()'); + $I->wantToTest('Support\Collection\ReadOnlyCollection - getKeys()'); $keys = [ 'one', @@ -42,7 +42,7 @@ public function supportCollectionReadOnlyGetKeys(UnitTester $I) 'five' => 'six', ]; - $collection = new ReadOnly($data); + $collection = new ReadOnlyCollection($data); $expected = $keys; $actual = $collection->getKeys(); @@ -54,7 +54,7 @@ public function supportCollectionReadOnlyGetKeys(UnitTester $I) 'five' => 'six', ]; - $collection = new ReadOnly($data); + $collection = new ReadOnlyCollection($data); $expected = $keys; $actual = $collection->getKeys(); $I->assertEquals($expected, $actual); diff --git a/tests/unit/Support/Collection/ReadOnly/GetValuesCest.php b/tests/unit/Support/Collection/ReadOnlyCollection/GetValuesCest.php similarity index 65% rename from tests/unit/Support/Collection/ReadOnly/GetValuesCest.php rename to tests/unit/Support/Collection/ReadOnlyCollection/GetValuesCest.php index bdbe83d1eb6..ff6b0d0a8e4 100644 --- a/tests/unit/Support/Collection/ReadOnly/GetValuesCest.php +++ b/tests/unit/Support/Collection/ReadOnlyCollection/GetValuesCest.php @@ -11,24 +11,24 @@ declare(strict_types=1); -namespace Phalcon\Tests\Unit\Support\Collection\ReadOnly; +namespace Phalcon\Tests\Unit\Support\Collection\ReadOnlyCollection; -use Phalcon\Support\Collection\ReadOnly; +use Phalcon\Support\Collection\ReadOnlyCollection; use UnitTester; class GetValuesCest { /** - * Tests Phalcon\Support\Collection\ReadOnly :: get() + * Tests Phalcon\Support\Collection\ReadOnlyCollection :: get() * * @param UnitTester $I * * @author Phalcon Team * @since 2020-09-09 */ - public function supportCollectionReadOnlyGetValues(UnitTester $I) + public function supportCollectionReadOnlyCollectionGetValues(UnitTester $I) { - $I->wantToTest('Support\Collection\ReadOnly - getValues()'); + $I->wantToTest('Support\Collection\ReadOnlyCollection - getValues()'); $data = [ 'one' => 'two', @@ -36,7 +36,7 @@ public function supportCollectionReadOnlyGetValues(UnitTester $I) 'five' => 'six', ]; - $collection = new ReadOnly($data); + $collection = new ReadOnlyCollection($data); $expected = [ 'two', diff --git a/tests/unit/Support/Collection/ReadOnly/HasCest.php b/tests/unit/Support/Collection/ReadOnlyCollection/HasCest.php similarity index 75% rename from tests/unit/Support/Collection/ReadOnly/HasCest.php rename to tests/unit/Support/Collection/ReadOnlyCollection/HasCest.php index 4812ffff743..ed06b0bfd85 100644 --- a/tests/unit/Support/Collection/ReadOnly/HasCest.php +++ b/tests/unit/Support/Collection/ReadOnlyCollection/HasCest.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace Phalcon\Tests\Unit\Support\Collection\ReadOnly; +namespace Phalcon\Tests\Unit\Support\Collection\ReadOnlyCollection; -use Phalcon\Support\Collection\ReadOnly; +use Phalcon\Support\Collection\ReadOnlyCollection; use UnitTester; class HasCest { /** - * Tests Phalcon\Support\Collection\ReadOnly :: has() + * Tests Phalcon\Support\Collection\ReadOnlyCollection :: has() * * @param UnitTester $I * @@ -36,7 +36,7 @@ public function supportCollectionHas(UnitTester $I) 'five' => 'six', ]; - $collection = new ReadOnly($data); + $collection = new ReadOnlyCollection($data); $actual = $collection->has('three'); $I->assertTrue($actual); @@ -44,7 +44,7 @@ public function supportCollectionHas(UnitTester $I) $actual = $collection->has('THREE'); $I->assertTrue($actual); - $actual = $collection->has('unknown'); + $actual = $collection->has(uniqid()); $I->assertFalse($actual); $actual = $collection->__isset('three'); @@ -53,18 +53,18 @@ public function supportCollectionHas(UnitTester $I) $actual = isset($collection['three']); $I->assertTrue($actual); - $actual = isset($collection['unknown']); + $actual = isset($collection[uniqid()]); $I->assertFalse($actual); $actual = $collection->offsetExists('three'); $I->assertTrue($actual); - $actual = $collection->offsetExists('unknown'); + $actual = $collection->offsetExists(uniqid()); $I->assertFalse($actual); } /** - * Tests Phalcon\Support\Collection\ReadOnly :: has() - sensitive + * Tests Phalcon\Support\Collection\ReadOnlyCollection :: has() - sensitive * * @author Phalcon Team * @since 2020-09-09 @@ -79,7 +79,7 @@ public function supportCollectionHasSensitive(UnitTester $I) 'five' => 'six', ]; - $collection = new ReadOnly($data, false); + $collection = new ReadOnlyCollection($data, false); $actual = $collection->has('three'); $I->assertTrue($actual); @@ -87,7 +87,7 @@ public function supportCollectionHasSensitive(UnitTester $I) $actual = $collection->has('THREE'); $I->assertFalse($actual); - $actual = $collection->has('unknown'); + $actual = $collection->has(uniqid()); $I->assertFalse($actual); $actual = $collection->__isset('three'); @@ -96,13 +96,13 @@ public function supportCollectionHasSensitive(UnitTester $I) $actual = isset($collection['three']); $I->assertTrue($actual); - $actual = isset($collection['unknown']); + $actual = isset($collection[uniqid()]); $I->assertFalse($actual); $actual = $collection->offsetExists('three'); $I->assertTrue($actual); - $actual = $collection->offsetExists('unknown'); + $actual = $collection->offsetExists(uniqid()); $I->assertFalse($actual); } } diff --git a/tests/unit/Support/Collection/ReadOnly/InitCest.php b/tests/unit/Support/Collection/ReadOnlyCollection/InitCest.php similarity index 74% rename from tests/unit/Support/Collection/ReadOnly/InitCest.php rename to tests/unit/Support/Collection/ReadOnlyCollection/InitCest.php index 247719e42e0..f869e8aa465 100644 --- a/tests/unit/Support/Collection/ReadOnly/InitCest.php +++ b/tests/unit/Support/Collection/ReadOnlyCollection/InitCest.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace Phalcon\Tests\Unit\Support\Collection\ReadOnly; +namespace Phalcon\Tests\Unit\Support\Collection\ReadOnlyCollection; -use Phalcon\Support\Collection\ReadOnly; +use Phalcon\Support\Collection\ReadOnlyCollection; use UnitTester; class InitCest { /** - * Tests Phalcon\Support\Collection\ReadOnly :: init() + * Tests Phalcon\Support\Collection\ReadOnlyCollection :: init() * * @param UnitTester $I * @@ -28,7 +28,7 @@ class InitCest */ public function supportCollectionInit(UnitTester $I) { - $I->wantToTest('Support\Collection\ReadOnly - init()'); + $I->wantToTest('Support\Collection\ReadOnlyCollection - init()'); $data = [ 'one' => 'two', @@ -36,7 +36,7 @@ public function supportCollectionInit(UnitTester $I) 'five' => 'six', ]; - $collection = new ReadOnly(); + $collection = new ReadOnlyCollection(); $expected = 0; $actual = $collection->count(); diff --git a/tests/unit/Support/Collection/ReadOnly/JsonSerializeCest.php b/tests/unit/Support/Collection/ReadOnlyCollection/JsonSerializeCest.php similarity index 76% rename from tests/unit/Support/Collection/ReadOnly/JsonSerializeCest.php rename to tests/unit/Support/Collection/ReadOnlyCollection/JsonSerializeCest.php index d9faa9ac3b2..10ceb394d51 100644 --- a/tests/unit/Support/Collection/ReadOnly/JsonSerializeCest.php +++ b/tests/unit/Support/Collection/ReadOnlyCollection/JsonSerializeCest.php @@ -11,16 +11,16 @@ declare(strict_types=1); -namespace Phalcon\Tests\Unit\Support\Collection\ReadOnly; +namespace Phalcon\Tests\Unit\Support\Collection\ReadOnlyCollection; -use Phalcon\Support\Collection\ReadOnly; +use Phalcon\Support\Collection\ReadOnlyCollection; use Phalcon\Tests\Fixtures\JsonFixture; use UnitTester; class JsonSerializeCest { /** - * Tests Phalcon\Support\Collection\ReadOnly :: jsonSerialize() + * Tests Phalcon\Support\Collection\ReadOnlyCollection :: jsonSerialize() * * @param UnitTester $I * @@ -29,7 +29,7 @@ class JsonSerializeCest */ public function supportCollectionJsonSerialize(UnitTester $I) { - $I->wantToTest('Support\Collection\ReadOnly - jsonSerialize()'); + $I->wantToTest('Support\Collection\ReadOnlyCollection - jsonSerialize()'); $data = [ 'one' => 'two', @@ -37,7 +37,7 @@ public function supportCollectionJsonSerialize(UnitTester $I) 'five' => 'six', ]; - $collection = new ReadOnly($data); + $collection = new ReadOnlyCollection($data); $expected = $data; $actual = $collection->jsonSerialize(); @@ -59,7 +59,7 @@ public function supportCollectionJsonSerialize(UnitTester $I) ], ]; - $collection = new ReadOnly($data); + $collection = new ReadOnlyCollection($data); $actual = $collection->jsonSerialize(); $I->assertEquals($expected, $actual); diff --git a/tests/unit/Support/Collection/ReadOnly/RemoveCest.php b/tests/unit/Support/Collection/ReadOnlyCollection/RemoveCest.php similarity index 83% rename from tests/unit/Support/Collection/ReadOnly/RemoveCest.php rename to tests/unit/Support/Collection/ReadOnlyCollection/RemoveCest.php index a6bcc4f5391..4a0e825e111 100644 --- a/tests/unit/Support/Collection/ReadOnly/RemoveCest.php +++ b/tests/unit/Support/Collection/ReadOnlyCollection/RemoveCest.php @@ -11,16 +11,16 @@ declare(strict_types=1); -namespace Phalcon\Tests\Unit\Support\Collection\ReadOnly; +namespace Phalcon\Tests\Unit\Support\Collection\ReadOnlyCollection; use Phalcon\Support\Collection\Exception; -use Phalcon\Support\Collection\ReadOnly; +use Phalcon\Support\Collection\ReadOnlyCollection; use UnitTester; class RemoveCest { /** - * Tests Phalcon\Support\Collection\ReadOnly :: remove() + * Tests Phalcon\Support\Collection\ReadOnlyCollection :: remove() * * @param UnitTester $I * @@ -29,14 +29,14 @@ class RemoveCest */ public function supportCollectionRemove(UnitTester $I) { - $I->wantToTest('Support\Collection\ReadOnly - remove()'); + $I->wantToTest('Support\Collection\ReadOnlyCollection - remove()'); $data = [ 'one' => 'two', 'three' => 'four', 'five' => 'six', ]; - $collection = new ReadOnly($data); + $collection = new ReadOnlyCollection($data); $I->expectThrowable( new Exception('The object is read only'), diff --git a/tests/unit/Support/Collection/ReadOnly/SerializeCest.php b/tests/unit/Support/Collection/ReadOnlyCollection/SerializeCest.php similarity index 70% rename from tests/unit/Support/Collection/ReadOnly/SerializeCest.php rename to tests/unit/Support/Collection/ReadOnlyCollection/SerializeCest.php index 6e7c7ade664..73c8e41fdf1 100644 --- a/tests/unit/Support/Collection/ReadOnly/SerializeCest.php +++ b/tests/unit/Support/Collection/ReadOnlyCollection/SerializeCest.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace Phalcon\Tests\Unit\Support\Collection\ReadOnly; +namespace Phalcon\Tests\Unit\Support\Collection\ReadOnlyCollection; -use Phalcon\Support\Collection\ReadOnly; +use Phalcon\Support\Collection\ReadOnlyCollection; use UnitTester; class SerializeCest { /** - * Tests Phalcon\Support\Collection\ReadOnly :: serialize() + * Tests Phalcon\Support\Collection\ReadOnlyCollection :: serialize() * * @param UnitTester $I * @@ -28,7 +28,7 @@ class SerializeCest */ public function supportCollectionSerialize(UnitTester $I) { - $I->wantToTest('Support\Collection\ReadOnly - serialize()'); + $I->wantToTest('Support\Collection\ReadOnlyCollection - serialize()'); $data = [ 'one' => 'two', @@ -36,7 +36,7 @@ public function supportCollectionSerialize(UnitTester $I) 'five' => 'six', ]; - $collection = new ReadOnly($data); + $collection = new ReadOnlyCollection($data); $expected = serialize($data); $actual = $collection->serialize(); diff --git a/tests/unit/Support/Collection/ReadOnly/SetCest.php b/tests/unit/Support/Collection/ReadOnlyCollection/SetCest.php similarity index 71% rename from tests/unit/Support/Collection/ReadOnly/SetCest.php rename to tests/unit/Support/Collection/ReadOnlyCollection/SetCest.php index f10936b85f9..b8087592827 100644 --- a/tests/unit/Support/Collection/ReadOnly/SetCest.php +++ b/tests/unit/Support/Collection/ReadOnlyCollection/SetCest.php @@ -11,16 +11,16 @@ declare(strict_types=1); -namespace Phalcon\Tests\Unit\Support\Collection\ReadOnly; +namespace Phalcon\Tests\Unit\Support\Collection\ReadOnlyCollection; use Phalcon\Support\Collection\Exception; -use Phalcon\Support\Collection\ReadOnly; +use Phalcon\Support\Collection\ReadOnlyCollection; use UnitTester; class SetCest { /** - * Tests Phalcon\Support\Collection\ReadOnly :: set() + * Tests Phalcon\Support\Collection\ReadOnlyCollection :: set() * * @param UnitTester $I * @@ -29,12 +29,12 @@ class SetCest */ public function supportCollectionSet(UnitTester $I) { - $I->wantToTest('Support\Collection\ReadOnly - set()'); + $I->wantToTest('Support\Collection\ReadOnlyCollection - set()'); $I->expectThrowable( new Exception('The object is read only'), function () { - $collection = new ReadOnly(); + $collection = new ReadOnlyCollection(); $collection->set('three', 123); } ); @@ -42,7 +42,7 @@ function () { $I->expectThrowable( new Exception('The object is read only'), function () { - $collection = new ReadOnly(); + $collection = new ReadOnlyCollection(); $collection->three = 'Phalcon'; } ); @@ -50,7 +50,7 @@ function () { $I->expectThrowable( new Exception('The object is read only'), function () { - $collection = new ReadOnly(); + $collection = new ReadOnlyCollection(); $collection->offsetSet('three', 123); } ); @@ -58,7 +58,7 @@ function () { $I->expectThrowable( new Exception('The object is read only'), function () { - $collection = new ReadOnly(); + $collection = new ReadOnlyCollection(); $collection['three'] = true; } ); diff --git a/tests/unit/Support/Collection/ReadOnly/ToArrayCest.php b/tests/unit/Support/Collection/ReadOnlyCollection/ToArrayCest.php similarity index 69% rename from tests/unit/Support/Collection/ReadOnly/ToArrayCest.php rename to tests/unit/Support/Collection/ReadOnlyCollection/ToArrayCest.php index 29a8e978477..f7e2a417b51 100644 --- a/tests/unit/Support/Collection/ReadOnly/ToArrayCest.php +++ b/tests/unit/Support/Collection/ReadOnlyCollection/ToArrayCest.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace Phalcon\Tests\Unit\Support\Collection\ReadOnly; +namespace Phalcon\Tests\Unit\Support\Collection\ReadOnlyCollection; -use Phalcon\Support\Collection\ReadOnly; +use Phalcon\Support\Collection\ReadOnlyCollection; use UnitTester; class ToArrayCest { /** - * Tests Phalcon\Support\Collection\ReadOnly :: toArray() + * Tests Phalcon\Support\Collection\ReadOnlyCollection :: toArray() * * @param UnitTester $I * @@ -28,7 +28,7 @@ class ToArrayCest */ public function supportCollectionToArray(UnitTester $I) { - $I->wantToTest('Support\Collection\ReadOnly - toArray()'); + $I->wantToTest('Support\Collection\ReadOnlyCollection - toArray()'); $data = [ 'one' => 'two', @@ -36,7 +36,7 @@ public function supportCollectionToArray(UnitTester $I) 'five' => 'six', ]; - $collection = new ReadOnly($data); + $collection = new ReadOnlyCollection($data); $expected = $data; $actual = $collection->toArray(); diff --git a/tests/unit/Support/Collection/ReadOnly/ToJsonCest.php b/tests/unit/Support/Collection/ReadOnlyCollection/ToJsonCest.php similarity index 74% rename from tests/unit/Support/Collection/ReadOnly/ToJsonCest.php rename to tests/unit/Support/Collection/ReadOnlyCollection/ToJsonCest.php index e17f57ef270..3d495ecef9f 100644 --- a/tests/unit/Support/Collection/ReadOnly/ToJsonCest.php +++ b/tests/unit/Support/Collection/ReadOnlyCollection/ToJsonCest.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace Phalcon\Tests\Unit\Support\Collection\ReadOnly; +namespace Phalcon\Tests\Unit\Support\Collection\ReadOnlyCollection; -use Phalcon\Support\Collection\ReadOnly; +use Phalcon\Support\Collection\ReadOnlyCollection; use UnitTester; class ToJsonCest { /** - * Tests Phalcon\Support\Collection\ReadOnly :: toJson() + * Tests Phalcon\Support\Collection\ReadOnlyCollection :: toJson() * * @param UnitTester $I * @@ -28,7 +28,7 @@ class ToJsonCest */ public function supportCollectionToJson(UnitTester $I) { - $I->wantToTest('Support\Collection\ReadOnly - toJson()'); + $I->wantToTest('Support\Collection\ReadOnlyCollection - toJson()'); $data = [ 'one' => 'two', @@ -36,7 +36,7 @@ public function supportCollectionToJson(UnitTester $I) 'five' => 'six', ]; - $collection = new ReadOnly($data); + $collection = new ReadOnlyCollection($data); $expected = json_encode($data); $actual = $collection->toJson(); diff --git a/tests/unit/Support/Collection/ReadOnly/UnserializeCest.php b/tests/unit/Support/Collection/ReadOnlyCollection/UnserializeCest.php similarity index 72% rename from tests/unit/Support/Collection/ReadOnly/UnserializeCest.php rename to tests/unit/Support/Collection/ReadOnlyCollection/UnserializeCest.php index e1a5fd98196..0bfddb8a61e 100644 --- a/tests/unit/Support/Collection/ReadOnly/UnserializeCest.php +++ b/tests/unit/Support/Collection/ReadOnlyCollection/UnserializeCest.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace Phalcon\Tests\Unit\Support\Collection\ReadOnly; +namespace Phalcon\Tests\Unit\Support\Collection\ReadOnlyCollection; -use Phalcon\Support\Collection\ReadOnly; +use Phalcon\Support\Collection\ReadOnlyCollection; use UnitTester; class UnserializeCest { /** - * Tests Phalcon\Support\Collection\ReadOnly :: serialize() + * Tests Phalcon\Support\Collection\ReadOnlyCollection :: serialize() * * @param UnitTester $I * @@ -28,7 +28,7 @@ class UnserializeCest */ public function supportCollectionSerialize(UnitTester $I) { - $I->wantToTest('Support\Collection\ReadOnly - serialize()'); + $I->wantToTest('Support\Collection\ReadOnlyCollection - serialize()'); $data = [ 'one' => 'two', @@ -37,7 +37,7 @@ public function supportCollectionSerialize(UnitTester $I) ]; $serialized = serialize($data); - $collection = new ReadOnly(); + $collection = new ReadOnlyCollection(); $collection->unserialize($serialized); From 2c31e2f4885c5f65ed7d03ff3dd7a59981253f8d Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Sat, 6 Nov 2021 13:40:23 -0400 Subject: [PATCH 2/3] refreshing ext --- ext/config.m4 | 2 +- ext/config.w32 | 2 +- ext/phalcon.c | 4 +- ext/phalcon.h | 2 +- ext/phalcon/acl/adapter/memory.zep.c | 56 +- ext/phalcon/annotations/annotation.zep.c | 6 +- ext/phalcon/annotations/collection.zep.c | 4 +- ext/phalcon/annotations/reader.zep.c | 16 +- ext/phalcon/assets/collection.zep.c | 12 +- ext/phalcon/assets/manager.zep.c | 34 +- ext/phalcon/cache/cachefactory.zep.c | 2 +- ext/phalcon/cli/console.zep.c | 8 +- ext/phalcon/cli/router.zep.c | 6 +- ext/phalcon/cli/router/route.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 | 2 +- ext/phalcon/config/adapter/yaml.zep.c | 6 +- ext/phalcon/config/configfactory.zep.c | 2 +- ext/phalcon/datamapper/pdo/connection.zep.c | 2 +- .../datamapper/pdo/connection/decorated.zep.c | 2 +- .../datamapper/pdo/connectionlocator.zep.c | 2 +- .../datamapper/pdo/profiler/profiler.zep.c | 6 +- ext/phalcon/datamapper/query/insert.zep.c | 2 +- .../datamapper/query/queryfactory.zep.c | 6 +- ext/phalcon/datamapper/query/select.zep.c | 6 +- ext/phalcon/datamapper/query/update.zep.c | 2 +- ext/phalcon/db/adapter/pdo/mysql.zep.c | 306 ++++--- ext/phalcon/db/adapter/pdo/mysql.zep.h | 6 + ext/phalcon/db/adapter/pdo/postgresql.zep.c | 4 +- ext/phalcon/db/adapter/pdo/sqlite.zep.c | 4 +- ext/phalcon/db/dialect/mysql.zep.c | 42 +- ext/phalcon/db/dialect/postgresql.zep.c | 8 +- ext/phalcon/db/dialect/sqlite.zep.c | 12 +- ext/phalcon/db/profiler.zep.c | 12 +- ext/phalcon/di/service.zep.c | 2 +- ext/phalcon/di/service/builder.zep.c | 14 +- ext/phalcon/encryption/crypt.zep.c | 68 +- .../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/security.zep.c | 852 ++++++++++++------ ext/phalcon/encryption/security.zep.h | 63 +- .../encryption/security/jwt/builder.zep.c | 14 +- .../encryption/security/jwt/signer/hmac.zep.c | 6 +- .../security/jwt/token/parser.zep.c | 26 +- .../encryption/security/jwt/validator.zep.c | 6 +- ext/phalcon/encryption/security/random.zep.c | 16 +- ext/phalcon/events/manager.zep.c | 14 +- ext/phalcon/filter/filter.zep.c | 26 +- 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 +- 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/forms/form.zep.c | 244 +++-- ext/phalcon/forms/form.zep.h | 8 +- ext/phalcon/forms/manager.zep.c | 2 +- ext/phalcon/helper/arr.zep.c | 50 +- ext/phalcon/helper/base64.zep.c | 4 +- ext/phalcon/helper/fs.zep.c | 4 +- ext/phalcon/helper/json.zep.c | 8 +- ext/phalcon/helper/str.zep.c | 76 +- ext/phalcon/html/breadcrumbs.zep.c | 2 +- ext/phalcon/html/escaper.zep.c | 24 +- ext/phalcon/html/helper/input/select.zep.c | 2 +- ext/phalcon/html/helper/meta.zep.c | 6 +- ext/phalcon/html/helper/title.zep.c | 2 +- ext/phalcon/http/cookie.zep.c | 6 +- ext/phalcon/http/message/request.zep.c | 6 +- ext/phalcon/http/message/requestfactory.zep.c | 2 +- ext/phalcon/http/message/response.zep.c | 12 +- .../http/message/responsefactory.zep.c | 4 +- ext/phalcon/http/message/serverrequest.zep.c | 14 +- .../http/message/serverrequestfactory.zep.c | 74 +- ext/phalcon/http/message/streamfactory.zep.c | 4 +- ext/phalcon/http/message/uploadedfile.zep.c | 24 +- .../http/message/uploadedfilefactory.zep.c | 2 +- ext/phalcon/http/message/uri.zep.c | 66 +- ext/phalcon/http/request.zep.c | 160 ++-- ext/phalcon/http/request/file.zep.c | 8 +- ext/phalcon/http/response.zep.c | 18 +- ext/phalcon/http/response/cookies.zep.c | 2 +- ext/phalcon/http/response/headers.zep.c | 14 +- ext/phalcon/image/adapter/gd.zep.c | 244 ++--- ext/phalcon/loader.zep.c | 32 +- ext/phalcon/logger/adapter/stream.zep.c | 2 +- ext/phalcon/logger/adapter/syslog.zep.c | 10 +- ext/phalcon/logger/logger.zep.c | 10 +- ext/phalcon/logger/loggerfactory.zep.c | 2 +- ext/phalcon/messages/messages.zep.c | 2 +- ext/phalcon/mvc/micro.zep.c | 22 +- ext/phalcon/mvc/model.zep.c | 84 +- .../mvc/model/behavior/timestampable.zep.c | 4 +- ext/phalcon/mvc/model/binder.zep.c | 10 +- ext/phalcon/mvc/model/criteria.zep.c | 12 +- ext/phalcon/mvc/model/manager.zep.c | 24 +- ext/phalcon/mvc/model/metadata/stream.zep.c | 4 +- ext/phalcon/mvc/model/query.zep.c | 158 ++-- ext/phalcon/mvc/model/query/builder.zep.c | 6 +- ext/phalcon/mvc/model/row.zep.c | 2 +- ext/phalcon/mvc/router/annotations.zep.c | 2 +- ext/phalcon/mvc/router/route.zep.c | 2 +- ext/phalcon/mvc/view.zep.c | 10 +- ext/phalcon/mvc/view/engine/volt.zep.c | 16 +- .../mvc/view/engine/volt/compiler.zep.c | 2 +- ext/phalcon/mvc/view/simple.zep.c | 8 +- ext/phalcon/paginator/adapter/model.zep.c | 4 +- .../paginator/adapter/nativearray.zep.c | 2 +- ext/phalcon/session/adapter/stream.zep.c | 6 +- ext/phalcon/session/manager.zep.c | 4 +- .../storage/adapter/adapterinterface.zep.c | 24 +- .../storage/adapter/adapterinterface.zep.h | 6 + ext/phalcon/storage/adapter/apcu.zep.c | 94 +- ext/phalcon/storage/adapter/apcu.zep.h | 7 + .../storage/adapter/libmemcached.zep.c | 96 +- .../storage/adapter/libmemcached.zep.h | 7 + ext/phalcon/storage/adapter/memory.zep.c | 67 +- ext/phalcon/storage/adapter/memory.zep.h | 7 + ext/phalcon/storage/adapter/redis.zep.c | 124 ++- ext/phalcon/storage/adapter/redis.zep.h | 7 + ext/phalcon/storage/adapter/stream.zep.c | 189 +++- ext/phalcon/storage/adapter/stream.zep.h | 14 + ext/phalcon/storage/serializer/base64.zep.c | 4 +- ext/phalcon/storage/serializer/json.zep.c | 8 +- .../collection/readonlycollection.zep.c | 95 ++ .../collection/readonlycollection.zep.h | 24 + ext/phalcon/support/debug.zep.c | 4 +- ext/phalcon/support/debug/dump.zep.c | 8 +- .../support/helper/arr/blacklist.zep.c | 4 +- ext/phalcon/support/helper/arr/chunk.zep.c | 2 +- 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 +- ext/phalcon/support/helper/arr/order.zep.c | 4 +- .../support/helper/arr/sliceleft.zep.c | 2 +- .../support/helper/arr/sliceright.zep.c | 2 +- .../support/helper/arr/whitelist.zep.c | 2 +- .../support/helper/file/basename.zep.c | 4 +- ext/phalcon/support/helper/json/decode.zep.c | 4 +- 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 | 18 +- .../support/helper/str/firstbetween.zep.c | 4 +- ext/phalcon/support/helper/str/includes.zep.c | 2 +- .../support/helper/str/isanagram.zep.c | 4 +- .../support/helper/str/ispalindrome.zep.c | 2 +- ext/phalcon/support/helper/str/len.zep.c | 2 +- ext/phalcon/support/helper/str/random.zep.c | 20 +- ext/phalcon/tag.zep.c | 2 +- ext/phalcon/tag/select.zep.c | 4 +- ext/phalcon/text.zep.c | 4 +- .../translate/interpolator/indexedarray.zep.c | 2 +- ext/phalcon/validation.zep.c | 4 +- .../validation/validator/callback.zep.c | 2 +- .../validation/validator/confirmation.zep.c | 2 +- ext/phalcon/validation/validator/email.zep.c | 2 +- .../validation/validator/file/mimetype.zep.c | 6 +- .../validator/file/resolution/equal.zep.c | 2 +- .../validator/file/resolution/max.zep.c | 2 +- .../validator/file/resolution/min.zep.c | 2 +- ext/phalcon/validation/validator/ip.zep.c | 2 +- .../validator/stringlength/max.zep.c | 2 +- .../validator/stringlength/min.zep.c | 2 +- .../validation/validator/uniqueness.zep.c | 4 +- ext/phalcon/validation/validator/url.zep.c | 4 +- 180 files changed, 2641 insertions(+), 1617 deletions(-) create mode 100644 ext/phalcon/support/collection/readonlycollection.zep.c create mode 100644 ext/phalcon/support/collection/readonlycollection.zep.h diff --git a/ext/config.m4 b/ext/config.m4 index db5f08e28b7..32389760023 100644 --- a/ext/config.m4 +++ b/ext/config.m4 @@ -505,7 +505,7 @@ if test "$PHP_PHALCON" = "yes"; then phalcon/storage/serializer/php.zep.c phalcon/storage/serializerfactory.zep.c phalcon/support/collection/exception.zep.c - phalcon/support/collection/readonly.zep.c + phalcon/support/collection/readonlycollection.zep.c phalcon/support/debug.zep.c phalcon/support/debug/dump.zep.c phalcon/support/debug/exception.zep.c diff --git a/ext/config.w32 b/ext/config.w32 index 0b666bc57a6..a9a319c6796 100644 --- a/ext/config.w32 +++ b/ext/config.w32 @@ -21,7 +21,7 @@ if (PHP_PHALCON != "no") { 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/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/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 readonly.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/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 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 len.zep.c lower.zep.c prefix.zep.c random.zep.c reduceslashes.zep.c startswith.zep.c suffix.zep.c ucwords.zep.c uncamelize.zep.c underscore.zep.c upper.zep.c", "phalcon"); diff --git a/ext/phalcon.c b/ext/phalcon.c index 0ac5a178016..20630e76dff 100644 --- a/ext/phalcon.c +++ b/ext/phalcon.c @@ -541,7 +541,7 @@ zend_class_entry *phalcon_storage_serializer_none_ce; zend_class_entry *phalcon_storage_serializer_php_ce; zend_class_entry *phalcon_storage_serializerfactory_ce; zend_class_entry *phalcon_support_collection_exception_ce; -zend_class_entry *phalcon_support_collection_readonly_ce; +zend_class_entry *phalcon_support_collection_readonlycollection_ce; zend_class_entry *phalcon_support_debug_ce; zend_class_entry *phalcon_support_debug_dump_ce; zend_class_entry *phalcon_support_debug_exception_ce; @@ -1180,7 +1180,7 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Storage_Serializer_None); ZEPHIR_INIT(Phalcon_Storage_Serializer_Php); ZEPHIR_INIT(Phalcon_Support_Collection_Exception); - ZEPHIR_INIT(Phalcon_Support_Collection_ReadOnly); + ZEPHIR_INIT(Phalcon_Support_Collection_ReadOnlyCollection); ZEPHIR_INIT(Phalcon_Support_Debug); ZEPHIR_INIT(Phalcon_Support_Debug_Dump); ZEPHIR_INIT(Phalcon_Support_Debug_Exception); diff --git a/ext/phalcon.h b/ext/phalcon.h index 446537e41a2..aabe14ba90f 100644 --- a/ext/phalcon.h +++ b/ext/phalcon.h @@ -500,7 +500,7 @@ #include "phalcon/storage/serializer/php.zep.h" #include "phalcon/storage/serializerfactory.zep.h" #include "phalcon/support/collection/exception.zep.h" -#include "phalcon/support/collection/readonly.zep.h" +#include "phalcon/support/collection/readonlycollection.zep.h" #include "phalcon/support/debug.zep.h" #include "phalcon/support/debug/dump.zep.h" #include "phalcon/support/debug/exception.zep.h" diff --git a/ext/phalcon/acl/adapter/memory.zep.c b/ext/phalcon/acl/adapter/memory.zep.c index fd45242e1d8..ba7422991c4 100644 --- a/ext/phalcon/acl/adapter/memory.zep.c +++ b/ext/phalcon/acl/adapter/memory.zep.c @@ -299,10 +299,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, 154, componentValue); + ZEPHIR_CALL_METHOD(NULL, &componentObject, "__construct", NULL, 155, componentValue); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&componentName, &componentObject, "getname", NULL, 155); + ZEPHIR_CALL_METHOD(&componentName, &componentObject, "getname", NULL, 156); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("componentsNames"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset(&_1, &componentName))) { @@ -359,7 +359,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, 156, &_0, &componentName, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 157, &_0, &componentName, &_1); zephir_check_call_status(); _2 = Z_TYPE_P(accessList) != IS_ARRAY; if (_2) { @@ -510,7 +510,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, 156, &_0, &roleName, &_1, &_2); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 157, &_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))) { @@ -574,7 +574,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, 157, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 158, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -590,7 +590,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, 157, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 158, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_16$$12, "next", NULL, 0); @@ -634,7 +634,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, 157, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 158, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -650,7 +650,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, 157, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 158, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_25$$18, "next", NULL, 0); @@ -717,7 +717,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, 157, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 158, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -733,7 +733,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, 157, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 158, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_36$$27, "next", NULL, 0); @@ -777,7 +777,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, 157, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 158, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -793,7 +793,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, 157, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 158, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_43$$33, "next", NULL, 0); @@ -867,13 +867,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, 158, role); + ZEPHIR_CALL_METHOD(NULL, &roleObject, "__construct", NULL, 159, role); zephir_check_call_status(); } else { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_acl_exception_ce, "Role must be either a string or implement RoleInterface", "phalcon/Acl/Adapter/Memory.zep", 393); return; } - ZEPHIR_CALL_METHOD(&roleName, &roleObject, "getname", NULL, 159); + ZEPHIR_CALL_METHOD(&roleName, &roleObject, "getname", NULL, 160); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("roles"), PH_NOISY_CC | PH_READONLY); if (zephir_array_isset(&_1, &roleName)) { @@ -964,7 +964,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, 160, &role, &componentName, access, &_4$$4, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 161, &role, &componentName, access, &_4$$4, func); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -979,7 +979,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, 160, &role, &componentName, access, &_6$$5, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 161, &role, &componentName, access, &_6$$5, func); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &rolesArray, "next", NULL, 0); zephir_check_call_status(); @@ -1066,7 +1066,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, 160, &role, &componentName, access, &_4$$4, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 161, &role, &componentName, access, &_4$$4, func); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -1081,7 +1081,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, 160, &role, &componentName, access, &_6$$5, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 161, &role, &componentName, access, &_6$$5, func); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &rolesArray, "next", NULL, 0); zephir_check_call_status(); @@ -1458,7 +1458,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, 161, roleName, componentName, &access); + ZEPHIR_CALL_METHOD(&accessKey, this_ptr, "canaccess", NULL, 162, roleName, componentName, &access); zephir_check_call_status(); _10 = Z_TYPE_P(&accessKey) != IS_NULL; if (_10) { @@ -1487,9 +1487,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, 162, &funcAccess); + ZEPHIR_CALL_METHOD(NULL, &reflectionFunction, "__construct", NULL, 163, &funcAccess); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&reflectionParameters, &reflectionFunction, "getparameters", NULL, 163); + ZEPHIR_CALL_METHOD(&reflectionParameters, &reflectionFunction, "getparameters", NULL, 164); zephir_check_call_status(); ZEPHIR_INIT_VAR(¶meterNumber); ZVAL_LONG(¶meterNumber, zephir_fast_count_int(&reflectionParameters)); @@ -1505,7 +1505,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) } ZEPHIR_INIT_VAR(¶metersForFunction); array_init(¶metersForFunction); - ZEPHIR_CALL_METHOD(&numberOfRequiredParameters, &reflectionFunction, "getnumberofrequiredparameters", NULL, 164); + ZEPHIR_CALL_METHOD(&numberOfRequiredParameters, &reflectionFunction, "getnumberofrequiredparameters", NULL, 165); zephir_check_call_status(); ZEPHIR_CPY_WRT(&userParametersSizeShouldBe, ¶meterNumber); zephir_is_iterable(&reflectionParameters, 0, "phalcon/Acl/Adapter/Memory.zep", 736); @@ -1874,12 +1874,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, 156, &_0, &roleName, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 157, &_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, 156, &_2, &componentName, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 157, &_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); @@ -2075,7 +2075,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, 157, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 158, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -2091,7 +2091,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, 157, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 158, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_2$$6, "next", NULL, 0); @@ -2142,7 +2142,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, 157, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 158, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -2158,7 +2158,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, 157, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 158, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_12$$14, "next", NULL, 0); diff --git a/ext/phalcon/annotations/annotation.zep.c b/ext/phalcon/annotations/annotation.zep.c index 32e201bde55..dc9437e1f09 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, 165, &_3$$8); + ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_4, 166, &_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, 165, &_5$$11); + ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_4, 166, &_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, 166, &expr); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 167, &expr); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/annotations/collection.zep.c b/ext/phalcon/annotations/collection.zep.c index 4fffa716807..144e484c1fd 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, 166, &annotationData); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", &_3, 167, &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, 166, &annotationData); + ZEPHIR_CALL_METHOD(NULL, &_4$$4, "__construct", &_3, 167, &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 248d2aa729b..a4881237fe5 100644 --- a/ext/phalcon/annotations/reader.zep.c +++ b/ext/phalcon/annotations/reader.zep.c @@ -98,15 +98,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, 167, &className); + ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 168, &className); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&comment, &reflection, "getdoccomment", NULL, 168); + ZEPHIR_CALL_METHOD(&comment, &reflection, "getdoccomment", NULL, 169); zephir_check_call_status(); if (Z_TYPE_P(&comment) == IS_STRING) { ZEPHIR_INIT_VAR(&classAnnotations); - ZEPHIR_CALL_METHOD(&_0$$3, &reflection, "getfilename", NULL, 169); + ZEPHIR_CALL_METHOD(&_0$$3, &reflection, "getfilename", NULL, 170); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, &reflection, "getstartline", NULL, 170); + ZEPHIR_CALL_METHOD(&_1$$3, &reflection, "getstartline", NULL, 171); zephir_check_call_status(); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&classAnnotations, &comment, &_0$$3, &_1$$3); zephir_check_call_status(); @@ -114,7 +114,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_array_update_string(&annotations, SL("class"), &classAnnotations, PH_COPY | PH_SEPARATE); } } - ZEPHIR_CALL_METHOD(&properties, &reflection, "getproperties", NULL, 171); + ZEPHIR_CALL_METHOD(&properties, &reflection, "getproperties", NULL, 172); zephir_check_call_status(); if (zephir_fast_count_int(&properties)) { line = 1; @@ -130,7 +130,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_check_call_status(); if (Z_TYPE_P(&comment) == IS_STRING) { ZEPHIR_INIT_NVAR(&propertyAnnotations); - ZEPHIR_CALL_METHOD(&_4$$7, &reflection, "getfilename", NULL, 169); + ZEPHIR_CALL_METHOD(&_4$$7, &reflection, "getfilename", NULL, 170); zephir_check_call_status(); ZVAL_LONG(&_5$$7, line); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&propertyAnnotations, &comment, &_4$$7, &_5$$7); @@ -157,7 +157,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_check_call_status(); if (Z_TYPE_P(&comment) == IS_STRING) { ZEPHIR_INIT_NVAR(&propertyAnnotations); - ZEPHIR_CALL_METHOD(&_7$$10, &reflection, "getfilename", NULL, 169); + ZEPHIR_CALL_METHOD(&_7$$10, &reflection, "getfilename", NULL, 170); zephir_check_call_status(); ZVAL_LONG(&_8$$10, line); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&propertyAnnotations, &comment, &_7$$10, &_8$$10); @@ -177,7 +177,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, 172); + ZEPHIR_CALL_METHOD(&methods, &reflection, "getmethods", NULL, 173); zephir_check_call_status(); if (zephir_fast_count_int(&methods)) { ZEPHIR_INIT_VAR(&annotationsMethods); diff --git a/ext/phalcon/assets/collection.zep.c b/ext/phalcon/assets/collection.zep.c index 1f783c3d801..42bd14649e0 100644 --- a/ext/phalcon/assets/collection.zep.c +++ b/ext/phalcon/assets/collection.zep.c @@ -353,7 +353,7 @@ PHP_METHOD(Phalcon_Assets_Collection, add) zephir_fetch_params(1, 1, 0, &asset); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 173, asset); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 174, asset); zephir_check_call_status(); RETURN_THIS(); } @@ -454,7 +454,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addCss) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 174, &path, &collectionLocal, &_1, &collectionAttributes, &version, &_2); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 175, &path, &collectionLocal, &_1, &collectionAttributes, &version, &_2); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "add", NULL, 0, &_0); zephir_check_call_status(); @@ -508,7 +508,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addInline) zephir_fetch_params(1, 1, 0, &code); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 173, code); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 174, code); zephir_check_call_status(); RETURN_THIS(); } @@ -569,7 +569,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addInlineCss) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 175, &content, &_1, &collectionAttributes); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 176, &content, &_1, &collectionAttributes); zephir_check_call_status(); zephir_update_property_array_append(this_ptr, SL("codes"), &_0); RETURN_THIS(); @@ -631,7 +631,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addInlineJs) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 176, &content, &_1, &collectionAttributes); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 177, &content, &_1, &collectionAttributes); zephir_check_call_status(); zephir_update_property_array_append(this_ptr, SL("codes"), &_0); RETURN_THIS(); @@ -735,7 +735,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addJs) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 177, &path, &collectionLocal, &_1, &collectionAttributes, &version, &_2); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 178, &path, &collectionLocal, &_1, &collectionAttributes, &version, &_2); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "add", NULL, 0, &_0); zephir_check_call_status(); diff --git a/ext/phalcon/assets/manager.zep.c b/ext/phalcon/assets/manager.zep.c index 7c2c3636c28..6d330d185bb 100644 --- a/ext/phalcon/assets/manager.zep.c +++ b/ext/phalcon/assets/manager.zep.c @@ -179,11 +179,11 @@ PHP_METHOD(Phalcon_Assets_Manager, addAssetByType) if (!(zephir_array_isset_fetch(&collection, &_0, &type, 0))) { ZEPHIR_INIT_NVAR(&collection); object_init_ex(&collection, phalcon_assets_collection_ce); - ZEPHIR_CALL_METHOD(NULL, &collection, "__construct", NULL, 178); + ZEPHIR_CALL_METHOD(NULL, &collection, "__construct", NULL, 179); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("collections"), &type, &collection); } - ZEPHIR_CALL_METHOD(NULL, &collection, "add", NULL, 179, asset); + ZEPHIR_CALL_METHOD(NULL, &collection, "add", NULL, 180, asset); zephir_check_call_status(); RETURN_THIS(); } @@ -279,7 +279,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addCss) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 174, &path, local, &_1, &attributes, &version, &_2); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 175, &path, local, &_1, &attributes, &version, &_2); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "css"); @@ -361,11 +361,11 @@ PHP_METHOD(Phalcon_Assets_Manager, addInlineCodeByType) if (!(zephir_array_isset_fetch(&collection, &_0, &type, 0))) { ZEPHIR_INIT_NVAR(&collection); object_init_ex(&collection, phalcon_assets_collection_ce); - ZEPHIR_CALL_METHOD(NULL, &collection, "__construct", NULL, 178); + ZEPHIR_CALL_METHOD(NULL, &collection, "__construct", NULL, 179); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("collections"), &type, &collection); } - ZEPHIR_CALL_METHOD(NULL, &collection, "addinline", NULL, 180, code); + ZEPHIR_CALL_METHOD(NULL, &collection, "addinline", NULL, 181, code); zephir_check_call_status(); RETURN_THIS(); } @@ -414,7 +414,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addInlineCss) ZEPHIR_INIT_VAR(&_0); object_init_ex(&_0, phalcon_assets_inline_css_ce); - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 175, &content, filter, attributes); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 176, &content, filter, attributes); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "css"); @@ -467,7 +467,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addInlineJs) ZEPHIR_INIT_VAR(&_0); object_init_ex(&_0, phalcon_assets_inline_js_ce); - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 176, &content, filter, attributes); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 177, &content, filter, attributes); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "js"); @@ -567,7 +567,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addJs) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 177, &path, local, &_1, &attributes, &version, &_2); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 178, &path, local, &_1, &attributes, &version, &_2); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "js"); @@ -608,7 +608,7 @@ PHP_METHOD(Phalcon_Assets_Manager, collection) if (!(zephir_array_isset_fetch(&collection, &_0, &name, 0))) { ZEPHIR_INIT_NVAR(&collection); object_init_ex(&collection, phalcon_assets_collection_ce); - ZEPHIR_CALL_METHOD(NULL, &collection, "__construct", NULL, 178); + ZEPHIR_CALL_METHOD(NULL, &collection, "__construct", NULL, 179); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("collections"), &name, &collection); } @@ -809,7 +809,7 @@ PHP_METHOD(Phalcon_Assets_Manager, getCss) zephir_read_property(&_0, this_ptr, ZEND_STRL("collections"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset_string_fetch(&collection, &_0, SL("css"), 1))) { object_init_ex(return_value, phalcon_assets_collection_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 178); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 179); zephir_check_call_status(); RETURN_MM(); } @@ -835,7 +835,7 @@ PHP_METHOD(Phalcon_Assets_Manager, getJs) zephir_read_property(&_0, this_ptr, ZEND_STRL("collections"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset_string_fetch(&collection, &_0, SL("js"), 1))) { object_init_ex(return_value, phalcon_assets_collection_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 178); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 179); zephir_check_call_status(); RETURN_MM(); } @@ -1033,7 +1033,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_FUNCTION(&_4$$9, "is_dir", NULL, 147, &completeTargetPath); + ZEPHIR_CALL_FUNCTION(&_4$$9, "is_dir", NULL, 152, &completeTargetPath); zephir_check_call_status(); if (UNEXPECTED(zephir_is_true(&_4$$9))) { ZEPHIR_INIT_VAR(&_5$$11); @@ -1118,7 +1118,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) } else { ZEPHIR_CALL_METHOD(&path, &asset, "getrealtargeturi", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "getprefixedpath", &_16, 181, collection, &path); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "getprefixedpath", &_16, 182, collection, &path); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_17$$23, &asset, "getversion", NULL, 0); zephir_check_call_status(); @@ -1249,7 +1249,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) if (!(zephir_is_true(&join))) { ZEPHIR_CALL_METHOD(&path, &asset, "getrealtargeturi", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "getprefixedpath", &_16, 181, collection, &path); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "getprefixedpath", &_16, 182, collection, &path); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_31$$44, &asset, "getversion", NULL, 0); zephir_check_call_status(); @@ -1390,7 +1390,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) } else { ZEPHIR_CALL_METHOD(&path, &asset, "getrealtargeturi", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "getprefixedpath", &_16, 181, collection, &path); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "getprefixedpath", &_16, 182, collection, &path); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_47$$63, &asset, "getversion", NULL, 0); zephir_check_call_status(); @@ -1520,7 +1520,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) if (!(zephir_is_true(&join))) { ZEPHIR_CALL_METHOD(&path, &asset, "getrealtargeturi", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "getprefixedpath", &_16, 181, collection, &path); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "getprefixedpath", &_16, 182, collection, &path); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_59$$84, &asset, "getversion", NULL, 0); zephir_check_call_status(); @@ -1595,7 +1595,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) zephir_file_put_contents(NULL, &completeTargetPath, &filteredJoinedContent); ZEPHIR_CALL_METHOD(&targetUri, collection, "gettargeturi", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "getprefixedpath", &_16, 181, collection, &targetUri); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "getprefixedpath", &_16, 182, collection, &targetUri); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&version, collection, "getversion", &_20, 0); zephir_check_call_status(); diff --git a/ext/phalcon/cache/cachefactory.zep.c b/ext/phalcon/cache/cachefactory.zep.c index 6b8753fee68..6ae76941d01 100644 --- a/ext/phalcon/cache/cachefactory.zep.c +++ b/ext/phalcon/cache/cachefactory.zep.c @@ -217,7 +217,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, 182, &adapter); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 183, &adapter); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/cli/console.zep.c b/ext/phalcon/cli/console.zep.c index d2e8820f21f..3ff17bd18dc 100644 --- a/ext/phalcon/cli/console.zep.c +++ b/ext/phalcon/cli/console.zep.c @@ -413,7 +413,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, 183, &arg, &_3$$5, &_4$$5); + ZEPHIR_CALL_FUNCTION(&_5$$5, "strncmp", &_6, 184, &arg, &_3$$5, &_4$$5); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_5$$5, 0)) { ZEPHIR_INIT_NVAR(&_7$$6); @@ -445,7 +445,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, 183, &arg, &_18$$9, &_19$$9); + ZEPHIR_CALL_FUNCTION(&_20$$9, "strncmp", &_6, 184, &arg, &_18$$9, &_19$$9); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_20$$9, 0)) { ZVAL_LONG(&_21$$10, 1); @@ -475,7 +475,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, 183, &arg, &_23$$14, &_24$$14); + ZEPHIR_CALL_FUNCTION(&_25$$14, "strncmp", &_6, 184, &arg, &_23$$14, &_24$$14); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_25$$14, 0)) { ZEPHIR_INIT_NVAR(&_26$$15); @@ -507,7 +507,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, 183, &arg, &_37$$18, &_38$$18); + ZEPHIR_CALL_FUNCTION(&_39$$18, "strncmp", &_6, 184, &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 abf7aff3bb4..6e1a5008a30 100644 --- a/ext/phalcon/cli/router.zep.c +++ b/ext/phalcon/cli/router.zep.c @@ -154,7 +154,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, 184, &_2$$3, &_1$$3); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 185, &_2$$3, &_1$$3); zephir_check_call_status(); zephir_array_append(&routes, &_0$$3, PH_SEPARATE, "phalcon/Cli/Router.zep", 120); ZEPHIR_INIT_NVAR(&_2$$3); @@ -166,7 +166,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, 184, &_4$$3, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 185, &_4$$3, &_3$$3); zephir_check_call_status(); zephir_array_append(&routes, &_2$$3, PH_SEPARATE, "phalcon/Cli/Router.zep", 129); } @@ -224,7 +224,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, 184, &pattern, paths); + ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 185, &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/router/route.zep.c b/ext/phalcon/cli/router/route.zep.c index 9668dbb1fff..339deae55b1 100644 --- a/ext/phalcon/cli/router/route.zep.c +++ b/ext/phalcon/cli/router/route.zep.c @@ -753,7 +753,7 @@ PHP_METHOD(Phalcon_Cli_Router_Route, getReversedPaths) ZEPHIR_MM_GROW(); zephir_read_property(&_0, this_ptr, ZEND_STRL("paths"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_FUNCTION("array_flip", NULL, 185, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("array_flip", NULL, 186, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/config/adapter/grouped.zep.c b/ext/phalcon/config/adapter/grouped.zep.c index 1b06c353e7b..4b3f4a08a44 100644 --- a/ext/phalcon/config/adapter/grouped.zep.c +++ b/ext/phalcon/config/adapter/grouped.zep.c @@ -183,9 +183,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, 186); + ZEPHIR_CALL_METHOD(NULL, &_7$$6, "__construct", &_8, 187); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_9$$6, &_7$$6, "load", &_10, 187, &configName); + ZEPHIR_CALL_METHOD(&_9$$6, &_7$$6, "load", &_10, 188, &configName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "merge", &_5, 0, &_9$$6); zephir_check_call_status(); @@ -223,9 +223,9 @@ PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) } else { ZEPHIR_INIT_NVAR(&_18$$10); object_init_ex(&_18$$10, phalcon_config_configfactory_ce); - ZEPHIR_CALL_METHOD(NULL, &_18$$10, "__construct", &_8, 186); + ZEPHIR_CALL_METHOD(NULL, &_18$$10, "__construct", &_8, 187); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_19$$10, &_18$$10, "load", &_10, 187, &configInstance); + ZEPHIR_CALL_METHOD(&_19$$10, &_18$$10, "load", &_10, 188, &configInstance); zephir_check_call_status(); ZEPHIR_CPY_WRT(&configInstance, &_19$$10); } @@ -258,9 +258,9 @@ PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) if (ZEPHIR_IS_IDENTICAL(&_21$$13, &defaultAdapter)) { ZEPHIR_INIT_NVAR(&_22$$14); object_init_ex(&_22$$14, phalcon_config_configfactory_ce); - ZEPHIR_CALL_METHOD(NULL, &_22$$14, "__construct", &_8, 186); + ZEPHIR_CALL_METHOD(NULL, &_22$$14, "__construct", &_8, 187); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_23$$14, &_22$$14, "load", &_10, 187, &configName); + ZEPHIR_CALL_METHOD(&_23$$14, &_22$$14, "load", &_10, 188, &configName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "merge", &_5, 0, &_23$$14); zephir_check_call_status(); @@ -298,9 +298,9 @@ PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) } else { ZEPHIR_INIT_NVAR(&_29$$18); object_init_ex(&_29$$18, phalcon_config_configfactory_ce); - ZEPHIR_CALL_METHOD(NULL, &_29$$18, "__construct", &_8, 186); + ZEPHIR_CALL_METHOD(NULL, &_29$$18, "__construct", &_8, 187); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_30$$18, &_29$$18, "load", &_10, 187, &configInstance); + ZEPHIR_CALL_METHOD(&_30$$18, &_29$$18, "load", &_10, 188, &configInstance); zephir_check_call_status(); ZEPHIR_CPY_WRT(&configInstance, &_30$$18); } diff --git a/ext/phalcon/config/adapter/ini.zep.c b/ext/phalcon/config/adapter/ini.zep.c index 95ca035c3a1..69bc89fa3ff 100644 --- a/ext/phalcon/config/adapter/ini.zep.c +++ b/ext/phalcon/config/adapter/ini.zep.c @@ -151,7 +151,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Ini, __construct) ZVAL_LONG(&_0, mode); - ZEPHIR_CALL_FUNCTION(&iniConfig, "parse_ini_file", NULL, 188, &filePath, &__$true, &_0); + ZEPHIR_CALL_FUNCTION(&iniConfig, "parse_ini_file", NULL, 189, &filePath, &__$true, &_0); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_IS_FALSE_IDENTICAL(&iniConfig))) { ZEPHIR_INIT_VAR(&_1$$3); @@ -541,7 +541,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, 189, &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); diff --git a/ext/phalcon/config/adapter/json.zep.c b/ext/phalcon/config/adapter/json.zep.c index 874ae5b7390..0d6eaf9cef2 100644 --- a/ext/phalcon/config/adapter/json.zep.c +++ b/ext/phalcon/config/adapter/json.zep.c @@ -96,7 +96,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Json, __construct) ZEPHIR_INIT_VAR(&_3); zephir_file_get_contents(&_3, &filePath); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_CE_STATIC(&_1, phalcon_helper_json_ce, "decode", &_2, 190, &_3, &_4); + ZEPHIR_CALL_CE_STATIC(&_1, phalcon_helper_json_ce, "decode", &_2, 191, &_3, &_4); zephir_check_call_status(); ZEPHIR_CALL_PARENT(NULL, phalcon_config_adapter_json_ce, getThis(), "__construct", &_0, 0, &_1); zephir_check_call_status(); diff --git a/ext/phalcon/config/adapter/yaml.zep.c b/ext/phalcon/config/adapter/yaml.zep.c index 3bbce831d79..f876717c526 100644 --- a/ext/phalcon/config/adapter/yaml.zep.c +++ b/ext/phalcon/config/adapter/yaml.zep.c @@ -128,20 +128,20 @@ PHP_METHOD(Phalcon_Config_Adapter_Yaml, __construct) ndocs = 0; ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "yaml"); - ZEPHIR_CALL_FUNCTION(&_1, "extension_loaded", NULL, 191, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "extension_loaded", NULL, 192, &_0); zephir_check_call_status(); if (UNEXPECTED(!zephir_is_true(&_1))) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_config_exception_ce, "Yaml extension not loaded", "phalcon/Config/Adapter/Yaml.zep", 64); return; } if (ZEPHIR_IS_EMPTY(&callbacks)) { - ZEPHIR_CALL_FUNCTION(&yamlConfig, "yaml_parse_file", NULL, 192, &filePath); + ZEPHIR_CALL_FUNCTION(&yamlConfig, "yaml_parse_file", NULL, 193, &filePath); zephir_check_call_status(); } else { ZVAL_LONG(&_2$$5, 0); ZVAL_LONG(&_3$$5, ndocs); ZEPHIR_MAKE_REF(&_3$$5); - ZEPHIR_CALL_FUNCTION(&yamlConfig, "yaml_parse_file", NULL, 192, &filePath, &_2$$5, &_3$$5, &callbacks); + ZEPHIR_CALL_FUNCTION(&yamlConfig, "yaml_parse_file", NULL, 193, &filePath, &_2$$5, &_3$$5, &callbacks); ZEPHIR_UNREF(&_3$$5); zephir_check_call_status(); } diff --git a/ext/phalcon/config/configfactory.zep.c b/ext/phalcon/config/configfactory.zep.c index 4afef1b3044..1dea5c1011d 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", 178); return; } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkconfigarray", NULL, 193, config); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkconfigarray", NULL, 194, 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 0f18d1b99a4..73cfe2f5deb 100644 --- a/ext/phalcon/datamapper/pdo/connection.zep.c +++ b/ext/phalcon/datamapper/pdo/connection.zep.c @@ -180,7 +180,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, 194); + ZEPHIR_CALL_METHOD(NULL, profiler, "__construct", NULL, 195); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, this_ptr, "setprofiler", NULL, 0, profiler); diff --git a/ext/phalcon/datamapper/pdo/connection/decorated.zep.c b/ext/phalcon/datamapper/pdo/connection/decorated.zep.c index 45b2ab31ec4..c0830209639 100644 --- a/ext/phalcon/datamapper/pdo/connection/decorated.zep.c +++ b/ext/phalcon/datamapper/pdo/connection/decorated.zep.c @@ -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, 194); + ZEPHIR_CALL_METHOD(NULL, profiler, "__construct", NULL, 195); 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 2db46e78da1..a2dbecabaea 100644 --- a/ext/phalcon/datamapper/pdo/connectionlocator.zep.c +++ b/ext/phalcon/datamapper/pdo/connectionlocator.zep.c @@ -472,7 +472,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, 195, &collection); + ZEPHIR_CALL_FUNCTION(&requested, "array_rand", NULL, 196, &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 d96b6a19ebb..f1fcd6bbdac 100644 --- a/ext/phalcon/datamapper/pdo/profiler/profiler.zep.c +++ b/ext/phalcon/datamapper/pdo/profiler/profiler.zep.c @@ -192,9 +192,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, 8); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&finish, "hrtime", NULL, 196, &__$true); + ZEPHIR_CALL_FUNCTION(&finish, "hrtime", NULL, 197, &__$true); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, &ex, "gettraceasstring", NULL, 197); + ZEPHIR_CALL_METHOD(&_1$$3, &ex, "gettraceasstring", NULL, 198); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "backtrace"); @@ -428,7 +428,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, 196, &__$true); + ZEPHIR_CALL_FUNCTION(&_2$$3, "hrtime", NULL, 197, &__$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); diff --git a/ext/phalcon/datamapper/query/insert.zep.c b/ext/phalcon/datamapper/query/insert.zep.c index e1eae773e30..eac2f40172c 100644 --- a/ext/phalcon/datamapper/query/insert.zep.c +++ b/ext/phalcon/datamapper/query/insert.zep.c @@ -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, 199); 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 c6119c217bf..b08289ecf01 100644 --- a/ext/phalcon/datamapper/query/queryfactory.zep.c +++ b/ext/phalcon/datamapper/query/queryfactory.zep.c @@ -142,7 +142,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, 200, connection, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -178,7 +178,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, 201, connection, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -265,7 +265,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, 202, 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 1e2e534d390..0ae531a5513 100644 --- a/ext/phalcon/datamapper/query/select.zep.c +++ b/ext/phalcon/datamapper/query/select.zep.c @@ -936,7 +936,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, 203, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -1059,9 +1059,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, 204); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "buildfrom", NULL, 204); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "buildfrom", NULL, 205); 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 850b753c072..bc65f7e6b1d 100644 --- a/ext/phalcon/datamapper/query/update.zep.c +++ b/ext/phalcon/datamapper/query/update.zep.c @@ -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, 206); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5); ZVAL_STRING(&_5, "WHERE"); diff --git a/ext/phalcon/db/adapter/pdo/mysql.zep.c b/ext/phalcon/db/adapter/pdo/mysql.zep.c index a352e66a916..d986ae00a77 100644 --- a/ext/phalcon/db/adapter/pdo/mysql.zep.c +++ b/ext/phalcon/db/adapter/pdo/mysql.zep.c @@ -12,13 +12,13 @@ #include #include "kernel/main.h" +#include "kernel/array.h" #include "kernel/fcall.h" -#include "kernel/object.h" +#include "ext/spl/spl_exceptions.h" +#include "kernel/exception.h" #include "kernel/memory.h" +#include "kernel/object.h" #include "kernel/operators.h" -#include "kernel/exception.h" -#include "ext/spl/spl_exceptions.h" -#include "kernel/array.h" #include "kernel/string.h" #include "kernel/concat.h" @@ -63,6 +63,60 @@ ZEPHIR_INIT_CLASS(Phalcon_Db_Adapter_Pdo_Mysql) return SUCCESS; } +/** + * Constructor for Phalcon\Db\Adapter\Pdo + * + * @param array descriptor = [ + * 'host' => 'localhost', + * 'port' => '3306', + * 'dbname' => 'blog', + * 'username' => 'sigma' + * 'password' => 'secret' + * 'dialectClass' => null, + * 'options' => [], + * 'dsn' => null, + * 'charset' => 'utf8mb4' + * ] + */ +PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, __construct) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zephir_fcall_cache_entry *_2 = NULL; + zval *descriptor_param = NULL, __$false, _0, _1; + zval descriptor; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&descriptor); + ZVAL_BOOL(&__$false, 0); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_ARRAY(descriptor) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &descriptor_param); + ZEPHIR_OBS_COPY_OR_DUP(&descriptor, descriptor_param); + + + zephir_array_fetch_string(&_0, &descriptor, SL("options"), PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 74); + if (!(zephir_array_isset_long(&_0, 20))) { + zephir_array_update_multi(&descriptor, &__$false, SL("sl"), 3, SL("options"), 20); + } + zephir_array_fetch_string(&_1, &descriptor, SL("options"), PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 77); + if (!(zephir_array_isset_long(&_1, 17))) { + zephir_array_update_multi(&descriptor, &__$false, SL("sl"), 3, SL("options"), 17); + } + ZEPHIR_CALL_PARENT(NULL, phalcon_db_adapter_pdo_mysql_ce, getThis(), "__construct", &_2, 0, &descriptor); + zephir_check_call_status(); + ZEPHIR_MM_RESTORE(); +} + /** * Adds a foreign key to a table */ @@ -123,7 +177,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, addForeignKey) ZEPHIR_CALL_METHOD(&_2, &foreignKeyCheck, "execute", NULL, 0); zephir_check_call_status(); if (UNEXPECTED(!zephir_is_true(&_2))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "DATABASE PARAMETER 'FOREIGN_KEY_CHECKS' HAS TO BE 1", "phalcon/Db/Adapter/Pdo/Mysql.zep", 66); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "DATABASE PARAMETER 'FOREIGN_KEY_CHECKS' HAS TO BE 1", "phalcon/Db/Adapter/Pdo/Mysql.zep", 98); return; } zephir_read_property(&_3, this_ptr, ZEND_STRL("dialect"), PH_NOISY_CC | PH_READONLY); @@ -322,7 +376,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) ZVAL_LONG(&_2, 3); ZEPHIR_CALL_METHOD(&fields, this_ptr, "fetchall", NULL, 0, &_1, &_2); zephir_check_call_status(); - zephir_is_iterable(&fields, 0, "phalcon/Db/Adapter/Pdo/Mysql.zep", 468); + zephir_is_iterable(&fields, 0, "phalcon/Db/Adapter/Pdo/Mysql.zep", 500); if (Z_TYPE_P(&fields) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&fields), _3) { @@ -332,7 +386,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) zephir_create_array(&definition, 1, 0); add_assoc_long_ex(&definition, SL("bindType"), 2); ZEPHIR_OBS_NVAR(&columnType); - zephir_array_fetch_long(&columnType, &field, 1, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 121); + zephir_array_fetch_long(&columnType, &field, 1, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 153); do { _5$$3 = 1; if (_5$$3 == zephir_start_with_str(&columnType, SL("bigint"))) { @@ -535,10 +589,10 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) break; } while(0); - if (zephir_memnstr_str(&columnType, SL("("), "phalcon/Db/Adapter/Pdo/Mysql.zep", 385)) { + if (zephir_memnstr_str(&columnType, SL("("), "phalcon/Db/Adapter/Pdo/Mysql.zep", 417)) { ZEPHIR_INIT_NVAR(&matches); ZVAL_NULL(&matches); - zephir_array_fetch_string(&_42$$32, &definition, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 388); + zephir_array_fetch_string(&_42$$32, &definition, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 420); ZEPHIR_INIT_NVAR(&_43$$32); zephir_preg_match(&_43$$32, &sizePattern, &columnType, &matches, 0, 0 , 0 ); if (ZEPHIR_IS_LONG(&_42$$32, 18)) { @@ -562,7 +616,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) } } } - if (zephir_memnstr_str(&columnType, SL("unsigned"), "phalcon/Db/Adapter/Pdo/Mysql.zep", 404)) { + if (zephir_memnstr_str(&columnType, SL("unsigned"), "phalcon/Db/Adapter/Pdo/Mysql.zep", 436)) { zephir_array_update_string(&definition, SL("unsigned"), &__$true, PH_COPY | PH_SEPARATE); } if (Z_TYPE_P(&oldColumn) == IS_NULL) { @@ -570,51 +624,51 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) } else { zephir_array_update_string(&definition, SL("after"), &oldColumn, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_49$$3, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 420); + zephir_array_fetch_long(&_49$$3, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 452); if (ZEPHIR_IS_STRING(&_49$$3, "PRI")) { zephir_array_update_string(&definition, SL("primary"), &__$true, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_50$$3, &field, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 427); + zephir_array_fetch_long(&_50$$3, &field, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 459); if (ZEPHIR_IS_STRING(&_50$$3, "YES")) { zephir_array_update_string(&definition, SL("notNull"), &__$false, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_51$$3, &field, 6, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 434); + zephir_array_fetch_long(&_51$$3, &field, 6, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 466); if (ZEPHIR_IS_STRING(&_51$$3, "auto_increment")) { zephir_array_update_string(&definition, SL("autoIncrement"), &__$true, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_52$$3, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 441); + zephir_array_fetch_long(&_52$$3, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 473); if (Z_TYPE_P(&_52$$3) != IS_NULL) { - zephir_array_fetch_long(&_53$$43, &field, 6, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 442); - if (zephir_memnstr_str(&_53$$43, SL("on update"), "phalcon/Db/Adapter/Pdo/Mysql.zep", 442)) { - zephir_array_fetch_long(&_54$$44, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 443); - zephir_array_fetch_long(&_55$$44, &field, 6, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 443); + zephir_array_fetch_long(&_53$$43, &field, 6, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 474); + if (zephir_memnstr_str(&_53$$43, SL("on update"), "phalcon/Db/Adapter/Pdo/Mysql.zep", 474)) { + zephir_array_fetch_long(&_54$$44, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 475); + zephir_array_fetch_long(&_55$$44, &field, 6, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 475); ZEPHIR_INIT_NVAR(&_56$$44); ZEPHIR_CONCAT_VSV(&_56$$44, &_54$$44, " ", &_55$$44); zephir_array_update_string(&definition, SL("default"), &_56$$44, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_long(&_57$$45, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 445); + zephir_array_fetch_long(&_57$$45, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 477); zephir_array_update_string(&definition, SL("default"), &_57$$45, PH_COPY | PH_SEPARATE); } } else { - zephir_array_fetch_long(&_58$$46, &field, 6, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 448); - if (zephir_memnstr_str(&_58$$46, SL("on update"), "phalcon/Db/Adapter/Pdo/Mysql.zep", 448)) { - zephir_array_fetch_long(&_59$$47, &field, 6, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 449); + zephir_array_fetch_long(&_58$$46, &field, 6, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 480); + if (zephir_memnstr_str(&_58$$46, SL("on update"), "phalcon/Db/Adapter/Pdo/Mysql.zep", 480)) { + zephir_array_fetch_long(&_59$$47, &field, 6, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 481); ZEPHIR_INIT_NVAR(&_60$$47); ZEPHIR_CONCAT_SV(&_60$$47, "NULL ", &_59$$47); zephir_array_update_string(&definition, SL("default"), &_60$$47, PH_COPY | PH_SEPARATE); } } - zephir_array_fetch_long(&_61$$3, &field, 8, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 456); + zephir_array_fetch_long(&_61$$3, &field, 8, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 488); if (Z_TYPE_P(&_61$$3) != IS_NULL) { - zephir_array_fetch_long(&_62$$48, &field, 8, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 457); + zephir_array_fetch_long(&_62$$48, &field, 8, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 489); zephir_array_update_string(&definition, SL("comment"), &_62$$48, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&columnName, &field, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 463); + 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, 207, &columnName, &definition); zephir_check_call_status(); - zephir_array_append(&columns, &_63$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Mysql.zep", 464); + zephir_array_append(&columns, &_63$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Mysql.zep", 496); ZEPHIR_CPY_WRT(&oldColumn, &columnName); } ZEND_HASH_FOREACH_END(); } else { @@ -633,7 +687,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) add_assoc_long_ex(&_65$$49, SL("bindType"), 2); ZEPHIR_CPY_WRT(&definition, &_65$$49); ZEPHIR_OBS_NVAR(&columnType); - zephir_array_fetch_long(&columnType, &field, 1, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 121); + zephir_array_fetch_long(&columnType, &field, 1, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 153); do { _66$$49 = 1; if (_66$$49 == zephir_start_with_str(&columnType, SL("bigint"))) { @@ -836,10 +890,10 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) break; } while(0); - if (zephir_memnstr_str(&columnType, SL("("), "phalcon/Db/Adapter/Pdo/Mysql.zep", 385)) { + if (zephir_memnstr_str(&columnType, SL("("), "phalcon/Db/Adapter/Pdo/Mysql.zep", 417)) { ZEPHIR_INIT_NVAR(&matches); ZVAL_NULL(&matches); - zephir_array_fetch_string(&_103$$78, &definition, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 388); + zephir_array_fetch_string(&_103$$78, &definition, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 420); ZEPHIR_INIT_NVAR(&_104$$78); zephir_preg_match(&_104$$78, &sizePattern, &columnType, &matches, 0, 0 , 0 ); if (ZEPHIR_IS_LONG(&_103$$78, 18)) { @@ -863,7 +917,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) } } } - if (zephir_memnstr_str(&columnType, SL("unsigned"), "phalcon/Db/Adapter/Pdo/Mysql.zep", 404)) { + if (zephir_memnstr_str(&columnType, SL("unsigned"), "phalcon/Db/Adapter/Pdo/Mysql.zep", 436)) { zephir_array_update_string(&definition, SL("unsigned"), &__$true, PH_COPY | PH_SEPARATE); } if (Z_TYPE_P(&oldColumn) == IS_NULL) { @@ -871,52 +925,52 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) } else { zephir_array_update_string(&definition, SL("after"), &oldColumn, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_110$$49, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 420); + zephir_array_fetch_long(&_110$$49, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 452); if (ZEPHIR_IS_STRING(&_110$$49, "PRI")) { zephir_array_update_string(&definition, SL("primary"), &__$true, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_111$$49, &field, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 427); + zephir_array_fetch_long(&_111$$49, &field, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 459); if (ZEPHIR_IS_STRING(&_111$$49, "YES")) { zephir_array_update_string(&definition, SL("notNull"), &__$false, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_112$$49, &field, 6, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 434); + zephir_array_fetch_long(&_112$$49, &field, 6, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 466); if (ZEPHIR_IS_STRING(&_112$$49, "auto_increment")) { zephir_array_update_string(&definition, SL("autoIncrement"), &__$true, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_113$$49, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 441); + zephir_array_fetch_long(&_113$$49, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 473); if (Z_TYPE_P(&_113$$49) != IS_NULL) { - zephir_array_fetch_long(&_114$$89, &field, 6, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 442); - if (zephir_memnstr_str(&_114$$89, SL("on update"), "phalcon/Db/Adapter/Pdo/Mysql.zep", 442)) { - zephir_array_fetch_long(&_115$$90, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 443); - zephir_array_fetch_long(&_116$$90, &field, 6, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 443); + zephir_array_fetch_long(&_114$$89, &field, 6, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 474); + if (zephir_memnstr_str(&_114$$89, SL("on update"), "phalcon/Db/Adapter/Pdo/Mysql.zep", 474)) { + zephir_array_fetch_long(&_115$$90, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 475); + zephir_array_fetch_long(&_116$$90, &field, 6, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 475); ZEPHIR_INIT_NVAR(&_117$$90); ZEPHIR_CONCAT_VSV(&_117$$90, &_115$$90, " ", &_116$$90); zephir_array_update_string(&definition, SL("default"), &_117$$90, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_long(&_118$$91, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 445); + zephir_array_fetch_long(&_118$$91, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 477); zephir_array_update_string(&definition, SL("default"), &_118$$91, PH_COPY | PH_SEPARATE); } } else { - zephir_array_fetch_long(&_119$$92, &field, 6, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 448); - if (zephir_memnstr_str(&_119$$92, SL("on update"), "phalcon/Db/Adapter/Pdo/Mysql.zep", 448)) { - zephir_array_fetch_long(&_120$$93, &field, 6, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 449); + zephir_array_fetch_long(&_119$$92, &field, 6, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 480); + if (zephir_memnstr_str(&_119$$92, SL("on update"), "phalcon/Db/Adapter/Pdo/Mysql.zep", 480)) { + zephir_array_fetch_long(&_120$$93, &field, 6, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 481); ZEPHIR_INIT_NVAR(&_121$$93); ZEPHIR_CONCAT_SV(&_121$$93, "NULL ", &_120$$93); zephir_array_update_string(&definition, SL("default"), &_121$$93, PH_COPY | PH_SEPARATE); } } - zephir_array_fetch_long(&_122$$49, &field, 8, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 456); + zephir_array_fetch_long(&_122$$49, &field, 8, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 488); if (Z_TYPE_P(&_122$$49) != IS_NULL) { - zephir_array_fetch_long(&_123$$94, &field, 8, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 457); + zephir_array_fetch_long(&_123$$94, &field, 8, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 489); zephir_array_update_string(&definition, SL("comment"), &_123$$94, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_NVAR(&columnName); - zephir_array_fetch_long(&columnName, &field, 0, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 463); + 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, 207, &columnName, &definition); zephir_check_call_status(); - zephir_array_append(&columns, &_124$$49, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Mysql.zep", 464); + zephir_array_append(&columns, &_124$$49, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Mysql.zep", 496); ZEPHIR_CPY_WRT(&oldColumn, &columnName); ZEPHIR_CALL_METHOD(NULL, &fields, "next", NULL, 0); zephir_check_call_status(); @@ -1028,32 +1082,32 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes) ZVAL_LONG(&_3, 2); ZEPHIR_CALL_METHOD(&_0, this_ptr, "fetchall", NULL, 0, &_2, &_3); zephir_check_call_status(); - zephir_is_iterable(&_0, 0, "phalcon/Db/Adapter/Pdo/Mysql.zep", 514); + zephir_is_iterable(&_0, 0, "phalcon/Db/Adapter/Pdo/Mysql.zep", 546); if (Z_TYPE_P(&_0) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _4) { ZEPHIR_INIT_NVAR(&index); ZVAL_COPY(&index, _4); - zephir_array_fetch_string(&keyName, &index, SL("Key_name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 487); - zephir_array_fetch_string(&indexType, &index, SL("Index_type"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 488); + zephir_array_fetch_string(&keyName, &index, SL("Key_name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 519); + zephir_array_fetch_string(&indexType, &index, SL("Index_type"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 520); if (!(zephir_array_isset(&indexes, &keyName))) { ZEPHIR_INIT_NVAR(&_6$$4); array_init(&_6$$4); zephir_array_update_zval(&indexes, &keyName, &_6$$4, PH_COPY | PH_SEPARATE); } - zephir_array_fetch(&_7$$3, &indexes, &keyName, PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 494); + zephir_array_fetch(&_7$$3, &indexes, &keyName, PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 526); if (!(zephir_array_isset_string(&_7$$3, SL("columns")))) { ZEPHIR_INIT_NVAR(&columns); array_init(&columns); } else { - zephir_array_fetch(&_8$$6, &indexes, &keyName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 497); + zephir_array_fetch(&_8$$6, &indexes, &keyName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 529); ZEPHIR_OBS_NVAR(&columns); - zephir_array_fetch_string(&columns, &_8$$6, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 497); + zephir_array_fetch_string(&columns, &_8$$6, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 529); } - zephir_array_fetch_string(&_9$$3, &index, SL("Column_name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 500); - zephir_array_append(&columns, &_9$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Mysql.zep", 500); + zephir_array_fetch_string(&_9$$3, &index, SL("Column_name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 532); + zephir_array_append(&columns, &_9$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Mysql.zep", 532); zephir_array_update_multi(&indexes, &columns, SL("zs"), 3, &keyName, SL("columns")); - zephir_array_fetch_string(&_10$$3, &index, SL("Non_unique"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 507); + zephir_array_fetch_string(&_10$$3, &index, SL("Non_unique"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 539); if (ZEPHIR_IS_STRING(&keyName, "PRIMARY")) { ZEPHIR_INIT_NVAR(&_11$$7); ZVAL_STRING(&_11$$7, "PRIMARY"); @@ -1082,27 +1136,27 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes) ZEPHIR_CALL_METHOD(&index, &_0, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&keyName); - zephir_array_fetch_string(&keyName, &index, SL("Key_name"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 487); + zephir_array_fetch_string(&keyName, &index, SL("Key_name"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 519); ZEPHIR_OBS_NVAR(&indexType); - zephir_array_fetch_string(&indexType, &index, SL("Index_type"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 488); + zephir_array_fetch_string(&indexType, &index, SL("Index_type"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 520); if (!(zephir_array_isset(&indexes, &keyName))) { ZEPHIR_INIT_NVAR(&_14$$12); array_init(&_14$$12); zephir_array_update_zval(&indexes, &keyName, &_14$$12, PH_COPY | PH_SEPARATE); } - zephir_array_fetch(&_15$$11, &indexes, &keyName, PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 494); + zephir_array_fetch(&_15$$11, &indexes, &keyName, PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 526); if (!(zephir_array_isset_string(&_15$$11, SL("columns")))) { ZEPHIR_INIT_NVAR(&columns); array_init(&columns); } else { - zephir_array_fetch(&_16$$14, &indexes, &keyName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 497); + zephir_array_fetch(&_16$$14, &indexes, &keyName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 529); ZEPHIR_OBS_NVAR(&columns); - zephir_array_fetch_string(&columns, &_16$$14, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 497); + zephir_array_fetch_string(&columns, &_16$$14, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 529); } - zephir_array_fetch_string(&_17$$11, &index, SL("Column_name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 500); - zephir_array_append(&columns, &_17$$11, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Mysql.zep", 500); + zephir_array_fetch_string(&_17$$11, &index, SL("Column_name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 532); + zephir_array_append(&columns, &_17$$11, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Mysql.zep", 532); zephir_array_update_multi(&indexes, &columns, SL("zs"), 3, &keyName, SL("columns")); - zephir_array_fetch_string(&_18$$11, &index, SL("Non_unique"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 507); + zephir_array_fetch_string(&_18$$11, &index, SL("Non_unique"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 539); if (ZEPHIR_IS_STRING(&keyName, "PRIMARY")) { ZEPHIR_INIT_NVAR(&_19$$15); ZVAL_STRING(&_19$$15, "PRIMARY"); @@ -1125,7 +1179,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes) ZEPHIR_INIT_NVAR(&index); ZEPHIR_INIT_VAR(&indexObjects); array_init(&indexObjects); - zephir_is_iterable(&indexes, 0, "phalcon/Db/Adapter/Pdo/Mysql.zep", 524); + zephir_is_iterable(&indexes, 0, "phalcon/Db/Adapter/Pdo/Mysql.zep", 556); if (Z_TYPE_P(&indexes) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&indexes), _24, _25, _22) { @@ -1139,8 +1193,8 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes) ZVAL_COPY(&index, _22); ZEPHIR_INIT_NVAR(&_26$$19); object_init_ex(&_26$$19, phalcon_db_index_ce); - zephir_array_fetch_string(&_27$$19, &index, SL("columns"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 519); - zephir_array_fetch_string(&_28$$19, &index, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 521); + zephir_array_fetch_string(&_27$$19, &index, SL("columns"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 551); + zephir_array_fetch_string(&_28$$19, &index, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 553); ZEPHIR_CALL_METHOD(NULL, &_26$$19, "__construct", &_29, 32, &name, &_27$$19, &_28$$19); zephir_check_call_status(); zephir_array_update_zval(&indexObjects, &name, &_26$$19, PH_COPY | PH_SEPARATE); @@ -1160,8 +1214,8 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_30$$20); object_init_ex(&_30$$20, phalcon_db_index_ce); - zephir_array_fetch_string(&_31$$20, &index, SL("columns"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 519); - zephir_array_fetch_string(&_32$$20, &index, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 521); + zephir_array_fetch_string(&_31$$20, &index, SL("columns"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 551); + zephir_array_fetch_string(&_32$$20, &index, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 553); ZEPHIR_CALL_METHOD(NULL, &_30$$20, "__construct", &_29, 32, &name, &_31$$20, &_32$$20); zephir_check_call_status(); zephir_array_update_zval(&indexObjects, &name, &_30$$20, PH_COPY | PH_SEPARATE); @@ -1283,50 +1337,50 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeReferences) ZVAL_LONG(&_3, 3); ZEPHIR_CALL_METHOD(&_0, this_ptr, "fetchall", NULL, 0, &_2, &_3); zephir_check_call_status(); - zephir_is_iterable(&_0, 0, "phalcon/Db/Adapter/Pdo/Mysql.zep", 577); + zephir_is_iterable(&_0, 0, "phalcon/Db/Adapter/Pdo/Mysql.zep", 609); if (Z_TYPE_P(&_0) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _4) { ZEPHIR_INIT_NVAR(&reference); ZVAL_COPY(&reference, _4); - zephir_array_fetch_long(&constraintName, &reference, 2, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 546); + zephir_array_fetch_long(&constraintName, &reference, 2, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 578); if (!(zephir_array_isset(&references, &constraintName))) { ZEPHIR_OBS_NVAR(&referencedSchema); - zephir_array_fetch_long(&referencedSchema, &reference, 3, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 549); + zephir_array_fetch_long(&referencedSchema, &reference, 3, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 581); ZEPHIR_OBS_NVAR(&referencedTable); - zephir_array_fetch_long(&referencedTable, &reference, 4, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 550); + zephir_array_fetch_long(&referencedTable, &reference, 4, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 582); ZEPHIR_OBS_NVAR(&referenceUpdate); - zephir_array_fetch_long(&referenceUpdate, &reference, 6, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 551); + zephir_array_fetch_long(&referenceUpdate, &reference, 6, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 583); ZEPHIR_OBS_NVAR(&referenceDelete); - zephir_array_fetch_long(&referenceDelete, &reference, 7, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 552); + zephir_array_fetch_long(&referenceDelete, &reference, 7, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 584); ZEPHIR_INIT_NVAR(&columns); array_init(&columns); ZEPHIR_INIT_NVAR(&referencedColumns); array_init(&referencedColumns); } else { - zephir_array_fetch(&_6$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 556); + zephir_array_fetch(&_6$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 588); ZEPHIR_OBS_NVAR(&referencedSchema); - zephir_array_fetch_string(&referencedSchema, &_6$$5, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 556); - zephir_array_fetch(&_7$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 557); + zephir_array_fetch_string(&referencedSchema, &_6$$5, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 588); + zephir_array_fetch(&_7$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 589); ZEPHIR_OBS_NVAR(&referencedTable); - zephir_array_fetch_string(&referencedTable, &_7$$5, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 557); - zephir_array_fetch(&_8$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 558); + zephir_array_fetch_string(&referencedTable, &_7$$5, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 589); + zephir_array_fetch(&_8$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 590); ZEPHIR_OBS_NVAR(&columns); - zephir_array_fetch_string(&columns, &_8$$5, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 558); - zephir_array_fetch(&_9$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 559); + zephir_array_fetch_string(&columns, &_8$$5, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 590); + zephir_array_fetch(&_9$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 591); ZEPHIR_OBS_NVAR(&referencedColumns); - zephir_array_fetch_string(&referencedColumns, &_9$$5, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 559); - zephir_array_fetch(&_10$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 560); + zephir_array_fetch_string(&referencedColumns, &_9$$5, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 591); + zephir_array_fetch(&_10$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 592); ZEPHIR_OBS_NVAR(&referenceUpdate); - zephir_array_fetch_string(&referenceUpdate, &_10$$5, SL("onUpdate"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 560); - zephir_array_fetch(&_11$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 561); + zephir_array_fetch_string(&referenceUpdate, &_10$$5, SL("onUpdate"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 592); + zephir_array_fetch(&_11$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 593); ZEPHIR_OBS_NVAR(&referenceDelete); - zephir_array_fetch_string(&referenceDelete, &_11$$5, SL("onDelete"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 561); + zephir_array_fetch_string(&referenceDelete, &_11$$5, SL("onDelete"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 593); } - zephir_array_fetch_long(&_12$$3, &reference, 1, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 564); - zephir_array_append(&columns, &_12$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Mysql.zep", 564); - zephir_array_fetch_long(&_13$$3, &reference, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 565); - zephir_array_append(&referencedColumns, &_13$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Mysql.zep", 565); + zephir_array_fetch_long(&_12$$3, &reference, 1, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 596); + zephir_array_append(&columns, &_12$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Mysql.zep", 596); + zephir_array_fetch_long(&_13$$3, &reference, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 597); + zephir_array_append(&referencedColumns, &_13$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Mysql.zep", 597); ZEPHIR_INIT_NVAR(&_14$$3); zephir_create_array(&_14$$3, 6, 0); zephir_array_update_string(&_14$$3, SL("referencedSchema"), &referencedSchema, PH_COPY | PH_SEPARATE); @@ -1349,44 +1403,44 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeReferences) ZEPHIR_CALL_METHOD(&reference, &_0, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&constraintName); - zephir_array_fetch_long(&constraintName, &reference, 2, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 546); + zephir_array_fetch_long(&constraintName, &reference, 2, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 578); if (!(zephir_array_isset(&references, &constraintName))) { ZEPHIR_OBS_NVAR(&referencedSchema); - zephir_array_fetch_long(&referencedSchema, &reference, 3, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 549); + zephir_array_fetch_long(&referencedSchema, &reference, 3, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 581); ZEPHIR_OBS_NVAR(&referencedTable); - zephir_array_fetch_long(&referencedTable, &reference, 4, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 550); + zephir_array_fetch_long(&referencedTable, &reference, 4, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 582); ZEPHIR_OBS_NVAR(&referenceUpdate); - zephir_array_fetch_long(&referenceUpdate, &reference, 6, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 551); + zephir_array_fetch_long(&referenceUpdate, &reference, 6, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 583); ZEPHIR_OBS_NVAR(&referenceDelete); - zephir_array_fetch_long(&referenceDelete, &reference, 7, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 552); + zephir_array_fetch_long(&referenceDelete, &reference, 7, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 584); ZEPHIR_INIT_NVAR(&columns); array_init(&columns); ZEPHIR_INIT_NVAR(&referencedColumns); array_init(&referencedColumns); } else { - zephir_array_fetch(&_15$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 556); + zephir_array_fetch(&_15$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 588); ZEPHIR_OBS_NVAR(&referencedSchema); - zephir_array_fetch_string(&referencedSchema, &_15$$8, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 556); - zephir_array_fetch(&_16$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 557); + zephir_array_fetch_string(&referencedSchema, &_15$$8, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 588); + zephir_array_fetch(&_16$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 589); ZEPHIR_OBS_NVAR(&referencedTable); - zephir_array_fetch_string(&referencedTable, &_16$$8, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 557); - zephir_array_fetch(&_17$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 558); + zephir_array_fetch_string(&referencedTable, &_16$$8, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 589); + zephir_array_fetch(&_17$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 590); ZEPHIR_OBS_NVAR(&columns); - zephir_array_fetch_string(&columns, &_17$$8, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 558); - zephir_array_fetch(&_18$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 559); + zephir_array_fetch_string(&columns, &_17$$8, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 590); + zephir_array_fetch(&_18$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 591); ZEPHIR_OBS_NVAR(&referencedColumns); - zephir_array_fetch_string(&referencedColumns, &_18$$8, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 559); - zephir_array_fetch(&_19$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 560); + zephir_array_fetch_string(&referencedColumns, &_18$$8, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 591); + zephir_array_fetch(&_19$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 592); ZEPHIR_OBS_NVAR(&referenceUpdate); - zephir_array_fetch_string(&referenceUpdate, &_19$$8, SL("onUpdate"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 560); - zephir_array_fetch(&_20$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 561); + zephir_array_fetch_string(&referenceUpdate, &_19$$8, SL("onUpdate"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 592); + zephir_array_fetch(&_20$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 593); ZEPHIR_OBS_NVAR(&referenceDelete); - zephir_array_fetch_string(&referenceDelete, &_20$$8, SL("onDelete"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 561); + zephir_array_fetch_string(&referenceDelete, &_20$$8, SL("onDelete"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 593); } - zephir_array_fetch_long(&_21$$6, &reference, 1, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 564); - zephir_array_append(&columns, &_21$$6, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Mysql.zep", 564); - zephir_array_fetch_long(&_22$$6, &reference, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 565); - zephir_array_append(&referencedColumns, &_22$$6, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Mysql.zep", 565); + zephir_array_fetch_long(&_21$$6, &reference, 1, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 596); + zephir_array_append(&columns, &_21$$6, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Mysql.zep", 596); + zephir_array_fetch_long(&_22$$6, &reference, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 597); + zephir_array_append(&referencedColumns, &_22$$6, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Mysql.zep", 597); ZEPHIR_INIT_NVAR(&_23$$6); zephir_create_array(&_23$$6, 6, 0); zephir_array_update_string(&_23$$6, SL("referencedSchema"), &referencedSchema, PH_COPY | PH_SEPARATE); @@ -1403,7 +1457,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeReferences) ZEPHIR_INIT_NVAR(&reference); ZEPHIR_INIT_VAR(&referenceObjects); array_init(&referenceObjects); - zephir_is_iterable(&references, 0, "phalcon/Db/Adapter/Pdo/Mysql.zep", 592); + zephir_is_iterable(&references, 0, "phalcon/Db/Adapter/Pdo/Mysql.zep", 624); if (Z_TYPE_P(&references) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&references), _26, _27, _24) { @@ -1420,22 +1474,22 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeReferences) ZEPHIR_INIT_NVAR(&_29$$9); zephir_create_array(&_29$$9, 6, 0); ZEPHIR_OBS_NVAR(&_30$$9); - zephir_array_fetch_string(&_30$$9, &arrayReference, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 582); + zephir_array_fetch_string(&_30$$9, &arrayReference, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 614); zephir_array_update_string(&_29$$9, SL("referencedSchema"), &_30$$9, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_30$$9); - zephir_array_fetch_string(&_30$$9, &arrayReference, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 583); + zephir_array_fetch_string(&_30$$9, &arrayReference, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 615); zephir_array_update_string(&_29$$9, SL("referencedTable"), &_30$$9, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_30$$9); - zephir_array_fetch_string(&_30$$9, &arrayReference, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 584); + zephir_array_fetch_string(&_30$$9, &arrayReference, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 616); zephir_array_update_string(&_29$$9, SL("columns"), &_30$$9, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_30$$9); - zephir_array_fetch_string(&_30$$9, &arrayReference, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 585); + zephir_array_fetch_string(&_30$$9, &arrayReference, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 617); zephir_array_update_string(&_29$$9, SL("referencedColumns"), &_30$$9, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_30$$9); - zephir_array_fetch_string(&_30$$9, &arrayReference, SL("onUpdate"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 586); + zephir_array_fetch_string(&_30$$9, &arrayReference, SL("onUpdate"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 618); zephir_array_update_string(&_29$$9, SL("onUpdate"), &_30$$9, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_30$$9); - zephir_array_fetch_string(&_30$$9, &arrayReference, SL("onDelete"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 588); + zephir_array_fetch_string(&_30$$9, &arrayReference, SL("onDelete"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 620); zephir_array_update_string(&_29$$9, SL("onDelete"), &_30$$9, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &_28$$9, "__construct", &_31, 33, &name, &_29$$9); zephir_check_call_status(); @@ -1459,22 +1513,22 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeReferences) ZEPHIR_INIT_NVAR(&_33$$10); zephir_create_array(&_33$$10, 6, 0); ZEPHIR_OBS_NVAR(&_34$$10); - zephir_array_fetch_string(&_34$$10, &arrayReference, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 582); + zephir_array_fetch_string(&_34$$10, &arrayReference, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 614); zephir_array_update_string(&_33$$10, SL("referencedSchema"), &_34$$10, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_34$$10); - zephir_array_fetch_string(&_34$$10, &arrayReference, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 583); + zephir_array_fetch_string(&_34$$10, &arrayReference, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 615); zephir_array_update_string(&_33$$10, SL("referencedTable"), &_34$$10, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_34$$10); - zephir_array_fetch_string(&_34$$10, &arrayReference, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 584); + zephir_array_fetch_string(&_34$$10, &arrayReference, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 616); zephir_array_update_string(&_33$$10, SL("columns"), &_34$$10, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_34$$10); - zephir_array_fetch_string(&_34$$10, &arrayReference, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 585); + zephir_array_fetch_string(&_34$$10, &arrayReference, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 617); zephir_array_update_string(&_33$$10, SL("referencedColumns"), &_34$$10, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_34$$10); - zephir_array_fetch_string(&_34$$10, &arrayReference, SL("onUpdate"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 586); + zephir_array_fetch_string(&_34$$10, &arrayReference, SL("onUpdate"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 618); zephir_array_update_string(&_33$$10, SL("onUpdate"), &_34$$10, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_34$$10); - zephir_array_fetch_string(&_34$$10, &arrayReference, SL("onDelete"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 588); + zephir_array_fetch_string(&_34$$10, &arrayReference, SL("onDelete"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 620); zephir_array_update_string(&_33$$10, SL("onDelete"), &_34$$10, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &_32$$10, "__construct", &_31, 33, &name, &_33$$10); zephir_check_call_status(); diff --git a/ext/phalcon/db/adapter/pdo/mysql.zep.h b/ext/phalcon/db/adapter/pdo/mysql.zep.h index 8c40c9b752f..8eb6974f0ed 100644 --- a/ext/phalcon/db/adapter/pdo/mysql.zep.h +++ b/ext/phalcon/db/adapter/pdo/mysql.zep.h @@ -3,12 +3,17 @@ extern zend_class_entry *phalcon_db_adapter_pdo_mysql_ce; ZEPHIR_INIT_CLASS(Phalcon_Db_Adapter_Pdo_Mysql); +PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, __construct); PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, addForeignKey); PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns); PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes); PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeReferences); PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, getDsnDefaults); +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_adapter_pdo_mysql___construct, 0, 0, 1) + ZEND_ARG_ARRAY_INFO(0, descriptor, 0) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_adapter_pdo_mysql_addforeignkey, 0, 3, _IS_BOOL, 0) ZEND_ARG_TYPE_INFO(0, tableName, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, schemaName, IS_STRING, 0) @@ -34,6 +39,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_adapter_pdo_mysql_get ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_db_adapter_pdo_mysql_method_entry) { + PHP_ME(Phalcon_Db_Adapter_Pdo_Mysql, __construct, arginfo_phalcon_db_adapter_pdo_mysql___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) PHP_ME(Phalcon_Db_Adapter_Pdo_Mysql, addForeignKey, arginfo_phalcon_db_adapter_pdo_mysql_addforeignkey, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns, arginfo_phalcon_db_adapter_pdo_mysql_describecolumns, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes, arginfo_phalcon_db_adapter_pdo_mysql_describeindexes, ZEND_ACC_PUBLIC) diff --git a/ext/phalcon/db/adapter/pdo/postgresql.zep.c b/ext/phalcon/db/adapter/pdo/postgresql.zep.c index 61ba18fa6af..81a263864b4 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, 207, &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, 207, &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); diff --git a/ext/phalcon/db/adapter/pdo/sqlite.zep.c b/ext/phalcon/db/adapter/pdo/sqlite.zep.c index 21277b9f530..d70a75ce5b4 100644 --- a/ext/phalcon/db/adapter/pdo/sqlite.zep.c +++ b/ext/phalcon/db/adapter/pdo/sqlite.zep.c @@ -452,7 +452,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", 307); ZEPHIR_INIT_NVAR(&_31$$3); object_init_ex(&_31$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_31$$3, "__construct", &_41, 206, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_31$$3, "__construct", &_41, 207, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_31$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 308); ZEPHIR_CPY_WRT(&oldColumn, &columnName); @@ -616,7 +616,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) zephir_array_fetch_long(&columnName, &field, 1, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 307); ZEPHIR_INIT_NVAR(&_69$$28); object_init_ex(&_69$$28, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_69$$28, "__construct", &_41, 206, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_69$$28, "__construct", &_41, 207, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_69$$28, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 308); ZEPHIR_CPY_WRT(&oldColumn, &columnName); diff --git a/ext/phalcon/db/dialect/mysql.zep.c b/ext/phalcon/db/dialect/mysql.zep.c index 687e25cbb1b..109c1a54326 100644 --- a/ext/phalcon/db/dialect/mysql.zep.c +++ b/ext/phalcon/db/dialect/mysql.zep.c @@ -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, 208, &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, 209, &defaultValue, &_11$$7); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_13$$7); ZEPHIR_CONCAT_SVS(&_13$$7, " DEFAULT \"", &_12$$7, "\""); @@ -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, 208, &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, 209, &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, 208, &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, 209, &defaultValue, &_33$$21); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_35$$21); ZEPHIR_CONCAT_SVS(&_35$$21, " DEFAULT \"", &_34$$21, "\""); @@ -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, 210, 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, 210, 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, 211, 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, 210, 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, 211, 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, 210, 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, 210, 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, 210, 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, 210, 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, 210, 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, 209, &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, 209, &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, 209, &typeValues, &_50$$64); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_52$$64); ZEPHIR_CONCAT_SVS(&_52$$64, "(\"", &_51$$64, "\")"); @@ -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, 208, &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, 209, &defaultValue, &_16$$10); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_18$$10); ZEPHIR_CONCAT_SVS(&_18$$10, " DEFAULT \"", &_17$$10, "\""); diff --git a/ext/phalcon/db/dialect/postgresql.zep.c b/ext/phalcon/db/dialect/postgresql.zep.c index 32d0152d46d..48cf77d2881 100644 --- a/ext/phalcon/db/dialect/postgresql.zep.c +++ b/ext/phalcon/db/dialect/postgresql.zep.c @@ -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, 209, &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, 209, &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, 209, &typeValues, &_21$$41); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_23$$41); ZEPHIR_CONCAT_SVS(&_23$$41, "('", &_22$$41, "')"); @@ -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, 209, &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 b75e2460107..688be03f372 100644 --- a/ext/phalcon/db/dialect/sqlite.zep.c +++ b/ext/phalcon/db/dialect/sqlite.zep.c @@ -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, 209, &defaultValue, &_7$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_9$$5); ZEPHIR_CONCAT_SVS(&_9$$5, " DEFAULT \"", &_8$$5, "\""); @@ -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, 209, &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, 209, &defaultValue, &_26$$20); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_28$$20); ZEPHIR_CONCAT_SVS(&_28$$20, " DEFAULT \"", &_27$$20, "\""); @@ -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, 209, &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, 209, &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, 209, &typeValues, &_21$$43); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_23$$43); ZEPHIR_CONCAT_SVS(&_23$$43, "(\"", &_22$$43, "\")"); diff --git a/ext/phalcon/db/profiler.zep.c b/ext/phalcon/db/profiler.zep.c index ae63424acdf..cf3ba868d0b 100644 --- a/ext/phalcon/db/profiler.zep.c +++ b/ext/phalcon/db/profiler.zep.c @@ -223,19 +223,19 @@ 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, 212, &sqlStatement); zephir_check_call_status(); if (Z_TYPE_P(sqlVariables) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlvariables", NULL, 212, sqlVariables); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlvariables", NULL, 213, sqlVariables); zephir_check_call_status(); } if (Z_TYPE_P(sqlBindTypes) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlbindtypes", NULL, 213, sqlBindTypes); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlbindtypes", NULL, 214, sqlBindTypes); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_0, "hrtime", NULL, 196, &__$true); + ZEPHIR_CALL_FUNCTION(&_0, "hrtime", NULL, 197, &__$true); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setinitialtime", NULL, 214, &_0); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setinitialtime", NULL, 215, &_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); @@ -266,7 +266,7 @@ PHP_METHOD(Phalcon_Db_Profiler, stopProfile) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_FUNCTION(&finalTime, "hrtime", NULL, 196, &__$true); + ZEPHIR_CALL_FUNCTION(&finalTime, "hrtime", NULL, 197, &__$true); zephir_check_call_status(); zephir_read_property(&_0, this_ptr, ZEND_STRL("activeProfile"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&activeProfile, &_0); diff --git a/ext/phalcon/di/service.zep.c b/ext/phalcon/di/service.zep.c index 382f18fa774..308850f4050 100644 --- a/ext/phalcon/di/service.zep.c +++ b/ext/phalcon/di/service.zep.c @@ -298,7 +298,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, 216, 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 6931b19261b..f46b5ceab68 100644 --- a/ext/phalcon/di/service/builder.zep.c +++ b/ext/phalcon/di/service/builder.zep.c @@ -149,7 +149,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, 217, container, &arguments); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&instance); ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params(&instance, &className, &_0$$8); @@ -224,7 +224,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build) } if (zephir_fast_count_int(&arguments)) { ZEPHIR_INIT_NVAR(&_12$$18); - ZEPHIR_CALL_METHOD(&_13$$18, this_ptr, "buildparameters", NULL, 216, container, &arguments); + ZEPHIR_CALL_METHOD(&_13$$18, this_ptr, "buildparameters", NULL, 217, container, &arguments); zephir_check_call_status(); ZEPHIR_CALL_USER_FUNC_ARRAY(&_12$$18, &methodCall, &_13$$18); zephir_check_call_status(); @@ -291,7 +291,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build) } if (zephir_fast_count_int(&arguments)) { ZEPHIR_INIT_NVAR(&_22$$24); - ZEPHIR_CALL_METHOD(&_23$$24, this_ptr, "buildparameters", NULL, 216, container, &arguments); + ZEPHIR_CALL_METHOD(&_23$$24, this_ptr, "buildparameters", NULL, 217, container, &arguments); zephir_check_call_status(); ZEPHIR_CALL_USER_FUNC_ARRAY(&_22$$24, &methodCall, &_23$$24); zephir_check_call_status(); @@ -365,7 +365,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_35$$28, this_ptr, "buildparameter", &_36, 217, container, &propertyPosition, &propertyValue); + ZEPHIR_CALL_METHOD(&_35$$28, this_ptr, "buildparameter", &_36, 218, container, &propertyPosition, &propertyValue); zephir_check_call_status(); zephir_update_property_zval_zval(&instance, &propertyName, &_35$$28); } ZEND_HASH_FOREACH_END(); @@ -417,7 +417,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_43$$32, this_ptr, "buildparameter", &_36, 217, container, &propertyPosition, &propertyValue); + ZEPHIR_CALL_METHOD(&_43$$32, this_ptr, "buildparameter", &_36, 218, container, &propertyPosition, &propertyValue); zephir_check_call_status(); zephir_update_property_zval_zval(&instance, &propertyName, &_43$$32); ZEPHIR_CALL_METHOD(NULL, ¶mCalls, "next", NULL, 0); @@ -631,7 +631,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, 218, container, &position, &argument); zephir_check_call_status(); zephir_array_append(&buildArguments, &_4$$3, PH_SEPARATE, "phalcon/Di/Service/Builder.zep", 319); } ZEND_HASH_FOREACH_END(); @@ -648,7 +648,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, 218, container, &position, &argument); zephir_check_call_status(); zephir_array_append(&buildArguments, &_6$$4, PH_SEPARATE, "phalcon/Di/Service/Builder.zep", 319); ZEPHIR_CALL_METHOD(NULL, &arguments, "next", NULL, 0); diff --git a/ext/phalcon/encryption/crypt.zep.c b/ext/phalcon/encryption/crypt.zep.c index f1f27b1dd97..890c700f197 100644 --- a/ext/phalcon/encryption/crypt.zep.c +++ b/ext/phalcon/encryption/crypt.zep.c @@ -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, 219); 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, 220); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 220, &mode); + ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 221, &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, 222, &input, &_0, &ivLength, &_1); zephir_check_call_status(); ZEPHIR_INIT_VAR(&digest); ZVAL_STRING(&digest, ""); @@ -320,24 +320,24 @@ PHP_METHOD(Phalcon_Encryption_Crypt, decrypt) if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { ZEPHIR_INIT_VAR(&_2$$5); ZVAL_STRING(&_2$$5, ""); - ZEPHIR_CALL_FUNCTION(&_3$$5, "hash", NULL, 222, &hashAlgorithm, &_2$$5, &__$true); + ZEPHIR_CALL_FUNCTION(&_3$$5, "hash", NULL, 223, &hashAlgorithm, &_2$$5, &__$true); zephir_check_call_status(); ZEPHIR_INIT_VAR(&hashLength); ZVAL_LONG(&hashLength, zephir_fast_strlen_ev(&_3$$5)); ZEPHIR_INIT_NVAR(&_2$$5); ZVAL_STRING(&_2$$5, "8bit"); - ZEPHIR_CALL_FUNCTION(&digest, "mb_substr", NULL, 221, &input, &ivLength, &hashLength, &_2$$5); + ZEPHIR_CALL_FUNCTION(&digest, "mb_substr", NULL, 222, &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, 222, &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, 222, &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, 223, &hashAlgorithm, &padded, &decryptKey, &__$true); + ZEPHIR_CALL_FUNCTION(&_8$$7, "hash_hmac", NULL, 224, &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, 224, &input); + ZEPHIR_CALL_FUNCTION(&_5, "base64_decode", NULL, 225, &input); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "decrypt", NULL, 0, &_5, &key); zephir_check_call_status(); @@ -511,11 +511,11 @@ 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, 220); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 220, &mode); + ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 221, &mode); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&iv, "openssl_random_pseudo_bytes", NULL, 225, &ivLength); + ZEPHIR_CALL_FUNCTION(&iv, "openssl_random_pseudo_bytes", NULL, 226, &ivLength); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&iv)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_crypt_exception_exception_ce, "Cannot calculate Random Pseudo Bytes", "phalcon/Encryption/Crypt.zep", 295); @@ -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, 223, &_2$$6, &padded, &encryptKey, &__$true); + ZEPHIR_CALL_FUNCTION(&digest, "hash_hmac", NULL, 224, &_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, 226, &_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, 226, &_5); + ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 227, &_5); zephir_check_call_status(); RETURN_MM(); } @@ -686,11 +686,11 @@ PHP_METHOD(Phalcon_Encryption_Crypt, getAvailableHashAlgorithms) ZEPHIR_MM_GROW(); if (1 == (zephir_function_exists_ex(ZEND_STRL("hash_hmac_algos")) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("hash_hmac_algos", NULL, 227); + ZEPHIR_RETURN_CALL_FUNCTION("hash_hmac_algos", NULL, 228); zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_RETURN_CALL_FUNCTION("hash_algos", NULL, 228); + ZEPHIR_RETURN_CALL_FUNCTION("hash_algos", NULL, 229); zephir_check_call_status(); RETURN_MM(); } @@ -863,7 +863,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, 229, &cipher); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getivlength", NULL, 230, &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); @@ -1154,10 +1154,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, 230, &_1, &mode); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkismode", NULL, 231, &_1, &mode); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - ZEPHIR_CALL_FUNCTION(&_3$$3, "mb_strlen", NULL, 231, &input); + ZEPHIR_CALL_FUNCTION(&_3$$3, "mb_strlen", NULL, 232, &input); zephir_check_call_status(); paddingSize = (blockSize - zephir_safe_mod_zval_long(&_3$$3, blockSize)); _4$$3 = paddingSize >= 256; @@ -1265,7 +1265,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, 230, &_3, &mode); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkismode", NULL, 231, &_3, &mode); zephir_check_call_status(); _1 = ZEPHIR_IS_TRUE_IDENTICAL(&_2); } @@ -1350,7 +1350,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, 230, &_1, &mode); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkismode", NULL, 231, &_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); @@ -1427,7 +1427,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, 230, &_2, &mode); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "checkismode", NULL, 231, &_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); @@ -1442,11 +1442,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, 232, &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, 232, &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)) { @@ -1510,7 +1510,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, 230, &_3, &mode); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkismode", NULL, 231, &_3, &mode); zephir_check_call_status(); _1 = ZEPHIR_IS_TRUE_IDENTICAL(&_2); } @@ -1588,7 +1588,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, 230, &_2, &mode); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "checkismode", NULL, 231, &_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); @@ -1603,13 +1603,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, 233, &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, 233, &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)) { @@ -1648,7 +1648,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", 871); return; } - ZEPHIR_CALL_FUNCTION(&available, "openssl_get_cipher_methods", NULL, 234, &__$true); + ZEPHIR_CALL_FUNCTION(&available, "openssl_get_cipher_methods", NULL, 235, &__$true); zephir_check_call_status(); ZEPHIR_INIT_VAR(&allowed); array_init(&allowed); @@ -1789,9 +1789,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, 235, &_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, 229, &_4); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getivlength", NULL, 230, &_4); zephir_check_call_status(); RETURN_MM(); } @@ -1827,7 +1827,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, getIvLength) zephir_get_strval(&cipher, cipher_param); - ZEPHIR_CALL_FUNCTION(&length, "openssl_cipher_iv_length", NULL, 236, &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", 941); diff --git a/ext/phalcon/encryption/crypt/padding/ansi.zep.c b/ext/phalcon/encryption/crypt/padding/ansi.zep.c index 61363c1c027..51bf43ec097 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, 238, &_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, 238, &_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, 239, &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, 238, &_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 5008e604e95..4b58bca5943 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, 240); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_5$$3, "chr", &_6, 237, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "chr", &_6, 238, &_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, 238, &_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, 239, &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 6a6bab8e0ca..d14f0182bf4 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, 238, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_FUNCTION(&_2, "chr", NULL, 237, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "chr", NULL, 238, &_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, 231, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 232, &input); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 112, &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, 238, &_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, 238, &_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 c80f7e936fb..004ebe3ad9d 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, 238, &_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, 231, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 232, &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, 239, &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, 238, &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 8ca6edeb6d9..17ac0cbb260 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, 231, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 232, &input); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 112, &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, 238, &_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 ac324efbe7f..dc8c9e57466 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, 238, &_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, 231, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 232, &input); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 112, &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, 238, &_2); zephir_check_call_status(); _0 = ZEPHIR_IS_EQUAL(&_1, &_3); } diff --git a/ext/phalcon/encryption/security.zep.c b/ext/phalcon/encryption/security.zep.c index 0ef3d5628d2..012c3c2b1fa 100644 --- a/ext/phalcon/encryption/security.zep.c +++ b/ext/phalcon/encryption/security.zep.c @@ -19,6 +19,7 @@ #include "kernel/operators.h" #include "kernel/exception.h" #include "kernel/concat.h" +#include "kernel/array.h" #include "ext/spl/spl_exceptions.h" @@ -52,9 +53,9 @@ ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security) ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Encryption, Security, phalcon, encryption_security, phalcon_di_abstractinjectionaware_ce, phalcon_encryption_security_method_entry, 0); /** - * @var int|null + * @var int */ - zend_declare_property_null(phalcon_encryption_security_ce, SL("defaultHash"), ZEND_ACC_PROTECTED); + zend_declare_property_long(phalcon_encryption_security_ce, SL("defaultHash"), 0, ZEND_ACC_PROTECTED); /** * @var int */ @@ -95,6 +96,12 @@ ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security) * @var RequestInterface|null */ zend_declare_property_null(phalcon_encryption_security_ce, SL("localRequest"), ZEND_ACC_PRIVATE); + zephir_declare_class_constant_long(phalcon_encryption_security_ce, SL("CRYPT_ARGON2I"), 10); + + zephir_declare_class_constant_long(phalcon_encryption_security_ce, SL("CRYPT_ARGON2ID"), 11); + + zephir_declare_class_constant_long(phalcon_encryption_security_ce, SL("CRYPT_BCRYPT"), 0); + zephir_declare_class_constant_long(phalcon_encryption_security_ce, SL("CRYPT_DEFAULT"), 0); zephir_declare_class_constant_long(phalcon_encryption_security_ce, SL("CRYPT_BLOWFISH"), 4); @@ -130,7 +137,10 @@ PHP_METHOD(Phalcon_Encryption_Security, getWorkFactor) } /** - * Phalcon\Security constructor + * Security constructor. + * + * @param SessionInterface|null $session + * @param RequestInterface|null $request */ PHP_METHOD(Phalcon_Encryption_Security, __construct) { @@ -181,24 +191,24 @@ PHP_METHOD(Phalcon_Encryption_Security, __construct) /** * Checks a plain text password and its hash version to check if the * password matches + * + * @param string $password + * @param string $passwordHash + * @param int $maxPassLength + * + * @return bool */ PHP_METHOD(Phalcon_Encryption_Security, checkHash) { - unsigned char _4$$4; - long _3; zend_bool _0; - char ch = 0; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long maxPassLength, ZEPHIR_LAST_CALL_STATUS, i = 0, sum = 0, cryptedLength = 0, passwordLength = 0; - zval *password_param = NULL, *passwordHash_param = NULL, *maxPassLength_param = NULL, _1; - zval password, passwordHash, cryptedHash, _2; + zend_long maxPassLength, ZEPHIR_LAST_CALL_STATUS; + zval *password_param = NULL, *passwordHash_param = NULL, *maxPassLength_param = NULL; + zval password, passwordHash; zval *this_ptr = getThis(); ZVAL_UNDEF(&password); ZVAL_UNDEF(&passwordHash); - ZVAL_UNDEF(&cryptedHash); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_1); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 3) @@ -228,50 +238,42 @@ PHP_METHOD(Phalcon_Encryption_Security, checkHash) if (_0) { RETURN_MM_BOOL(0); } - ZEPHIR_CALL_FUNCTION(&_1, "crypt", NULL, 240, &password, &passwordHash); + ZEPHIR_RETURN_CALL_FUNCTION("password_verify", NULL, 241, &password, &passwordHash); zephir_check_call_status(); - zephir_cast_to_string(&_2, &_1); - ZEPHIR_CPY_WRT(&cryptedHash, &_2); - cryptedLength = zephir_fast_strlen_ev(&cryptedHash); - passwordLength = zephir_fast_strlen_ev(&passwordHash); - zephir_concat_self(&cryptedHash, &passwordHash); - sum = (cryptedLength - passwordLength); - for (_3 = 0; _3 < Z_STRLEN_P(&passwordHash); _3++) { - i = _3; - ch = ZEPHIR_STRING_OFFSET(&passwordHash, _3); - _4$$4 = ZEPHIR_STRING_OFFSET(&cryptedHash, i); - sum = (sum | ((_4$$4 ^ ch))); - } - RETURN_MM_BOOL(0 == sum); + RETURN_MM(); } /** * Check if the CSRF token sent in the request is the same that the current * in session + * + * @param string|null $tokenKey + * @param mixed|null $tokenValue + * @param bool $destroyIfValid + * + * @return bool */ PHP_METHOD(Phalcon_Encryption_Security, checkToken) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zend_bool destroyIfValid, _0, _3; - zval *tokenKey = NULL, tokenKey_sub, *tokenValue = NULL, tokenValue_sub, *destroyIfValid_param = NULL, __$null, session, request, equals, userToken, knownToken, _1$$3, _2$$5; + zend_bool destroyIfValid, _1, _2; + zval *tokenKey_param = NULL, *tokenValue = NULL, tokenValue_sub, *destroyIfValid_param = NULL, __$null, equals, knownToken, userToken, _0; + zval tokenKey; zval *this_ptr = getThis(); - ZVAL_UNDEF(&tokenKey_sub); + ZVAL_UNDEF(&tokenKey); ZVAL_UNDEF(&tokenValue_sub); ZVAL_NULL(&__$null); - ZVAL_UNDEF(&session); - ZVAL_UNDEF(&request); ZVAL_UNDEF(&equals); - ZVAL_UNDEF(&userToken); ZVAL_UNDEF(&knownToken); - ZVAL_UNDEF(&_1$$3); - ZVAL_UNDEF(&_2$$5); + ZVAL_UNDEF(&userToken); + ZVAL_UNDEF(&_0); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 3) Z_PARAM_OPTIONAL - Z_PARAM_ZVAL_OR_NULL(tokenKey) + Z_PARAM_STR_OR_NULL(tokenKey) Z_PARAM_ZVAL_OR_NULL(tokenValue) Z_PARAM_BOOL(destroyIfValid) ZEND_PARSE_PARAMETERS_END(); @@ -279,12 +281,11 @@ PHP_METHOD(Phalcon_Encryption_Security, checkToken) ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 0, 3, &tokenKey, &tokenValue, &destroyIfValid_param); - if (!tokenKey) { - tokenKey = &tokenKey_sub; - ZEPHIR_CPY_WRT(tokenKey, &__$null); + zephir_fetch_params(1, 0, 3, &tokenKey_param, &tokenValue, &destroyIfValid_param); + if (!tokenKey_param) { + ZEPHIR_INIT_VAR(&tokenKey); } else { - ZEPHIR_SEPARATE_PARAM(tokenKey); + zephir_get_strval(&tokenKey, tokenKey_param); } if (!tokenValue) { tokenValue = &tokenValue_sub; @@ -297,43 +298,31 @@ PHP_METHOD(Phalcon_Encryption_Security, checkToken) } - ZEPHIR_CALL_METHOD(&session, this_ptr, "getlocalsession", NULL, 241); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "processtokenkey", NULL, 242, &tokenKey); zephir_check_call_status(); - _0 = zephir_is_true(&session); - if (_0) { - _0 = !zephir_is_true(tokenKey); - } - if (EXPECTED(_0)) { - zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("tokenKeySessionId"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(tokenKey, &session, "get", NULL, 0, &_1$$3); - zephir_check_call_status(); - } - if (!(zephir_is_true(tokenKey))) { + zephir_get_strval(&tokenKey, &_0); + if (!(!(ZEPHIR_IS_EMPTY(&tokenKey)))) { RETURN_MM_BOOL(0); } - if (!(zephir_is_true(tokenValue))) { - ZEPHIR_CALL_METHOD(&request, this_ptr, "getlocalrequest", NULL, 242); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_2$$5); - ZVAL_STRING(&_2$$5, "string"); - ZEPHIR_CALL_METHOD(&userToken, &request, "getpost", NULL, 0, tokenKey, &_2$$5); - zephir_check_call_status(); - } else { - ZEPHIR_CPY_WRT(&userToken, tokenValue); - } + ZEPHIR_CALL_METHOD(&userToken, this_ptr, "processusertoken", NULL, 243, &tokenKey, tokenValue); + zephir_check_call_status(); ZEPHIR_CALL_METHOD(&knownToken, this_ptr, "getrequesttoken", NULL, 0); zephir_check_call_status(); - if (Z_TYPE_P(&knownToken) == IS_NULL) { + _1 = Z_TYPE_P(&knownToken) == IS_NULL; + if (!(_1)) { + _1 = Z_TYPE_P(&userToken) == IS_NULL; + } + if (_1) { RETURN_MM_BOOL(0); } ZEPHIR_INIT_VAR(&equals); ZEPHIR_INIT_NVAR(&equals); ZVAL_BOOL(&equals, zephir_hash_equals(&knownToken, &userToken)); - _3 = zephir_is_true(&equals); - if (_3) { - _3 = destroyIfValid; + _2 = zephir_is_true(&equals); + if (_2) { + _2 = destroyIfValid; } - if (_3) { + if (_2) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "destroytoken", NULL, 0); zephir_check_call_status(); } @@ -342,6 +331,14 @@ PHP_METHOD(Phalcon_Encryption_Security, checkToken) /** * Computes a HMAC + * + * @param string $data + * @param string $key + * @param string $algo + * @param bool $raw + * + * @return string + * @throws Exception */ PHP_METHOD(Phalcon_Encryption_Security, computeHmac) { @@ -385,7 +382,7 @@ PHP_METHOD(Phalcon_Encryption_Security, computeHmac) ZVAL_BOOL(&_0, (raw ? 1 : 0)); - ZEPHIR_CALL_FUNCTION(&hmac, "hash_hmac", NULL, 223, &algo, &data, &key, &_0); + ZEPHIR_CALL_FUNCTION(&hmac, "hash_hmac", NULL, 224, &algo, &data, &key, &_0); zephir_check_call_status(); if (UNEXPECTED(!zephir_is_true(&hmac))) { ZEPHIR_INIT_VAR(&_1$$3); @@ -396,7 +393,7 @@ PHP_METHOD(Phalcon_Encryption_Security, computeHmac) zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 8, &_3$$3); zephir_check_call_status(); - zephir_throw_exception_debug(&_1$$3, "phalcon/Encryption/Security.zep", 215); + zephir_throw_exception_debug(&_1$$3, "phalcon/Encryption/Security.zep", 219); ZEPHIR_MM_RESTORE(); return; } @@ -409,26 +406,32 @@ PHP_METHOD(Phalcon_Encryption_Security, computeHmac) PHP_METHOD(Phalcon_Encryption_Security, destroyToken) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval __$null, session, _0$$3, _1$$3; + zval __$null, session, _0, _1, _2$$3, _3$$3; zend_long ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); ZVAL_NULL(&__$null); ZVAL_UNDEF(&session); - ZVAL_UNDEF(&_0$$3); - ZVAL_UNDEF(&_1$$3); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2$$3); + ZVAL_UNDEF(&_3$$3); ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&session, this_ptr, "getlocalsession", NULL, 241); + ZEPHIR_INIT_VAR(&_0); + ZVAL_STRING(&_0, "session"); + ZEPHIR_INIT_VAR(&_1); + ZVAL_STRING(&_1, "localSession"); + ZEPHIR_CALL_METHOD(&session, this_ptr, "getlocalservice", NULL, 0, &_0, &_1); zephir_check_call_status(); if (UNEXPECTED(zephir_is_true(&session))) { - zephir_read_property(&_0$$3, this_ptr, ZEND_STRL("tokenKeySessionId"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, &session, "remove", NULL, 0, &_0$$3); + zephir_read_property(&_2$$3, this_ptr, ZEND_STRL("tokenKeySessionId"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(NULL, &session, "remove", NULL, 0, &_2$$3); zephir_check_call_status(); - zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("tokenValueSessionId"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, &session, "remove", NULL, 0, &_1$$3); + zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("tokenValueSessionId"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(NULL, &session, "remove", NULL, 0, &_3$$3); zephir_check_call_status(); } zephir_update_property_zval(this_ptr, ZEND_STRL("token"), &__$null); @@ -439,6 +442,8 @@ PHP_METHOD(Phalcon_Encryption_Security, destroyToken) /** * Returns the default hash + * + * @return int */ PHP_METHOD(Phalcon_Encryption_Security, getDefaultHash) { @@ -449,6 +454,40 @@ PHP_METHOD(Phalcon_Encryption_Security, getDefaultHash) RETURN_MEMBER(getThis(), "defaultHash"); } +/** + * Returns information regarding a hash + * + * @param string $hash + * + * @return array + */ +PHP_METHOD(Phalcon_Encryption_Security, getHashInformation) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *hash_param = NULL; + zval hash; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&hash); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_STR(hash) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &hash_param); + zephir_get_strval(&hash, hash_param); + + + ZEPHIR_RETURN_CALL_FUNCTION("password_get_info", NULL, 244, &hash); + zephir_check_call_status(); + RETURN_MM(); +} + /** * Returns a secure random number generator instance */ @@ -500,25 +539,33 @@ PHP_METHOD(Phalcon_Encryption_Security, getRequestToken) /** * Returns the value of the CSRF token in session + * + * @return string|null */ PHP_METHOD(Phalcon_Encryption_Security, getSessionToken) { - zval session, _0$$3; + zval session, _0, _1, _2$$3; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); ZVAL_UNDEF(&session); - ZVAL_UNDEF(&_0$$3); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2$$3); ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&session, this_ptr, "getlocalsession", NULL, 241); + ZEPHIR_INIT_VAR(&_0); + ZVAL_STRING(&_0, "session"); + ZEPHIR_INIT_VAR(&_1); + ZVAL_STRING(&_1, "localSession"); + ZEPHIR_CALL_METHOD(&session, this_ptr, "getlocalservice", NULL, 0, &_0, &_1); zephir_check_call_status(); if (UNEXPECTED(zephir_is_true(&session))) { - zephir_read_property(&_0$$3, this_ptr, ZEND_STRL("tokenValueSessionId"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_METHOD(&session, "get", NULL, 0, &_0$$3); + zephir_read_property(&_2$$3, this_ptr, ZEND_STRL("tokenValueSessionId"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_RETURN_CALL_METHOD(&session, "get", NULL, 0, &_2$$3); zephir_check_call_status(); RETURN_MM(); } @@ -528,6 +575,11 @@ PHP_METHOD(Phalcon_Encryption_Security, getSessionToken) /** * Generate a >22-length pseudo random string to be used as salt for * passwords + * + * @param int $numberBytes + * + * @return string + * @throws Exception */ PHP_METHOD(Phalcon_Encryption_Security, getSaltBytes) { @@ -560,9 +612,8 @@ PHP_METHOD(Phalcon_Encryption_Security, getSaltBytes) if (!(numberBytes)) { - ZEPHIR_OBS_VAR(&_0$$3); - zephir_read_property(&_0$$3, this_ptr, ZEND_STRL("numberBytes"), PH_NOISY_CC); - numberBytes = zephir_get_intval(&_0$$3); + zephir_read_property(&_0$$3, this_ptr, ZEND_STRL("numberBytes"), PH_NOISY_CC | PH_READONLY); + numberBytes = zephir_get_numberval(&_0$$3); } while (1) { zephir_read_property(&_1$$4, this_ptr, ZEND_STRL("random"), PH_NOISY_CC | PH_READONLY); @@ -583,10 +634,13 @@ PHP_METHOD(Phalcon_Encryption_Security, getSaltBytes) /** * Generates a pseudo random token value to be used as input's value in a * CSRF check + * + * @return string + * @throws Exception */ PHP_METHOD(Phalcon_Encryption_Security, getToken) { - zval session, _0, _1$$3, _2$$3, _3$$3, _4$$3, _5$$4, _6$$4; + zval session, _0, _1$$3, _2$$3, _3$$3, _4$$3, _5$$3, _6$$3, _7$$4, _8$$4; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); @@ -597,8 +651,10 @@ PHP_METHOD(Phalcon_Encryption_Security, getToken) ZVAL_UNDEF(&_2$$3); ZVAL_UNDEF(&_3$$3); ZVAL_UNDEF(&_4$$3); - ZVAL_UNDEF(&_5$$4); - ZVAL_UNDEF(&_6$$4); + ZVAL_UNDEF(&_5$$3); + ZVAL_UNDEF(&_6$$3); + ZVAL_UNDEF(&_7$$4); + ZVAL_UNDEF(&_8$$4); ZEPHIR_MM_GROW(); @@ -613,12 +669,16 @@ PHP_METHOD(Phalcon_Encryption_Security, getToken) ZEPHIR_CALL_METHOD(&_3$$3, &_2$$3, "base64safe", NULL, 0, &_4$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("token"), &_3$$3); - ZEPHIR_CALL_METHOD(&session, this_ptr, "getlocalsession", NULL, 241); + ZEPHIR_INIT_VAR(&_5$$3); + ZVAL_STRING(&_5$$3, "session"); + ZEPHIR_INIT_VAR(&_6$$3); + ZVAL_STRING(&_6$$3, "localSession"); + ZEPHIR_CALL_METHOD(&session, this_ptr, "getlocalservice", NULL, 0, &_5$$3, &_6$$3); zephir_check_call_status(); - if (UNEXPECTED(zephir_is_true(&session))) { - zephir_read_property(&_5$$4, this_ptr, ZEND_STRL("tokenValueSessionId"), PH_NOISY_CC | PH_READONLY); - zephir_read_property(&_6$$4, this_ptr, ZEND_STRL("token"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, &session, "set", NULL, 0, &_5$$4, &_6$$4); + if (Z_TYPE_P(&session) != IS_NULL) { + zephir_read_property(&_7$$4, this_ptr, ZEND_STRL("tokenValueSessionId"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_8$$4, this_ptr, ZEND_STRL("token"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(NULL, &session, "set", NULL, 0, &_7$$4, &_8$$4); zephir_check_call_status(); } } @@ -628,38 +688,47 @@ PHP_METHOD(Phalcon_Encryption_Security, getToken) /** * Generates a pseudo random token key to be used as input's name in a CSRF * check + * + * @return string|null + * @throws Exception */ PHP_METHOD(Phalcon_Encryption_Security, getTokenKey) { - zval session, _0, _1$$4, _2$$4, _3$$4, _4$$4, _5$$4; + zval session, _0, _1$$3, _2$$3, _3$$4, _4$$4, _5$$4, _6$$4, _7$$4; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); ZVAL_UNDEF(&session); ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1$$4); - ZVAL_UNDEF(&_2$$4); + ZVAL_UNDEF(&_1$$3); + ZVAL_UNDEF(&_2$$3); ZVAL_UNDEF(&_3$$4); ZVAL_UNDEF(&_4$$4); ZVAL_UNDEF(&_5$$4); + ZVAL_UNDEF(&_6$$4); + ZVAL_UNDEF(&_7$$4); ZEPHIR_MM_GROW(); zephir_read_property(&_0, this_ptr, ZEND_STRL("tokenKey"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_0) == IS_NULL) { - ZEPHIR_CALL_METHOD(&session, this_ptr, "getlocalsession", NULL, 241); + ZEPHIR_INIT_VAR(&_1$$3); + ZVAL_STRING(&_1$$3, "session"); + ZEPHIR_INIT_VAR(&_2$$3); + ZVAL_STRING(&_2$$3, "localSession"); + ZEPHIR_CALL_METHOD(&session, this_ptr, "getlocalservice", NULL, 0, &_1$$3, &_2$$3); zephir_check_call_status(); - if (UNEXPECTED(zephir_is_true(&session))) { - zephir_read_property(&_1$$4, this_ptr, ZEND_STRL("random"), PH_NOISY_CC | PH_READONLY); - zephir_read_property(&_3$$4, this_ptr, ZEND_STRL("numberBytes"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_2$$4, &_1$$4, "base64safe", NULL, 0, &_3$$4); + if (Z_TYPE_P(&session) != IS_NULL) { + zephir_read_property(&_3$$4, this_ptr, ZEND_STRL("random"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_5$$4, this_ptr, ZEND_STRL("numberBytes"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(&_4$$4, &_3$$4, "base64safe", NULL, 0, &_5$$4); zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("tokenKey"), &_2$$4); - zephir_read_property(&_4$$4, this_ptr, ZEND_STRL("tokenKeySessionId"), PH_NOISY_CC | PH_READONLY); - zephir_read_property(&_5$$4, this_ptr, ZEND_STRL("tokenKey"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, &session, "set", NULL, 0, &_4$$4, &_5$$4); + zephir_update_property_zval(this_ptr, ZEND_STRL("tokenKey"), &_4$$4); + zephir_read_property(&_6$$4, this_ptr, ZEND_STRL("tokenKeySessionId"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_7$$4, this_ptr, ZEND_STRL("tokenKey"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(NULL, &session, "set", NULL, 0, &_6$$4, &_7$$4); zephir_check_call_status(); } } @@ -668,164 +737,136 @@ PHP_METHOD(Phalcon_Encryption_Security, getTokenKey) /** * Creates a password hash using bcrypt with a pseudo random salt + * + * @param string $password + * @param array $options + * + * @return string */ PHP_METHOD(Phalcon_Encryption_Security, hash) { + zend_bool legacy = 0; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long workFactor, ZEPHIR_LAST_CALL_STATUS, hash = 0; - zval *password_param = NULL, *workFactor_param = NULL, saltBytes, _1, _0$$3, _2$$12, _3$$12, _4$$13, _5$$15, _6$$15, _7$$17, _8$$17, _9$$17, _10$$17; - zval password, variant; + zend_long ZEPHIR_LAST_CALL_STATUS, bytes = 0; + zval options; + zval *password_param = NULL, *options_param = NULL, algorithm, arguments, cost, formatted, prefix, salt, _0, _1, _6, _2$$6, _3$$7, _4$$9, _5$$9; + zval password; zval *this_ptr = getThis(); ZVAL_UNDEF(&password); - ZVAL_UNDEF(&variant); - ZVAL_UNDEF(&saltBytes); + ZVAL_UNDEF(&algorithm); + ZVAL_UNDEF(&arguments); + ZVAL_UNDEF(&cost); + ZVAL_UNDEF(&formatted); + ZVAL_UNDEF(&prefix); + ZVAL_UNDEF(&salt); + ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_0$$3); - ZVAL_UNDEF(&_2$$12); - ZVAL_UNDEF(&_3$$12); - ZVAL_UNDEF(&_4$$13); - ZVAL_UNDEF(&_5$$15); - ZVAL_UNDEF(&_6$$15); - ZVAL_UNDEF(&_7$$17); - ZVAL_UNDEF(&_8$$17); - ZVAL_UNDEF(&_9$$17); - ZVAL_UNDEF(&_10$$17); + ZVAL_UNDEF(&_6); + ZVAL_UNDEF(&_2$$6); + ZVAL_UNDEF(&_3$$7); + ZVAL_UNDEF(&_4$$9); + ZVAL_UNDEF(&_5$$9); + ZVAL_UNDEF(&options); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) Z_PARAM_STR(password) Z_PARAM_OPTIONAL - Z_PARAM_LONG(workFactor) + Z_PARAM_ARRAY(options) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 1, &password_param, &workFactor_param); + zephir_fetch_params(1, 1, 1, &password_param, &options_param); zephir_get_strval(&password, password_param); - if (!workFactor_param) { - workFactor = 0; + if (!options_param) { + ZEPHIR_INIT_VAR(&options); + array_init(&options); } else { - workFactor = zephir_get_intval(workFactor_param); + zephir_get_arrval(&options, options_param); } - if (!(workFactor)) { - ZEPHIR_OBS_VAR(&_0$$3); - zephir_read_property(&_0$$3, this_ptr, ZEND_STRL("workFactor"), PH_NOISY_CC); - workFactor = zephir_get_intval(&_0$$3); - } + ZEPHIR_CALL_METHOD(&cost, this_ptr, "processcost", NULL, 245, &options); + zephir_check_call_status(); + ZEPHIR_INIT_VAR(&_0); + ZVAL_STRING(&_0, "%02s"); + ZEPHIR_CALL_FUNCTION(&formatted, "sprintf", NULL, 137, &_0, &cost); + zephir_check_call_status(); + ZEPHIR_INIT_VAR(&prefix); + ZVAL_STRING(&prefix, ""); + bytes = 22; + legacy = 1; ZEPHIR_OBS_VAR(&_1); zephir_read_property(&_1, this_ptr, ZEND_STRL("defaultHash"), PH_NOISY_CC); - hash = zephir_get_intval(&_1); do { - if (hash == 5) { - ZEPHIR_INIT_VAR(&variant); - ZVAL_STRING(&variant, "a"); - break; - } - if (hash == 6) { - ZEPHIR_INIT_NVAR(&variant); - ZVAL_STRING(&variant, "x"); + if (ZEPHIR_IS_LONG(&_1, 3)) { + ZEPHIR_INIT_NVAR(&prefix); + ZVAL_STRING(&prefix, "$1$"); + bytes = 12; break; } - if (hash == 7) { - ZEPHIR_INIT_NVAR(&variant); - ZVAL_STRING(&variant, "y"); + if (ZEPHIR_IS_LONG(&_1, 8)) { + ZEPHIR_INIT_NVAR(&prefix); + ZVAL_STRING(&prefix, "$5$"); + bytes = 16; break; } - if (hash == 3) { - ZEPHIR_INIT_NVAR(&variant); - ZVAL_STRING(&variant, "1"); + if (ZEPHIR_IS_LONG(&_1, 9)) { + ZEPHIR_INIT_NVAR(&prefix); + ZVAL_STRING(&prefix, "$6$"); + bytes = 16; break; } - if (hash == 8) { - ZEPHIR_INIT_NVAR(&variant); - ZVAL_STRING(&variant, "5"); + if (ZEPHIR_IS_LONG(&_1, 5)) { + ZEPHIR_INIT_VAR(&_2$$6); + ZVAL_STRING(&_2$$6, "$2a$%s$"); + ZEPHIR_CALL_FUNCTION(&prefix, "sprintf", NULL, 137, &_2$$6, &formatted); + zephir_check_call_status(); break; } - if (hash == 9) { - ZEPHIR_INIT_NVAR(&variant); - ZVAL_STRING(&variant, "6"); + if (ZEPHIR_IS_LONG(&_1, 6)) { + ZEPHIR_INIT_VAR(&_3$$7); + ZVAL_STRING(&_3$$7, "$2x$%s$"); + ZEPHIR_CALL_FUNCTION(&prefix, "sprintf", NULL, 137, &_3$$7, &formatted); + zephir_check_call_status(); break; } - ZEPHIR_INIT_NVAR(&variant); - ZVAL_STRING(&variant, "y"); + legacy = 0; break; } while(0); - do { - if (hash == 1 || hash == 2) { - if (hash == 2) { - ZVAL_LONG(&_3$$12, 8); - ZEPHIR_CALL_METHOD(&_2$$12, this_ptr, "getsaltbytes", NULL, 0, &_3$$12); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&saltBytes); - ZEPHIR_CONCAT_SV(&saltBytes, "_", &_2$$12); - } else { - ZVAL_LONG(&_4$$13, 2); - ZEPHIR_CALL_METHOD(&saltBytes, this_ptr, "getsaltbytes", NULL, 0, &_4$$13); - zephir_check_call_status(); - } - if (UNEXPECTED(Z_TYPE_P(&saltBytes) != IS_STRING)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_exception_ce, "Unable to get random bytes for the salt", "phalcon/Encryption/Security.zep", 433); - return; - } - ZEPHIR_RETURN_CALL_FUNCTION("crypt", NULL, 240, &password, &saltBytes); - zephir_check_call_status(); - RETURN_MM(); - } - if (hash == 3 || hash == 8 || hash == 9) { - ZEPHIR_INIT_VAR(&_5$$15); - if (hash == 3) { - ZEPHIR_INIT_NVAR(&_5$$15); - ZVAL_LONG(&_5$$15, 12); - } else { - ZEPHIR_INIT_NVAR(&_5$$15); - ZVAL_LONG(&_5$$15, 16); - } - ZEPHIR_CALL_METHOD(&saltBytes, this_ptr, "getsaltbytes", NULL, 0, &_5$$15); - zephir_check_call_status(); - if (UNEXPECTED(Z_TYPE_P(&saltBytes) != IS_STRING)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_exception_ce, "Unable to get random bytes for the salt", "phalcon/Encryption/Security.zep", 452); - return; - } - ZEPHIR_INIT_VAR(&_6$$15); - ZEPHIR_CONCAT_SVSVS(&_6$$15, "$", &variant, "$", &saltBytes, "$"); - ZEPHIR_RETURN_CALL_FUNCTION("crypt", NULL, 240, &password, &_6$$15); - zephir_check_call_status(); - RETURN_MM(); - } - ZVAL_LONG(&_7$$17, 22); - ZEPHIR_CALL_METHOD(&saltBytes, this_ptr, "getsaltbytes", NULL, 0, &_7$$17); + if (UNEXPECTED(legacy)) { + ZVAL_LONG(&_5$$9, bytes); + ZEPHIR_CALL_METHOD(&_4$$9, this_ptr, "getsaltbytes", NULL, 0, &_5$$9); zephir_check_call_status(); - if (UNEXPECTED(Z_TYPE_P(&saltBytes) != IS_STRING)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_exception_ce, "Unable to get random bytes for the salt", "phalcon/Encryption/Security.zep", 481); - return; - } - if (workFactor < 4) { - workFactor = 4; - } else if (workFactor > 31) { - workFactor = 31; - } - ZEPHIR_INIT_VAR(&_8$$17); - ZVAL_STRING(&_8$$17, "%02s"); - ZVAL_LONG(&_7$$17, workFactor); - ZEPHIR_CALL_FUNCTION(&_9$$17, "sprintf", NULL, 137, &_8$$17, &_7$$17); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_10$$17); - ZEPHIR_CONCAT_SVSVSVS(&_10$$17, "$2", &variant, "$", &_9$$17, "$", &saltBytes, "$"); - ZEPHIR_RETURN_CALL_FUNCTION("crypt", NULL, 240, &password, &_10$$17); + ZEPHIR_INIT_VAR(&salt); + ZEPHIR_CONCAT_VVS(&salt, &prefix, &_4$$9, "$"); + ZEPHIR_RETURN_CALL_FUNCTION("crypt", NULL, 246, &password, &salt); zephir_check_call_status(); RETURN_MM(); - } while(0); - - RETURN_MM_STRING(""); + } + ZEPHIR_INIT_VAR(&_6); + 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, 247); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "processargonoptions", NULL, 248, &options); + zephir_check_call_status(); + ZEPHIR_RETURN_CALL_FUNCTION("password_hash", NULL, 249, &password, &algorithm, &arguments); + zephir_check_call_status(); + RETURN_MM(); } /** * Checks if a password hash is a valid bcrypt's hash + * + * @param string $passwordHash + * + * @return bool */ PHP_METHOD(Phalcon_Encryption_Security, isLegacyHash) { @@ -853,6 +894,10 @@ PHP_METHOD(Phalcon_Encryption_Security, isLegacyHash) /** * Sets the default hash + * + * @param int $defaultHash + * + * @return Security */ PHP_METHOD(Phalcon_Encryption_Security, setDefaultHash) { @@ -882,6 +927,10 @@ PHP_METHOD(Phalcon_Encryption_Security, setDefaultHash) /** * Sets a number of bytes to be generated by the openssl pseudo random * generator + * + * @param int $randomBytes + * + * @return Security */ PHP_METHOD(Phalcon_Encryption_Security, setRandomBytes) { @@ -914,6 +963,10 @@ PHP_METHOD(Phalcon_Encryption_Security, setRandomBytes) /** * Sets the work factor + * + * @param int $workFactor + * + * @return Security */ PHP_METHOD(Phalcon_Encryption_Security, setWorkFactor) { @@ -940,113 +993,330 @@ PHP_METHOD(Phalcon_Encryption_Security, setWorkFactor) RETURN_THISW(); } -PHP_METHOD(Phalcon_Encryption_Security, getLocalRequest) +/** + * @param string $name + * @param string $property + * + * @return RequestInterface|SessionInterface|null + */ +PHP_METHOD(Phalcon_Encryption_Security, getLocalService) { - zval container, _0, _1, _6, _7, _2$$4, _3$$4, _5$$4, _8$$5, _9$$5; + zend_bool _1, _3; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zephir_fcall_cache_entry *_4 = NULL; + zval *name_param = NULL, *property_param = NULL, _0, _2, _4, _5, _8, _6$$3, _7$$3; + zval name, property; zval *this_ptr = getThis(); - ZVAL_UNDEF(&container); + ZVAL_UNDEF(&name); + ZVAL_UNDEF(&property); ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_6); - ZVAL_UNDEF(&_7); - ZVAL_UNDEF(&_2$$4); - ZVAL_UNDEF(&_3$$4); - ZVAL_UNDEF(&_5$$4); - ZVAL_UNDEF(&_8$$5); - ZVAL_UNDEF(&_9$$5); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_4); + ZVAL_UNDEF(&_5); + ZVAL_UNDEF(&_8); + ZVAL_UNDEF(&_6$$3); + ZVAL_UNDEF(&_7$$3); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(2, 2) + Z_PARAM_STR(name) + Z_PARAM_STR(property) + ZEND_PARSE_PARAMETERS_END(); +#endif ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 2, 0, &name_param, &property_param); + zephir_get_strval(&name, name_param); + zephir_get_strval(&property, property_param); - zephir_read_property(&_0, this_ptr, ZEND_STRL("localRequest"), PH_NOISY_CC | PH_READONLY); - if (zephir_is_true(&_0)) { - RETURN_MM_MEMBER(getThis(), "localRequest"); + + ZEPHIR_OBS_VAR(&_0); + zephir_read_property_zval(&_0, this_ptr, &property, PH_NOISY_CC); + _1 = Z_TYPE_P(&_0) == IS_NULL; + if (_1) { + zephir_read_property(&_2, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); + _1 = Z_TYPE_P(&_2) != IS_NULL; } - zephir_read_property(&_1, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CPY_WRT(&container, &_1); - if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) { - ZEPHIR_INIT_VAR(&_2$$4); - object_init_ex(&_2$$4, phalcon_encryption_security_exception_ce); - ZEPHIR_INIT_VAR(&_5$$4); - ZVAL_STRING(&_5$$4, "the 'request' service"); - ZEPHIR_CALL_CE_STATIC(&_3$$4, phalcon_encryption_security_exception_ce, "containerservicenotfound", &_4, 0, &_5$$4); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 8, &_3$$4); + _3 = _1; + if (_3) { + zephir_read_property(&_4, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(&_5, &_4, "has", NULL, 0, &name); zephir_check_call_status(); - zephir_throw_exception_debug(&_2$$4, "phalcon/Encryption/Security.zep", 550); - ZEPHIR_MM_RESTORE(); - return; + _3 = ZEPHIR_IS_TRUE_IDENTICAL(&_5); } - ZEPHIR_INIT_VAR(&_7); - ZVAL_STRING(&_7, "request"); - ZEPHIR_CALL_METHOD(&_6, &container, "has", NULL, 0, &_7); - zephir_check_call_status(); - if (UNEXPECTED(zephir_is_true(&_6))) { - ZEPHIR_INIT_VAR(&_9$$5); - ZVAL_STRING(&_9$$5, "request"); - ZEPHIR_CALL_METHOD(&_8$$5, &container, "getshared", NULL, 0, &_9$$5); + if (_3) { + zephir_read_property(&_6$$3, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(&_7$$3, &_6$$3, "getshared", NULL, 0, &name); zephir_check_call_status(); - RETURN_CCTOR(&_8$$5); + zephir_update_property_zval_zval(this_ptr, &property, &_7$$3); } - RETURN_MM_NULL(); + ZEPHIR_OBS_VAR(&_8); + zephir_read_property_zval(&_8, this_ptr, &property, PH_NOISY_CC); + RETURN_CCTOR(&_8); +} + +/** + * Checks the algorithm for `password_hash`. If it is argon based, it + * returns the relevant constant + * + * @return string + */ +PHP_METHOD(Phalcon_Encryption_Security, processAlgorithm) +{ + zval algorithm, _0, _1; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&algorithm); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); + + + ZEPHIR_MM_GROW(); + + ZEPHIR_INIT_VAR(&algorithm); + ZVAL_STRING(&algorithm, "2y"); + zephir_read_property(&_0, this_ptr, ZEND_STRL("defaultHash"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_1, this_ptr, ZEND_STRL("defaultHash"), PH_NOISY_CC | PH_READONLY); + if (ZEPHIR_IS_LONG_IDENTICAL(&_0, 10)) { + ZEPHIR_INIT_NVAR(&algorithm); + ZVAL_STRING(&algorithm, "argon2i"); + } else if (ZEPHIR_IS_LONG_IDENTICAL(&_1, 11)) { + ZEPHIR_INIT_NVAR(&algorithm); + ZVAL_STRING(&algorithm, "argon2id"); + } + RETURN_CCTOR(&algorithm); +} + +/** + * We check if the algorithm is Argon based. If yes, options are set for + * `password_hash` such as `memory_cost`, `time_cost` and `threads` + * + * @param array $options + * + * @return array + */ +PHP_METHOD(Phalcon_Encryption_Security, processArgonOptions) +{ + zend_bool _1; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *options_param = NULL, value, _0, _2; + zval options; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&options); + ZVAL_UNDEF(&value); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_2); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_ARRAY(options) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &options_param); + zephir_get_arrval(&options, options_param); + + + zephir_read_property(&_0, this_ptr, ZEND_STRL("defaultHash"), PH_NOISY_CC | PH_READONLY); + _1 = ZEPHIR_IS_LONG_IDENTICAL(&_0, 10); + if (!(_1)) { + zephir_read_property(&_2, this_ptr, ZEND_STRL("defaultHash"), PH_NOISY_CC | PH_READONLY); + _1 = ZEPHIR_IS_LONG_IDENTICAL(&_2, 11); + } + if (_1) { + ZEPHIR_OBS_VAR(&value); + if (!(zephir_array_isset_string_fetch(&value, &options, SL("memory_cost"), 0))) { + ZEPHIR_INIT_NVAR(&value); + ZVAL_LONG(&value, 65536); + } + zephir_array_update_string(&options, SL("memory_cost"), &value, PH_COPY | PH_SEPARATE); + ZEPHIR_OBS_NVAR(&value); + if (!(zephir_array_isset_string_fetch(&value, &options, SL("time_cost"), 0))) { + ZEPHIR_INIT_NVAR(&value); + ZVAL_LONG(&value, 4); + } + zephir_array_update_string(&options, SL("time_cost"), &value, PH_COPY | PH_SEPARATE); + ZEPHIR_OBS_NVAR(&value); + if (!(zephir_array_isset_string_fetch(&value, &options, SL("threads"), 0))) { + ZEPHIR_INIT_NVAR(&value); + ZVAL_LONG(&value, 1); + } + zephir_array_update_string(&options, SL("threads"), &value, PH_COPY | PH_SEPARATE); + } + RETURN_CTOR(&options); +} + +/** + * Checks the options array for `cost`. If not defined it is set to 10. + * It also checks the cost if it is between 4 and 31 + * + * @param array $options + * + * @return int + */ +PHP_METHOD(Phalcon_Encryption_Security, processCost) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *options_param = NULL, cost; + zval options; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&options); + ZVAL_UNDEF(&cost); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(0, 1) + Z_PARAM_OPTIONAL + Z_PARAM_ARRAY(options) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 0, 1, &options_param); + if (!options_param) { + ZEPHIR_INIT_VAR(&options); + array_init(&options); + } else { + zephir_get_arrval(&options, options_param); + } + + + ZEPHIR_OBS_VAR(&cost); + if (!(zephir_array_isset_string_fetch(&cost, &options, SL("cost"), 0))) { + ZEPHIR_INIT_NVAR(&cost); + ZVAL_LONG(&cost, 10); + } + if (ZEPHIR_LT_LONG(&cost, 4)) { + ZEPHIR_INIT_NVAR(&cost); + ZVAL_LONG(&cost, 4); + } + if (ZEPHIR_GT_LONG(&cost, 31)) { + ZEPHIR_INIT_NVAR(&cost); + ZVAL_LONG(&cost, 31); + } + RETURN_CCTOR(&cost); } -PHP_METHOD(Phalcon_Encryption_Security, getLocalSession) +/** + * @param string|null $tokenKey + * + * @return string|null + */ +PHP_METHOD(Phalcon_Encryption_Security, processTokenKey) { - zval container, _0, _1, _6, _7, _2$$4, _3$$4, _5$$4, _8$$5, _9$$5; + zend_bool _2; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zephir_fcall_cache_entry *_4 = NULL; + zval *tokenKey_param = NULL, key, session, _0, _1, _3$$3; + zval tokenKey; zval *this_ptr = getThis(); - ZVAL_UNDEF(&container); + ZVAL_UNDEF(&tokenKey); + ZVAL_UNDEF(&key); + ZVAL_UNDEF(&session); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_6); - ZVAL_UNDEF(&_7); - ZVAL_UNDEF(&_2$$4); - ZVAL_UNDEF(&_3$$4); - ZVAL_UNDEF(&_5$$4); - ZVAL_UNDEF(&_8$$5); - ZVAL_UNDEF(&_9$$5); + ZVAL_UNDEF(&_3$$3); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(0, 1) + Z_PARAM_OPTIONAL + Z_PARAM_STR_OR_NULL(tokenKey) + ZEND_PARSE_PARAMETERS_END(); +#endif ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 0, 1, &tokenKey_param); + if (!tokenKey_param) { + ZEPHIR_INIT_VAR(&tokenKey); + } else { + zephir_get_strval(&tokenKey, tokenKey_param); + } - zephir_read_property(&_0, this_ptr, ZEND_STRL("localSession"), PH_NOISY_CC | PH_READONLY); - if (zephir_is_true(&_0)) { - RETURN_MM_MEMBER(getThis(), "localSession"); + + ZEPHIR_CPY_WRT(&key, &tokenKey); + ZEPHIR_INIT_VAR(&_0); + ZVAL_STRING(&_0, "session"); + ZEPHIR_INIT_VAR(&_1); + ZVAL_STRING(&_1, "localSession"); + ZEPHIR_CALL_METHOD(&session, this_ptr, "getlocalservice", NULL, 0, &_0, &_1); + zephir_check_call_status(); + _2 = Z_TYPE_P(&session) != IS_NULL; + if (_2) { + _2 = 1 == ZEPHIR_IS_EMPTY(&key); } - zephir_read_property(&_1, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CPY_WRT(&container, &_1); - if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) { - ZEPHIR_INIT_VAR(&_2$$4); - object_init_ex(&_2$$4, phalcon_encryption_security_exception_ce); - ZEPHIR_INIT_VAR(&_5$$4); - ZVAL_STRING(&_5$$4, "the 'session' service"); - ZEPHIR_CALL_CE_STATIC(&_3$$4, phalcon_encryption_security_exception_ce, "containerservicenotfound", &_4, 0, &_5$$4); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 8, &_3$$4); + if (_2) { + zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("tokenKeySessionId"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(&key, &session, "get", NULL, 0, &_3$$3); zephir_check_call_status(); - zephir_throw_exception_debug(&_2$$4, "phalcon/Encryption/Security.zep", 572); - ZEPHIR_MM_RESTORE(); - return; } - ZEPHIR_INIT_VAR(&_7); - ZVAL_STRING(&_7, "session"); - ZEPHIR_CALL_METHOD(&_6, &container, "has", NULL, 0, &_7); - zephir_check_call_status(); - if (UNEXPECTED(zephir_is_true(&_6))) { - ZEPHIR_INIT_VAR(&_9$$5); - ZVAL_STRING(&_9$$5, "session"); - ZEPHIR_CALL_METHOD(&_8$$5, &container, "getshared", NULL, 0, &_9$$5); + RETURN_CCTOR(&key); +} + +/** + * @param string $tokenKey + * @param string|null $tokenValue + * + * @return string|null + */ +PHP_METHOD(Phalcon_Encryption_Security, processUserToken) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *tokenKey_param = NULL, *tokenValue_param = NULL, request, userToken, _0$$3, _1$$3, _2$$4; + zval tokenKey, tokenValue; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&tokenKey); + ZVAL_UNDEF(&tokenValue); + ZVAL_UNDEF(&request); + ZVAL_UNDEF(&userToken); + ZVAL_UNDEF(&_0$$3); + ZVAL_UNDEF(&_1$$3); + ZVAL_UNDEF(&_2$$4); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 2) + Z_PARAM_STR(tokenKey) + Z_PARAM_OPTIONAL + Z_PARAM_STR_OR_NULL(tokenValue) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 1, &tokenKey_param, &tokenValue_param); + zephir_get_strval(&tokenKey, tokenKey_param); + if (!tokenValue_param) { + ZEPHIR_INIT_VAR(&tokenValue); + } else { + zephir_get_strval(&tokenValue, tokenValue_param); + } + + + ZEPHIR_CPY_WRT(&userToken, &tokenValue); + if (!(!(ZEPHIR_IS_EMPTY(&tokenValue)))) { + ZEPHIR_INIT_VAR(&_0$$3); + ZVAL_STRING(&_0$$3, "request"); + ZEPHIR_INIT_VAR(&_1$$3); + ZVAL_STRING(&_1$$3, "localRequest"); + ZEPHIR_CALL_METHOD(&request, this_ptr, "getlocalservice", NULL, 0, &_0$$3, &_1$$3); zephir_check_call_status(); - RETURN_CCTOR(&_8$$5); + if (Z_TYPE_P(&request) != IS_NULL) { + ZEPHIR_INIT_VAR(&_2$$4); + ZVAL_STRING(&_2$$4, "string"); + ZEPHIR_CALL_METHOD(&userToken, &request, "getpost", NULL, 0, &tokenKey, &_2$$4); + zephir_check_call_status(); + } } - RETURN_MM_NULL(); + RETURN_CCTOR(&userToken); } diff --git a/ext/phalcon/encryption/security.zep.h b/ext/phalcon/encryption/security.zep.h index 2bf1b3aed72..d5405ec3dad 100644 --- a/ext/phalcon/encryption/security.zep.h +++ b/ext/phalcon/encryption/security.zep.h @@ -10,6 +10,7 @@ PHP_METHOD(Phalcon_Encryption_Security, checkToken); PHP_METHOD(Phalcon_Encryption_Security, computeHmac); PHP_METHOD(Phalcon_Encryption_Security, destroyToken); PHP_METHOD(Phalcon_Encryption_Security, getDefaultHash); +PHP_METHOD(Phalcon_Encryption_Security, getHashInformation); PHP_METHOD(Phalcon_Encryption_Security, getRandom); PHP_METHOD(Phalcon_Encryption_Security, getRandomBytes); PHP_METHOD(Phalcon_Encryption_Security, getRequestToken); @@ -22,8 +23,12 @@ PHP_METHOD(Phalcon_Encryption_Security, isLegacyHash); PHP_METHOD(Phalcon_Encryption_Security, setDefaultHash); PHP_METHOD(Phalcon_Encryption_Security, setRandomBytes); PHP_METHOD(Phalcon_Encryption_Security, setWorkFactor); -PHP_METHOD(Phalcon_Encryption_Security, getLocalRequest); -PHP_METHOD(Phalcon_Encryption_Security, getLocalSession); +PHP_METHOD(Phalcon_Encryption_Security, getLocalService); +PHP_METHOD(Phalcon_Encryption_Security, processAlgorithm); +PHP_METHOD(Phalcon_Encryption_Security, processArgonOptions); +PHP_METHOD(Phalcon_Encryption_Security, processCost); +PHP_METHOD(Phalcon_Encryption_Security, processTokenKey); +PHP_METHOD(Phalcon_Encryption_Security, processUserToken); ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_getworkfactor, 0, 0, IS_LONG, 0) ZEND_END_ARG_INFO() @@ -40,7 +45,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_chec ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_checktoken, 0, 0, _IS_BOOL, 0) - ZEND_ARG_INFO(0, tokenKey) + ZEND_ARG_TYPE_INFO(0, tokenKey, IS_STRING, 1) ZEND_ARG_INFO(0, tokenValue) ZEND_ARG_TYPE_INFO(0, destroyIfValid, _IS_BOOL, 0) ZEND_END_ARG_INFO() @@ -55,7 +60,11 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_encryption_security_destroytoken, 0, 0, Phalcon\\Encryption\\Security, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_getdefaulthash, 0, 0, IS_LONG, 1) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_getdefaulthash, 0, 0, IS_LONG, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_gethashinformation, 0, 1, IS_ARRAY, 0) + ZEND_ARG_TYPE_INFO(0, hash, IS_STRING, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_encryption_security_getrandom, 0, 0, Phalcon\\Encryption\\Security\\Random, 0) @@ -74,15 +83,19 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_gets ZEND_ARG_TYPE_INFO(0, numberBytes, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_gettoken, 0, 0, IS_STRING, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_gettoken, 0, 0, IS_STRING, 1) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_gettokenkey, 0, 0, IS_STRING, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_gettokenkey, 0, 0, IS_STRING, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_hash, 0, 1, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, password, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, workFactor, IS_LONG, 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_encryption_security_islegacyhash, 0, 1, _IS_BOOL, 0) @@ -101,10 +114,33 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_encryption_security_setwo ZEND_ARG_TYPE_INFO(0, workFactor, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_encryption_security_getlocalrequest, 0, 0, Phalcon\\Http\\RequestInterface, 1) +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_encryption_security_getlocalservice, 0, 0, 2) + ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, property, IS_STRING, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_processalgorithm, 0, 0, IS_STRING, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_processargonoptions, 0, 1, IS_ARRAY, 0) + ZEND_ARG_ARRAY_INFO(0, options, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_processcost, 0, 0, IS_LONG, 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_encryption_security_processtokenkey, 0, 0, IS_STRING, 1) + ZEND_ARG_TYPE_INFO(0, tokenKey, IS_STRING, 1) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_encryption_security_getlocalsession, 0, 0, Phalcon\\Session\\ManagerInterface, 1) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_processusertoken, 0, 1, IS_STRING, 1) + ZEND_ARG_TYPE_INFO(0, tokenKey, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, tokenValue, IS_STRING, 1) ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_encryption_security_method_entry) { @@ -115,6 +151,7 @@ ZEPHIR_INIT_FUNCS(phalcon_encryption_security_method_entry) { PHP_ME(Phalcon_Encryption_Security, computeHmac, arginfo_phalcon_encryption_security_computehmac, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Encryption_Security, destroyToken, arginfo_phalcon_encryption_security_destroytoken, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Encryption_Security, getDefaultHash, arginfo_phalcon_encryption_security_getdefaulthash, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Encryption_Security, getHashInformation, arginfo_phalcon_encryption_security_gethashinformation, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Encryption_Security, getRandom, arginfo_phalcon_encryption_security_getrandom, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Encryption_Security, getRandomBytes, arginfo_phalcon_encryption_security_getrandombytes, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Encryption_Security, getRequestToken, arginfo_phalcon_encryption_security_getrequesttoken, ZEND_ACC_PUBLIC) @@ -127,7 +164,11 @@ ZEPHIR_INIT_FUNCS(phalcon_encryption_security_method_entry) { PHP_ME(Phalcon_Encryption_Security, setDefaultHash, arginfo_phalcon_encryption_security_setdefaulthash, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Encryption_Security, setRandomBytes, arginfo_phalcon_encryption_security_setrandombytes, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Encryption_Security, setWorkFactor, arginfo_phalcon_encryption_security_setworkfactor, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Encryption_Security, getLocalRequest, arginfo_phalcon_encryption_security_getlocalrequest, ZEND_ACC_PRIVATE) - PHP_ME(Phalcon_Encryption_Security, getLocalSession, arginfo_phalcon_encryption_security_getlocalsession, ZEND_ACC_PRIVATE) + PHP_ME(Phalcon_Encryption_Security, getLocalService, arginfo_phalcon_encryption_security_getlocalservice, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Encryption_Security, processAlgorithm, arginfo_phalcon_encryption_security_processalgorithm, ZEND_ACC_PRIVATE) + PHP_ME(Phalcon_Encryption_Security, processArgonOptions, arginfo_phalcon_encryption_security_processargonoptions, ZEND_ACC_PRIVATE) + PHP_ME(Phalcon_Encryption_Security, processCost, arginfo_phalcon_encryption_security_processcost, ZEND_ACC_PRIVATE) + PHP_ME(Phalcon_Encryption_Security, processTokenKey, arginfo_phalcon_encryption_security_processtokenkey, ZEND_ACC_PRIVATE) + PHP_ME(Phalcon_Encryption_Security, processUserToken, arginfo_phalcon_encryption_security_processusertoken, ZEND_ACC_PRIVATE) PHP_FE_END }; diff --git a/ext/phalcon/encryption/security/jwt/builder.zep.c b/ext/phalcon/encryption/security/jwt/builder.zep.c index ae1dfeb8596..6bbfcd1249d 100644 --- a/ext/phalcon/encryption/security/jwt/builder.zep.c +++ b/ext/phalcon/encryption/security/jwt/builder.zep.c @@ -505,25 +505,25 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, getToken) zephir_check_call_status(); ZEPHIR_CALL_CE_STATIC(&_2, phalcon_helper_json_ce, "encode", &_3, 16, &_4); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&encodedClaims, phalcon_helper_base64_ce, "encodeurl", &_1, 243, &_2); + ZEPHIR_CALL_CE_STATIC(&encodedClaims, phalcon_helper_base64_ce, "encodeurl", &_1, 250, &_2); zephir_check_call_status(); ZEPHIR_INIT_VAR(&claims); object_init_ex(&claims, phalcon_encryption_security_jwt_token_item_ce); ZEPHIR_CALL_METHOD(&_5, this_ptr, "getclaims", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &claims, "__construct", NULL, 244, &_5, &encodedClaims); + ZEPHIR_CALL_METHOD(NULL, &claims, "__construct", NULL, 251, &_5, &encodedClaims); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_7, this_ptr, "getheaders", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_CE_STATIC(&_6, phalcon_helper_json_ce, "encode", &_3, 16, &_7); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&encodedHeaders, phalcon_helper_base64_ce, "encodeurl", &_1, 243, &_6); + ZEPHIR_CALL_CE_STATIC(&encodedHeaders, phalcon_helper_base64_ce, "encodeurl", &_1, 250, &_6); zephir_check_call_status(); ZEPHIR_INIT_VAR(&headers); object_init_ex(&headers, phalcon_encryption_security_jwt_token_item_ce); ZEPHIR_CALL_METHOD(&_8, this_ptr, "getheaders", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &headers, "__construct", NULL, 244, &_8, &encodedHeaders); + ZEPHIR_CALL_METHOD(NULL, &headers, "__construct", NULL, 251, &_8, &encodedHeaders); zephir_check_call_status(); zephir_read_property(&_9, this_ptr, ZEND_STRL("signer"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_10); @@ -531,14 +531,14 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, getToken) 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_CE_STATIC(&encodedSignature, phalcon_helper_base64_ce, "encodeurl", &_1, 243, &signatureHash); + ZEPHIR_CALL_CE_STATIC(&encodedSignature, phalcon_helper_base64_ce, "encodeurl", &_1, 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, 245, &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, 246, &headers, &claims, &signature); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 253, &headers, &claims, &signature); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/security/jwt/signer/hmac.zep.c b/ext/phalcon/encryption/security/jwt/signer/hmac.zep.c index a7966c10345..8c652a61b15 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, 247, &payload, &passphrase); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethash", NULL, 254, &payload, &passphrase); zephir_check_call_status(); RETURN_MM(); } @@ -244,7 +244,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Signer_Hmac, verify) } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "gethash", NULL, 247, &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)); } @@ -302,7 +302,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, 223, &_0, &payload, &passphrase, &__$true); + ZEPHIR_RETURN_CALL_FUNCTION("hash_hmac", NULL, 224, &_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 2796aaf8450..b018953b183 100644 --- a/ext/phalcon/encryption/security/jwt/token/parser.zep.c +++ b/ext/phalcon/encryption/security/jwt/token/parser.zep.c @@ -84,7 +84,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, parse) } - ZEPHIR_CALL_METHOD(&results, this_ptr, "parsetoken", NULL, 248, &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", 36); @@ -92,14 +92,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", 37); ZEPHIR_OBS_VAR(&encodedSignature); zephir_array_fetch_long(&encodedSignature, &results, 2, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 38); - ZEPHIR_CALL_METHOD(&headers, this_ptr, "decodeheaders", NULL, 249, &encodedHeaders); + ZEPHIR_CALL_METHOD(&headers, this_ptr, "decodeheaders", NULL, 256, &encodedHeaders); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&claims, this_ptr, "decodeclaims", NULL, 250, &encodedClaims); + ZEPHIR_CALL_METHOD(&claims, this_ptr, "decodeclaims", NULL, 257, &encodedClaims); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&signature, this_ptr, "decodesignature", NULL, 251, &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, 246, &headers, &claims, &signature); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 253, &headers, &claims, &signature); zephir_check_call_status(); RETURN_MM(); } @@ -142,10 +142,10 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeClaims) zephir_get_strval(&claims, claims_param); - ZEPHIR_CALL_CE_STATIC(&_1, phalcon_helper_base64_ce, "decodeurl", &_2, 252, &claims); + ZEPHIR_CALL_CE_STATIC(&_1, phalcon_helper_base64_ce, "decodeurl", &_2, 259, &claims); zephir_check_call_status(); ZVAL_BOOL(&_3, 1); - ZEPHIR_CALL_CE_STATIC(&decoded, phalcon_helper_json_ce, "decode", &_0, 190, &_1, &_3); + ZEPHIR_CALL_CE_STATIC(&decoded, phalcon_helper_json_ce, "decode", &_0, 191, &_1, &_3); 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", 62); @@ -166,7 +166,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeClaims) zephir_array_update_string(&decoded, SL("aud"), &_6$$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, 244, &decoded, &claims); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 251, &decoded, &claims); zephir_check_call_status(); RETURN_MM(); } @@ -204,10 +204,10 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeHeaders) zephir_get_strval(&headers, headers_param); - ZEPHIR_CALL_CE_STATIC(&_1, phalcon_helper_base64_ce, "decodeurl", &_2, 252, &headers); + ZEPHIR_CALL_CE_STATIC(&_1, phalcon_helper_base64_ce, "decodeurl", &_2, 259, &headers); zephir_check_call_status(); ZVAL_BOOL(&_3, 1); - ZEPHIR_CALL_CE_STATIC(&decoded, phalcon_helper_json_ce, "decode", &_0, 190, &_1, &_3); + ZEPHIR_CALL_CE_STATIC(&decoded, phalcon_helper_json_ce, "decode", &_0, 191, &_1, &_3); 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", 91); @@ -218,7 +218,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, 244, &decoded, &headers); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 251, &decoded, &headers); zephir_check_call_status(); RETURN_MM(); } @@ -274,11 +274,11 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeSignature) ZVAL_STRING(&decoded, ""); ZEPHIR_INIT_NVAR(&signature); } else { - ZEPHIR_CALL_CE_STATIC(&decoded, phalcon_helper_base64_ce, "decodeurl", &_3, 252, &signature); + ZEPHIR_CALL_CE_STATIC(&decoded, phalcon_helper_base64_ce, "decodeurl", &_3, 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, 245, &decoded, &signature); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 252, &decoded, &signature); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/security/jwt/validator.zep.c b/ext/phalcon/encryption/security/jwt/validator.zep.c index f76f5d2025c..67a11012667 100644 --- a/ext/phalcon/encryption/security/jwt/validator.zep.c +++ b/ext/phalcon/encryption/security/jwt/validator.zep.c @@ -216,7 +216,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateExpiration) _4 = zephir_is_true(&_2); if (_4) { ZVAL_LONG(&_6, timestamp); - ZEPHIR_CALL_METHOD(&_5, this_ptr, "gettimestamp", NULL, 253, &_6); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "gettimestamp", NULL, 260, &_6); zephir_check_call_status(); zephir_read_property(&_6, this_ptr, ZEND_STRL("token"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&_7, &_6, "getclaims", NULL, 0); @@ -322,7 +322,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateIssuedAt) ZVAL_LONG(&_1, timestamp); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "gettimestamp", NULL, 253, &_1); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "gettimestamp", NULL, 260, &_1); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("token"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&_2, &_1, "getclaims", NULL, 0); @@ -426,7 +426,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateNotBefore) ZVAL_LONG(&_1, timestamp); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "gettimestamp", NULL, 253, &_1); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "gettimestamp", NULL, 260, &_1); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("token"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&_2, &_1, "getclaims", NULL, 0); diff --git a/ext/phalcon/encryption/security/random.zep.c b/ext/phalcon/encryption/security/random.zep.c index a11913c46d4..a16af18ff6d 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, 226, &_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, 226, &_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, 254, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("random_bytes", NULL, 261, &_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, 255, &_2, &_0); + ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 262, &_2, &_0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&_3); ZEPHIR_RETURN_CALL_FUNCTION("array_shift", NULL, 24, &_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, 256, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("random_int", NULL, 263, &_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, 255, &_2, &_0); + ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 262, &_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, 257, &ary, &_7); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 264, &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, 255, &_1, &_0); + ZEPHIR_CALL_FUNCTION(&bytes, "unpack", NULL, 262, &_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/manager.zep.c b/ext/phalcon/events/manager.zep.c index f4ec234dabc..15d30ca2d9d 100644 --- a/ext/phalcon/events/manager.zep.c +++ b/ext/phalcon/events/manager.zep.c @@ -139,7 +139,7 @@ PHP_METHOD(Phalcon_Events_Manager, attach) } ZVAL_LONG(&_2$$4, 1); - ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "setextractflags", NULL, 258, &_2$$4); + ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "setextractflags", NULL, 265, &_2$$4); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("events"), &eventType, &priorityQueue); } @@ -148,7 +148,7 @@ PHP_METHOD(Phalcon_Events_Manager, attach) priority = 100; } ZVAL_LONG(&_4, priority); - ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "insert", NULL, 259, handler, &_4); + ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "insert", NULL, 266, handler, &_4); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -261,7 +261,7 @@ PHP_METHOD(Phalcon_Events_Manager, detach) } ZVAL_LONG(&_2$$4, 1); - ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "setextractflags", NULL, 258, &_2$$4); + ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "setextractflags", NULL, 265, &_2$$4); zephir_check_call_status(); ZVAL_LONG(&_2$$4, 3); ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "setextractflags", NULL, 0, &_2$$4); @@ -282,7 +282,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", 136); zephir_array_fetch_string(&_8$$6, &data, SL("priority"), PH_NOISY | PH_READONLY, "phalcon/Events/Manager.zep", 138); - ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "insert", &_9, 259, &_7$$6, &_8$$6); + ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "insert", &_9, 266, &_7$$6, &_8$$6); zephir_check_call_status(); } } @@ -490,19 +490,19 @@ PHP_METHOD(Phalcon_Events_Manager, fire) } else { ZVAL_BOOL(&_4, 0); } - ZEPHIR_CALL_METHOD(NULL, &event, "__construct", NULL, 260, &eventName, source, data, &_4); + ZEPHIR_CALL_METHOD(NULL, &event, "__construct", NULL, 267, &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, 261, &fireEvents, &event); + ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", NULL, 268, &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, 261, &fireEvents, &event); + ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", NULL, 268, &fireEvents, &event); zephir_check_call_status(); } } diff --git a/ext/phalcon/filter/filter.zep.c b/ext/phalcon/filter/filter.zep.c index 9d001ffc59c..d481987eaaf 100644 --- a/ext/phalcon/filter/filter.zep.c +++ b/ext/phalcon/filter/filter.zep.c @@ -283,7 +283,7 @@ PHP_METHOD(Phalcon_Filter_Filter, sanitize) } else { ZVAL_BOOL(&_0$$3, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarraysanitizers", NULL, 262, sanitizers, value, &_0$$3); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarraysanitizers", NULL, 269, sanitizers, value, &_0$$3); zephir_check_call_status(); RETURN_MM(); } @@ -292,11 +292,11 @@ PHP_METHOD(Phalcon_Filter_Filter, sanitize) _1 = !noRecursive; } if (_1) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarrayvalues", NULL, 263, value, sanitizers); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarrayvalues", NULL, 270, value, sanitizers); zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "sanitizer", NULL, 264, value, sanitizers); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "sanitizer", NULL, 271, value, sanitizers); zephir_check_call_status(); RETURN_MM(); } @@ -475,7 +475,7 @@ PHP_METHOD(Phalcon_Filter_Filter, processArraySanitizers) } ZEPHIR_INIT_NVAR(&sanitizer); ZVAL_COPY(&sanitizer, _0); - ZEPHIR_CALL_METHOD(&split, this_ptr, "splitsanitizerparameters", &_4, 265, &sanitizerKey, &sanitizer); + ZEPHIR_CALL_METHOD(&split, this_ptr, "splitsanitizerparameters", &_4, 272, &sanitizerKey, &sanitizer); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&sanitizerName); zephir_array_fetch_long(&sanitizerName, &split, 0, PH_NOISY, "phalcon/Filter/Filter.zep", 226); @@ -486,10 +486,10 @@ PHP_METHOD(Phalcon_Filter_Filter, processArraySanitizers) } else { ZVAL_BOOL(&_6$$4, 0); } - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "processvalueisarray", &_7, 266, value, &sanitizerName, &sanitizerParams, &_6$$4); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "processvalueisarray", &_7, 273, value, &sanitizerName, &sanitizerParams, &_6$$4); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_5$$4); - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "processvalueisnotarray", &_8, 267, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "processvalueisnotarray", &_8, 274, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_5$$4); } ZEND_HASH_FOREACH_END(); @@ -506,7 +506,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, 265, &sanitizerKey, &sanitizer); + ZEPHIR_CALL_METHOD(&split, this_ptr, "splitsanitizerparameters", &_4, 272, &sanitizerKey, &sanitizer); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&sanitizerName); zephir_array_fetch_long(&sanitizerName, &split, 0, PH_NOISY, "phalcon/Filter/Filter.zep", 226); @@ -517,10 +517,10 @@ PHP_METHOD(Phalcon_Filter_Filter, processArraySanitizers) } else { ZVAL_BOOL(&_10$$5, 0); } - ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "processvalueisarray", &_7, 266, value, &sanitizerName, &sanitizerParams, &_10$$5); + ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "processvalueisarray", &_7, 273, value, &sanitizerName, &sanitizerParams, &_10$$5); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_9$$5); - ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "processvalueisnotarray", &_8, 267, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "processvalueisnotarray", &_8, 274, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_9$$5); ZEPHIR_CALL_METHOD(NULL, &sanitizers, "next", NULL, 0); @@ -601,7 +601,7 @@ PHP_METHOD(Phalcon_Filter_Filter, processArrayValues) } ZEPHIR_INIT_NVAR(&itemValue); ZVAL_COPY(&itemValue, _0); - ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "sanitizer", &_5, 264, &itemValue, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "sanitizer", &_5, 271, &itemValue, &sanitizerName, &sanitizerParams); zephir_check_call_status(); zephir_array_update_zval(&arrayValues, &itemKey, &_4$$3, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -618,7 +618,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, 264, &itemValue, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "sanitizer", &_5, 271, &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); @@ -752,7 +752,7 @@ PHP_METHOD(Phalcon_Filter_Filter, processValueIsArray) _0 = !noRecursive; } if (_0) { - ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "processarrayvalues", NULL, 263, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "processarrayvalues", NULL, 270, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_1$$3); } @@ -799,7 +799,7 @@ PHP_METHOD(Phalcon_Filter_Filter, processValueIsNotArray) if (Z_TYPE_P(value) != IS_ARRAY) { - ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "sanitizer", NULL, 264, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "sanitizer", NULL, 271, 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 5663d4dbfad..a37edda76b8 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, 268, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 275, &_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 6e93299fa8f..26bbfa9980a 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, 269, input, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 276, input, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, zephir_get_intval(&_1)); - ZEPHIR_RETURN_CALL_FUNCTION("abs", NULL, 270, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("abs", NULL, 277, &_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 2d3e6a2e6c7..fedf954ffa5 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, 269, input, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 276, 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 30c91076b51..e108a5c2322 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, 269, input, &_1, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 276, 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 d534219d6be..0b690b0d2d3 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, 269, input, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 276, 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 2745f63304d..e4391dedf58 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, 271, &input); + ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 278, &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 3d7baf17f89..117810af737 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, 269, input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 276, 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 98161d1add3..5fa200a9b88 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, 269, input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 276, 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 d02560362b1..d1efaa5ad34 100644 --- a/ext/phalcon/filter/sanitize/stringval.zep.c +++ b/ext/phalcon/filter/sanitize/stringval.zep.c @@ -64,7 +64,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_StringVal, __invoke) ZVAL_LONG(&_0, 513); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 269, input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 276, input, &_0); 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 fd768e833a5..73c99970d00 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, 272, &input); + ZEPHIR_RETURN_CALL_FUNCTION("strip_tags", NULL, 279, &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 9170f4cc40e..2801e19efc5 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, 271, &input); + ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 278, &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 7aa4f4028cf..86553d18700 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, 271, &input); + ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 278, &input); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ucwords", NULL, 273, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("ucwords", NULL, 280, &_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 0a5ec4f82a3..ff0b93c7c3f 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, 269, input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 276, input, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/forms/form.zep.c b/ext/phalcon/forms/form.zep.c index 4ceff59587f..9ff9a7b87dc 100644 --- a/ext/phalcon/forms/form.zep.c +++ b/ext/phalcon/forms/form.zep.c @@ -47,6 +47,10 @@ ZEPHIR_INIT_CLASS(Phalcon_Forms_Form) * @var array */ zend_declare_property_null(phalcon_forms_form_ce, SL("data"), ZEND_ACC_PROTECTED); + /** + * @var array + */ + zend_declare_property_null(phalcon_forms_form_ce, SL("filteredData"), ZEND_ACC_PROTECTED); /** * @var array */ @@ -162,7 +166,7 @@ PHP_METHOD(Phalcon_Forms_Form, __construct) _0 = Z_TYPE_P(entity) != IS_OBJECT; } if (UNEXPECTED(_0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_forms_exception_ce, "The base entity is not valid", "phalcon/Forms/Form.zep", 82); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_forms_exception_ce, "The base entity is not valid", "phalcon/Forms/Form.zep", 87); return; } zephir_update_property_zval(this_ptr, ZEND_STRL("entity"), entity); @@ -243,7 +247,7 @@ PHP_METHOD(Phalcon_Forms_Form, add) ZEPHIR_INIT_VAR(&elements); array_init(&elements); zephir_read_property(&_2$$4, this_ptr, ZEND_STRL("elements"), PH_NOISY_CC | PH_READONLY); - zephir_is_iterable(&_2$$4, 0, "phalcon/Forms/Form.zep", 157); + zephir_is_iterable(&_2$$4, 0, "phalcon/Forms/Form.zep", 162); if (Z_TYPE_P(&_2$$4) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_2$$4), _5$$4, _6$$4, _3$$4) { @@ -310,18 +314,20 @@ PHP_METHOD(Phalcon_Forms_Form, add) */ PHP_METHOD(Phalcon_Forms_Form, bind) { - zend_bool _6$$4, _13$$11; + zend_bool _6$$4, _13$$12; zend_string *_4; zend_ulong _3; zval method; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zephir_fcall_cache_entry *_7 = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *data_param = NULL, *entity, entity_sub, *whitelist = NULL, whitelist_sub, __$null, filter, key, value, element, filters, container, filteredValue, assignData, _0, *_1, _2, _5$$4, _10$$4, _11$$4, _8$$8, _9$$8, _12$$11, _16$$11, _17$$11, _14$$15, _15$$15; - zval data; + zval *data_param = NULL, *entity = NULL, entity_sub, *whitelist = NULL, whitelist_sub, __$null, filter, key, value, element, filters, container, filteredValue, _0, *_1, _2, _5$$4, _8$$8, _9$$8, _10$$10, _11$$10, _12$$12, _14$$16, _15$$16, _16$$18, _17$$18; + zval data, assignData, filteredData; zval *this_ptr = getThis(); ZVAL_UNDEF(&data); + ZVAL_UNDEF(&assignData); + ZVAL_UNDEF(&filteredData); ZVAL_UNDEF(&entity_sub); ZVAL_UNDEF(&whitelist_sub); ZVAL_NULL(&__$null); @@ -332,35 +338,39 @@ PHP_METHOD(Phalcon_Forms_Form, bind) ZVAL_UNDEF(&filters); ZVAL_UNDEF(&container); ZVAL_UNDEF(&filteredValue); - ZVAL_UNDEF(&assignData); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_2); ZVAL_UNDEF(&_5$$4); - ZVAL_UNDEF(&_10$$4); - ZVAL_UNDEF(&_11$$4); ZVAL_UNDEF(&_8$$8); ZVAL_UNDEF(&_9$$8); - ZVAL_UNDEF(&_12$$11); - ZVAL_UNDEF(&_16$$11); - ZVAL_UNDEF(&_17$$11); - ZVAL_UNDEF(&_14$$15); - ZVAL_UNDEF(&_15$$15); + ZVAL_UNDEF(&_10$$10); + ZVAL_UNDEF(&_11$$10); + ZVAL_UNDEF(&_12$$12); + ZVAL_UNDEF(&_14$$16); + ZVAL_UNDEF(&_15$$16); + ZVAL_UNDEF(&_16$$18); + ZVAL_UNDEF(&_17$$18); ZVAL_UNDEF(&method); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(2, 3) + ZEND_PARSE_PARAMETERS_START(1, 3) Z_PARAM_ARRAY(data) - Z_PARAM_ZVAL(entity) Z_PARAM_OPTIONAL + Z_PARAM_ZVAL_OR_NULL(entity) Z_PARAM_ZVAL_OR_NULL(whitelist) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 2, 1, &data_param, &entity, &whitelist); + zephir_fetch_params(1, 1, 2, &data_param, &entity, &whitelist); ZEPHIR_OBS_COPY_OR_DUP(&data, data_param); - ZEPHIR_SEPARATE_PARAM(entity); + if (!entity) { + entity = &entity_sub; + ZEPHIR_CPY_WRT(entity, &__$null); + } else { + ZEPHIR_SEPARATE_PARAM(entity); + } if (!whitelist) { whitelist = &whitelist_sub; whitelist = &__$null; @@ -369,14 +379,16 @@ PHP_METHOD(Phalcon_Forms_Form, bind) zephir_read_property(&_0, this_ptr, ZEND_STRL("elements"), PH_NOISY_CC | PH_READONLY); if (UNEXPECTED(ZEPHIR_IS_EMPTY(&_0))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_forms_exception_ce, "There are no elements in the form", "phalcon/Forms/Form.zep", 175); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_forms_exception_ce, "There are no elements in the form", "phalcon/Forms/Form.zep", 181); return; } ZEPHIR_INIT_VAR(&filter); ZVAL_NULL(&filter); ZEPHIR_INIT_VAR(&assignData); array_init(&assignData); - zephir_is_iterable(&data, 0, "phalcon/Forms/Form.zep", 234); + ZEPHIR_INIT_VAR(&filteredData); + array_init(&filteredData); + zephir_is_iterable(&data, 0, "phalcon/Forms/Form.zep", 244); if (Z_TYPE_P(&data) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _3, _4, _1) { @@ -418,17 +430,20 @@ PHP_METHOD(Phalcon_Forms_Form, bind) ZEPHIR_CPY_WRT(&filteredValue, &value); } zephir_array_update_zval(&assignData, &key, &value, PH_COPY | PH_SEPARATE); - ZEPHIR_INIT_NVAR(&_10$$4); - zephir_camelize(&_10$$4, &key, NULL ); - ZEPHIR_INIT_NVAR(&_11$$4); - ZEPHIR_CONCAT_SV(&_11$$4, "set", &_10$$4); - zephir_get_strval(&method, &_11$$4); - if ((zephir_method_exists(entity, &method) == SUCCESS)) { - ZEPHIR_CALL_METHOD_ZVAL(NULL, entity, &method, NULL, 0, &filteredValue); - zephir_check_call_status(); - continue; + zephir_array_update_zval(&filteredData, &key, &filteredValue, PH_COPY | PH_SEPARATE); + if (Z_TYPE_P(entity) != IS_NULL) { + ZEPHIR_INIT_NVAR(&_10$$10); + zephir_camelize(&_10$$10, &key, NULL ); + ZEPHIR_INIT_NVAR(&_11$$10); + ZEPHIR_CONCAT_SV(&_11$$10, "set", &_10$$10); + zephir_get_strval(&method, &_11$$10); + if ((zephir_method_exists(entity, &method) == SUCCESS)) { + ZEPHIR_CALL_METHOD_ZVAL(NULL, entity, &method, NULL, 0, &filteredValue); + zephir_check_call_status(); + continue; + } + zephir_update_property_zval_zval(entity, &key, &filteredValue); } - zephir_update_property_zval_zval(entity, &key, &filteredValue); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &data, "rewind", NULL, 0); @@ -444,15 +459,15 @@ PHP_METHOD(Phalcon_Forms_Form, bind) ZEPHIR_CALL_METHOD(&value, &data, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&element); - zephir_read_property(&_12$$11, this_ptr, ZEND_STRL("elements"), PH_NOISY_CC | PH_READONLY); - if (!(zephir_array_isset_fetch(&element, &_12$$11, &key, 0))) { + zephir_read_property(&_12$$12, this_ptr, ZEND_STRL("elements"), PH_NOISY_CC | PH_READONLY); + if (!(zephir_array_isset_fetch(&element, &_12$$12, &key, 0))) { continue; } - _13$$11 = Z_TYPE_P(whitelist) == IS_ARRAY; - if (_13$$11) { - _13$$11 = !(zephir_fast_in_array(&key, whitelist)); + _13$$12 = Z_TYPE_P(whitelist) == IS_ARRAY; + if (_13$$12) { + _13$$12 = !(zephir_fast_in_array(&key, whitelist)); } - if (_13$$11) { + if (_13$$12) { continue; } ZEPHIR_CALL_METHOD(&filters, &element, "getfilters", NULL, 0); @@ -461,11 +476,11 @@ PHP_METHOD(Phalcon_Forms_Form, bind) if (Z_TYPE_P(&filter) != IS_OBJECT) { ZEPHIR_CALL_METHOD(&container, this_ptr, "getdi", &_7, 0); zephir_check_call_status(); - ZEPHIR_INIT_NVAR(&_15$$15); - ZVAL_STRING(&_15$$15, "filter"); - ZEPHIR_CALL_METHOD(&_14$$15, &container, "getshared", NULL, 0, &_15$$15); + ZEPHIR_INIT_NVAR(&_15$$16); + ZVAL_STRING(&_15$$16, "filter"); + ZEPHIR_CALL_METHOD(&_14$$16, &container, "getshared", NULL, 0, &_15$$16); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&filter, &_14$$15); + ZEPHIR_CPY_WRT(&filter, &_14$$16); } ZEPHIR_CALL_METHOD(&filteredValue, &filter, "sanitize", NULL, 0, &value, &filters); zephir_check_call_status(); @@ -473,17 +488,20 @@ PHP_METHOD(Phalcon_Forms_Form, bind) ZEPHIR_CPY_WRT(&filteredValue, &value); } zephir_array_update_zval(&assignData, &key, &value, PH_COPY | PH_SEPARATE); - ZEPHIR_INIT_NVAR(&_16$$11); - zephir_camelize(&_16$$11, &key, NULL ); - ZEPHIR_INIT_NVAR(&_17$$11); - ZEPHIR_CONCAT_SV(&_17$$11, "set", &_16$$11); - zephir_get_strval(&method, &_17$$11); - if ((zephir_method_exists(entity, &method) == SUCCESS)) { - ZEPHIR_CALL_METHOD_ZVAL(NULL, entity, &method, NULL, 0, &filteredValue); - zephir_check_call_status(); - continue; + zephir_array_update_zval(&filteredData, &key, &filteredValue, PH_COPY | PH_SEPARATE); + if (Z_TYPE_P(entity) != IS_NULL) { + ZEPHIR_INIT_NVAR(&_16$$18); + zephir_camelize(&_16$$18, &key, NULL ); + ZEPHIR_INIT_NVAR(&_17$$18); + ZEPHIR_CONCAT_SV(&_17$$18, "set", &_16$$18); + zephir_get_strval(&method, &_17$$18); + if ((zephir_method_exists(entity, &method) == SUCCESS)) { + ZEPHIR_CALL_METHOD_ZVAL(NULL, entity, &method, NULL, 0, &filteredValue); + zephir_check_call_status(); + continue; + } + zephir_update_property_zval_zval(entity, &key, &filteredValue); } - zephir_update_property_zval_zval(entity, &key, &filteredValue); ZEPHIR_CALL_METHOD(NULL, &data, "next", NULL, 0); zephir_check_call_status(); } @@ -491,6 +509,7 @@ PHP_METHOD(Phalcon_Forms_Form, bind) ZEPHIR_INIT_NVAR(&value); ZEPHIR_INIT_NVAR(&key); zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &assignData); + zephir_update_property_zval(this_ptr, ZEND_STRL("filteredData"), &filteredData); RETURN_THIS(); } @@ -551,7 +570,7 @@ PHP_METHOD(Phalcon_Forms_Form, clear) if (Z_TYPE_P(fields) == IS_NULL) { ZEPHIR_INIT_NVAR(&data); array_init(&data); - zephir_is_iterable(&elements, 0, "phalcon/Forms/Form.zep", 265); + zephir_is_iterable(&elements, 0, "phalcon/Forms/Form.zep", 276); if (Z_TYPE_P(&elements) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&elements), _1$$3) { @@ -593,7 +612,7 @@ PHP_METHOD(Phalcon_Forms_Form, clear) zephir_array_fast_append(&_8$$7, fields); ZEPHIR_CPY_WRT(fields, &_8$$7); } - zephir_is_iterable(fields, 0, "phalcon/Forms/Form.zep", 282); + zephir_is_iterable(fields, 0, "phalcon/Forms/Form.zep", 293); if (Z_TYPE_P(fields) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(fields), _9$$6) { @@ -729,7 +748,7 @@ PHP_METHOD(Phalcon_Forms_Form, get) ZEPHIR_CONCAT_SVS(&_2$$3, "Element with ID=", &name, " is not part of the form"); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 8, &_2$$3); zephir_check_call_status(); - zephir_throw_exception_debug(&_1$$3, "phalcon/Forms/Form.zep", 321); + zephir_throw_exception_debug(&_1$$3, "phalcon/Forms/Form.zep", 332); ZEPHIR_MM_RESTORE(); return; } @@ -865,7 +884,7 @@ PHP_METHOD(Phalcon_Forms_Form, getLabel) ZEPHIR_CONCAT_SVS(&_2$$3, "Element with ID=", &name, " is not part of the form"); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 8, &_2$$3); zephir_check_call_status(); - zephir_throw_exception_debug(&_1$$3, "phalcon/Forms/Form.zep", 375); + zephir_throw_exception_debug(&_1$$3, "phalcon/Forms/Form.zep", 386); ZEPHIR_MM_RESTORE(); return; } @@ -1023,6 +1042,55 @@ PHP_METHOD(Phalcon_Forms_Form, getUserOptions) RETURN_MEMBER(getThis(), "options"); } +/** + * Gets a value from the internal filtered data or calls getValue(name) + */ +PHP_METHOD(Phalcon_Forms_Form, getFilteredValue) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *name_param = NULL, filteredData, value, _0; + zval name; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&name); + ZVAL_UNDEF(&filteredData); + ZVAL_UNDEF(&value); + ZVAL_UNDEF(&_0); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_STR(name) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &name_param); + if (UNEXPECTED(Z_TYPE_P(name_param) != IS_STRING && Z_TYPE_P(name_param) != IS_NULL)) { + zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'name' must be of the type string")); + RETURN_MM_NULL(); + } + if (EXPECTED(Z_TYPE_P(name_param) == IS_STRING)) { + zephir_get_strval(&name, name_param); + } else { + ZEPHIR_INIT_VAR(&name); + } + + + zephir_read_property(&_0, this_ptr, ZEND_STRL("filteredData"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CPY_WRT(&filteredData, &_0); + if (Z_TYPE_P(&filteredData) == IS_ARRAY) { + ZEPHIR_OBS_VAR(&value); + if (zephir_array_isset_fetch(&value, &filteredData, &name, 0)) { + RETURN_CCTOR(&value); + } + } + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getvalue", NULL, 0, &name); + zephir_check_call_status(); + RETURN_MM(); +} + /** * Gets a value from the internal related entity or from the default value */ @@ -1238,11 +1306,11 @@ PHP_METHOD(Phalcon_Forms_Form, hasMessagesFor) PHP_METHOD(Phalcon_Forms_Form, isValid) { zend_object_iterator *_17$$21; - zend_bool validationStatus = 0, _6; + zend_bool validationStatus = 0, _2, _6; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zephir_fcall_cache_entry *_12 = NULL, *_13 = NULL, *_20 = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *data = NULL, data_sub, *entity = NULL, entity_sub, __$null, messages, element, validators, name, filters, validator, validation, elementMessage, _0, _7, *_8, _9, _16, _1$$4, _2$$6, _3$$7, _4$$7, _5$$8, *_10$$11, _11$$11, *_14$$16, _15$$16, _18$$22, _19$$22; + zval *data = NULL, data_sub, *entity = NULL, entity_sub, __$null, messages, element, validators, name, filters, validator, validation, elementMessage, _0, _3, _7, *_8, _9, _16, _1$$4, _4$$5, _5$$8, *_10$$11, _11$$11, *_14$$16, _15$$16, _18$$22, _19$$22; zval *this_ptr = getThis(); ZVAL_UNDEF(&data_sub); @@ -1257,13 +1325,12 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) ZVAL_UNDEF(&validation); ZVAL_UNDEF(&elementMessage); ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_3); ZVAL_UNDEF(&_7); ZVAL_UNDEF(&_9); ZVAL_UNDEF(&_16); ZVAL_UNDEF(&_1$$4); - ZVAL_UNDEF(&_2$$6); - ZVAL_UNDEF(&_3$$7); - ZVAL_UNDEF(&_4$$7); + ZVAL_UNDEF(&_4$$5); ZVAL_UNDEF(&_5$$8); ZVAL_UNDEF(&_11$$11); ZVAL_UNDEF(&_15$$16); @@ -1303,19 +1370,22 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) zephir_read_property(&_1$$4, this_ptr, ZEND_STRL("data"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(data, &_1$$4); } + _2 = Z_TYPE_P(entity) != IS_OBJECT; + if (_2) { + ZEPHIR_OBS_VAR(&_3); + zephir_read_property(&_3, this_ptr, ZEND_STRL("entity"), PH_NOISY_CC); + _2 = Z_TYPE_P(&_3) == IS_OBJECT; + } + if (_2) { + zephir_read_property(&_4$$5, this_ptr, ZEND_STRL("entity"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CPY_WRT(entity, &_4$$5); + } if (Z_TYPE_P(entity) == IS_OBJECT) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "bind", NULL, 0, data, entity); zephir_check_call_status(); } else { - ZEPHIR_OBS_VAR(&_2$$6); - zephir_read_property(&_2$$6, this_ptr, ZEND_STRL("entity"), PH_NOISY_CC); - if (Z_TYPE_P(&_2$$6) == IS_OBJECT) { - zephir_read_property(&_3$$7, this_ptr, ZEND_STRL("entity"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "bind", NULL, 0, data, &_3$$7); - zephir_check_call_status(); - zephir_read_property(&_4$$7, this_ptr, ZEND_STRL("entity"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CPY_WRT(entity, &_4$$7); - } + ZEPHIR_CALL_METHOD(NULL, this_ptr, "bind", NULL, 0, data); + zephir_check_call_status(); } if ((zephir_method_exists_ex(this_ptr, ZEND_STRL("beforevalidation")) == SUCCESS)) { ZEPHIR_CALL_METHOD(&_5$$8, this_ptr, "beforevalidation", NULL, 0, data, entity); @@ -1334,11 +1404,11 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) if (_6) { ZEPHIR_INIT_NVAR(&validation); object_init_ex(&validation, phalcon_validation_ce); - ZEPHIR_CALL_METHOD(NULL, &validation, "__construct", NULL, 274); + ZEPHIR_CALL_METHOD(NULL, &validation, "__construct", NULL, 281); zephir_check_call_status(); } zephir_read_property(&_7, this_ptr, ZEND_STRL("elements"), PH_NOISY_CC | PH_READONLY); - zephir_is_iterable(&_7, 0, "phalcon/Forms/Form.zep", 651); + zephir_is_iterable(&_7, 0, "phalcon/Forms/Form.zep", 684); if (Z_TYPE_P(&_7) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_7), _8) { @@ -1351,13 +1421,13 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) } ZEPHIR_CALL_METHOD(&name, &element, "getname", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&validators, 0, "phalcon/Forms/Form.zep", 638); + zephir_is_iterable(&validators, 0, "phalcon/Forms/Form.zep", 671); if (Z_TYPE_P(&validators) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&validators), _10$$11) { ZEPHIR_INIT_NVAR(&validator); ZVAL_COPY(&validator, _10$$11); - ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_12, 275, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_12, 282, &name, &validator); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -1371,7 +1441,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", &_12, 275, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_12, 282, &name, &validator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &validators, "next", NULL, 0); zephir_check_call_status(); @@ -1381,7 +1451,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", &_13, 276, &name, &filters); + ZEPHIR_CALL_METHOD(NULL, &validation, "setfilters", &_13, 283, &name, &filters); zephir_check_call_status(); } } ZEND_HASH_FOREACH_END(); @@ -1403,13 +1473,13 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) } ZEPHIR_CALL_METHOD(&name, &element, "getname", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&validators, 0, "phalcon/Forms/Form.zep", 638); + zephir_is_iterable(&validators, 0, "phalcon/Forms/Form.zep", 671); if (Z_TYPE_P(&validators) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&validators), _14$$16) { ZEPHIR_INIT_NVAR(&validator); ZVAL_COPY(&validator, _14$$16); - ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_12, 275, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_12, 282, &name, &validator); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -1423,7 +1493,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", &_12, 275, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_12, 282, &name, &validator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &validators, "next", NULL, 0); zephir_check_call_status(); @@ -1433,7 +1503,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", &_13, 276, &name, &filters); + ZEPHIR_CALL_METHOD(NULL, &validation, "setfilters", &_13, 283, &name, &filters); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, &_7, "next", NULL, 0); @@ -1441,7 +1511,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) } } ZEPHIR_INIT_NVAR(&element); - ZEPHIR_CALL_METHOD(&messages, &validation, "validate", NULL, 277, data, entity); + ZEPHIR_CALL_METHOD(&messages, &validation, "validate", NULL, 284, data, entity); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_16, &messages, "count", NULL, 0); zephir_check_call_status(); @@ -1541,7 +1611,7 @@ PHP_METHOD(Phalcon_Forms_Form, label) ZEPHIR_CONCAT_SVS(&_2$$3, "Element with ID=", &name, " is not part of the form"); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 8, &_2$$3); zephir_check_call_status(); - zephir_throw_exception_debug(&_1$$3, "phalcon/Forms/Form.zep", 701); + zephir_throw_exception_debug(&_1$$3, "phalcon/Forms/Form.zep", 734); ZEPHIR_MM_RESTORE(); return; } @@ -1618,7 +1688,7 @@ PHP_METHOD(Phalcon_Forms_Form, render) ZEPHIR_CONCAT_SVS(&_2$$3, "Element with ID=", &name, " is not part of the form"); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 8, &_2$$3); zephir_check_call_status(); - zephir_throw_exception_debug(&_1$$3, "phalcon/Forms/Form.zep", 725); + zephir_throw_exception_debug(&_1$$3, "phalcon/Forms/Form.zep", 758); ZEPHIR_MM_RESTORE(); return; } @@ -1873,16 +1943,18 @@ PHP_METHOD(Phalcon_Forms_Form, valid) zend_object *zephir_init_properties_Phalcon_Forms_Form(zend_class_entry *class_type) { - zval _0, _2, _4, _6, _1$$3, _3$$4, _5$$5, _7$$6; + zval _0, _2, _4, _6, _8, _1$$3, _3$$4, _5$$5, _7$$6, _9$$7; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_2); ZVAL_UNDEF(&_4); ZVAL_UNDEF(&_6); + ZVAL_UNDEF(&_8); ZVAL_UNDEF(&_1$$3); ZVAL_UNDEF(&_3$$4); ZVAL_UNDEF(&_5$$5); ZVAL_UNDEF(&_7$$6); + ZVAL_UNDEF(&_9$$7); ZEPHIR_MM_GROW(); @@ -1908,11 +1980,17 @@ zend_object *zephir_init_properties_Phalcon_Forms_Form(zend_class_entry *class_t array_init(&_5$$5); zephir_update_property_zval_ex(this_ptr, ZEND_STRL("elements"), &_5$$5); } - zephir_read_property_ex(&_6, this_ptr, ZEND_STRL("data"), PH_NOISY_CC | PH_READONLY); + zephir_read_property_ex(&_6, this_ptr, ZEND_STRL("filteredData"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_6) == IS_NULL) { ZEPHIR_INIT_VAR(&_7$$6); array_init(&_7$$6); - zephir_update_property_zval_ex(this_ptr, ZEND_STRL("data"), &_7$$6); + zephir_update_property_zval_ex(this_ptr, ZEND_STRL("filteredData"), &_7$$6); + } + zephir_read_property_ex(&_8, this_ptr, ZEND_STRL("data"), PH_NOISY_CC | PH_READONLY); + if (Z_TYPE_P(&_8) == IS_NULL) { + ZEPHIR_INIT_VAR(&_9$$7); + array_init(&_9$$7); + zephir_update_property_zval_ex(this_ptr, ZEND_STRL("data"), &_9$$7); } ZEPHIR_MM_RESTORE(); return Z_OBJ_P(this_ptr); diff --git a/ext/phalcon/forms/form.zep.h b/ext/phalcon/forms/form.zep.h index 4c5e0ed0693..8c951fa5dd4 100644 --- a/ext/phalcon/forms/form.zep.h +++ b/ext/phalcon/forms/form.zep.h @@ -21,6 +21,7 @@ PHP_METHOD(Phalcon_Forms_Form, getMessages); PHP_METHOD(Phalcon_Forms_Form, getMessagesFor); PHP_METHOD(Phalcon_Forms_Form, getUserOption); PHP_METHOD(Phalcon_Forms_Form, getUserOptions); +PHP_METHOD(Phalcon_Forms_Form, getFilteredValue); PHP_METHOD(Phalcon_Forms_Form, getValue); PHP_METHOD(Phalcon_Forms_Form, has); PHP_METHOD(Phalcon_Forms_Form, hasMessagesFor); @@ -61,7 +62,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_forms_form_add, 0, 1, Pha ZEND_ARG_TYPE_INFO(0, type, _IS_BOOL, 1) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_forms_form_bind, 0, 2, Phalcon\\Forms\\Form, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_forms_form_bind, 0, 1, Phalcon\\Forms\\Form, 0) ZEND_ARG_ARRAY_INFO(0, data, 0) ZEND_ARG_INFO(0, entity) ZEND_ARG_INFO(0, whitelist) @@ -112,6 +113,10 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_forms_form_getuseroptions, 0, 0, IS_ARRAY, 0) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_forms_form_getfilteredvalue, 0, 0, 1) + ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_forms_form_getvalue, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -218,6 +223,7 @@ ZEPHIR_INIT_FUNCS(phalcon_forms_form_method_entry) { PHP_ME(Phalcon_Forms_Form, getMessagesFor, arginfo_phalcon_forms_form_getmessagesfor, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Forms_Form, getUserOption, arginfo_phalcon_forms_form_getuseroption, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Forms_Form, getUserOptions, arginfo_phalcon_forms_form_getuseroptions, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Forms_Form, getFilteredValue, arginfo_phalcon_forms_form_getfilteredvalue, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Forms_Form, getValue, arginfo_phalcon_forms_form_getvalue, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Forms_Form, has, arginfo_phalcon_forms_form_has, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Forms_Form, hasMessagesFor, arginfo_phalcon_forms_form_hasmessagesfor, ZEND_ACC_PUBLIC) diff --git a/ext/phalcon/forms/manager.zep.c b/ext/phalcon/forms/manager.zep.c index 4cc66785005..e9457693ea5 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, 278, entity); + ZEPHIR_CALL_METHOD(NULL, &form, "__construct", NULL, 285, entity); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("forms"), &name, &form); RETURN_CCTOR(&form); diff --git a/ext/phalcon/helper/arr.zep.c b/ext/phalcon/helper/arr.zep.c index a8b92a1136f..b6941395e37 100644 --- a/ext/phalcon/helper/arr.zep.c +++ b/ext/phalcon/helper/arr.zep.c @@ -82,9 +82,9 @@ PHP_METHOD(Phalcon_Helper_Arr, blackList) ZEPHIR_CALL_FUNCTION(&_1, "array_filter", NULL, 18, &blackList, &_0); zephir_check_call_status(); ZEPHIR_CPY_WRT(&blackList, &_1); - ZEPHIR_CALL_FUNCTION(&_2, "array_flip", NULL, 185, &blackList); + ZEPHIR_CALL_FUNCTION(&_2, "array_flip", NULL, 186, &blackList); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("array_diff_key", NULL, 279, &collection, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("array_diff_key", NULL, 286, &collection, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -134,7 +134,7 @@ PHP_METHOD(Phalcon_Helper_Arr, chunk) ZVAL_LONG(&_0, size); ZVAL_BOOL(&_1, (preserveKeys ? 1 : 0)); - ZEPHIR_RETURN_CALL_FUNCTION("array_chunk", NULL, 280, &collection, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("array_chunk", NULL, 287, &collection, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -231,10 +231,10 @@ PHP_METHOD(Phalcon_Helper_Arr, first) } - ZEPHIR_CALL_SELF(&filtered, "filter", &_0, 281, &collection, method); + ZEPHIR_CALL_SELF(&filtered, "filter", &_0, 288, &collection, method); zephir_check_call_status(); ZEPHIR_MAKE_REF(&filtered); - ZEPHIR_RETURN_CALL_FUNCTION("reset", NULL, 282, &filtered); + ZEPHIR_RETURN_CALL_FUNCTION("reset", NULL, 289, &filtered); ZEPHIR_UNREF(&filtered); zephir_check_call_status(); RETURN_MM(); @@ -281,13 +281,13 @@ PHP_METHOD(Phalcon_Helper_Arr, firstKey) } - ZEPHIR_CALL_SELF(&filtered, "filter", &_0, 281, &collection, method); + ZEPHIR_CALL_SELF(&filtered, "filter", &_0, 288, &collection, method); zephir_check_call_status(); ZEPHIR_MAKE_REF(&filtered); - ZEPHIR_CALL_FUNCTION(NULL, "reset", NULL, 282, &filtered); + ZEPHIR_CALL_FUNCTION(NULL, "reset", NULL, 289, &filtered); ZEPHIR_UNREF(&filtered); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("key", NULL, 283, &filtered); + ZEPHIR_RETURN_CALL_FUNCTION("key", NULL, 290, &filtered); zephir_check_call_status(); RETURN_MM(); } @@ -358,7 +358,7 @@ PHP_METHOD(Phalcon_Helper_Arr, flatten) if (deep) { ZEPHIR_INIT_NVAR(&_2$$6); ZVAL_BOOL(&_5$$6, 1); - ZEPHIR_CALL_SELF(&_3$$6, "flatten", &_4, 284, &item, &_5$$6); + ZEPHIR_CALL_SELF(&_3$$6, "flatten", &_4, 291, &item, &_5$$6); zephir_check_call_status(); zephir_fast_array_merge(&_2$$6, &data, &_3$$6); ZEPHIR_CPY_WRT(&data, &_2$$6); @@ -388,7 +388,7 @@ PHP_METHOD(Phalcon_Helper_Arr, flatten) if (deep) { ZEPHIR_INIT_NVAR(&_9$$11); ZVAL_BOOL(&_11$$11, 1); - ZEPHIR_CALL_SELF(&_10$$11, "flatten", &_4, 284, &item, &_11$$11); + ZEPHIR_CALL_SELF(&_10$$11, "flatten", &_4, 291, &item, &_11$$11); zephir_check_call_status(); zephir_fast_array_merge(&_9$$11, &data, &_10$$11); ZEPHIR_CPY_WRT(&data, &_9$$11); @@ -529,7 +529,7 @@ PHP_METHOD(Phalcon_Helper_Arr, group) _3$$3 = (zephir_function_exists(method) == SUCCESS); } if (_3$$3) { - ZEPHIR_CALL_FUNCTION(&key, "call_user_func", &_4, 285, method, &element); + ZEPHIR_CALL_FUNCTION(&key, "call_user_func", &_4, 292, method, &element); zephir_check_call_status(); zephir_array_update_multi(&filtered, &element, SL("za"), 2, &key); } else if (Z_TYPE_P(&element) == IS_OBJECT) { @@ -562,7 +562,7 @@ PHP_METHOD(Phalcon_Helper_Arr, group) _6$$7 = (zephir_function_exists(method) == SUCCESS); } if (_6$$7) { - ZEPHIR_CALL_FUNCTION(&key, "call_user_func", &_4, 285, method, &element); + ZEPHIR_CALL_FUNCTION(&key, "call_user_func", &_4, 292, method, &element); zephir_check_call_status(); zephir_array_update_multi(&filtered, &element, SL("za"), 2, &key); } else if (Z_TYPE_P(&element) == IS_OBJECT) { @@ -647,7 +647,7 @@ PHP_METHOD(Phalcon_Helper_Arr, isUnique) ZEPHIR_OBS_COPY_OR_DUP(&collection, collection_param); - ZEPHIR_CALL_FUNCTION(&_0, "array_unique", NULL, 286, &collection); + ZEPHIR_CALL_FUNCTION(&_0, "array_unique", NULL, 293, &collection); zephir_check_call_status(); RETURN_MM_BOOL(zephir_fast_count_int(&collection) == zephir_fast_count_int(&_0)); } @@ -693,10 +693,10 @@ PHP_METHOD(Phalcon_Helper_Arr, last) } - ZEPHIR_CALL_SELF(&filtered, "filter", &_0, 281, &collection, method); + ZEPHIR_CALL_SELF(&filtered, "filter", &_0, 288, &collection, method); zephir_check_call_status(); ZEPHIR_MAKE_REF(&filtered); - ZEPHIR_RETURN_CALL_FUNCTION("end", NULL, 287, &filtered); + ZEPHIR_RETURN_CALL_FUNCTION("end", NULL, 294, &filtered); ZEPHIR_UNREF(&filtered); zephir_check_call_status(); RETURN_MM(); @@ -743,13 +743,13 @@ PHP_METHOD(Phalcon_Helper_Arr, lastKey) } - ZEPHIR_CALL_SELF(&filtered, "filter", &_0, 281, &collection, method); + ZEPHIR_CALL_SELF(&filtered, "filter", &_0, 288, &collection, method); zephir_check_call_status(); ZEPHIR_MAKE_REF(&filtered); - ZEPHIR_CALL_FUNCTION(NULL, "end", NULL, 287, &filtered); + ZEPHIR_CALL_FUNCTION(NULL, "end", NULL, 294, &filtered); ZEPHIR_UNREF(&filtered); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("key", NULL, 283, &filtered); + ZEPHIR_RETURN_CALL_FUNCTION("key", NULL, 290, &filtered); zephir_check_call_status(); RETURN_MM(); } @@ -844,12 +844,12 @@ PHP_METHOD(Phalcon_Helper_Arr, order) ZEPHIR_INIT_NVAR(&item); if (ZEPHIR_IS_STRING_IDENTICAL(&order, "asc")) { ZEPHIR_MAKE_REF(&sorted); - ZEPHIR_CALL_FUNCTION(NULL, "ksort", NULL, 288, &sorted); + ZEPHIR_CALL_FUNCTION(NULL, "ksort", NULL, 295, &sorted); ZEPHIR_UNREF(&sorted); zephir_check_call_status(); } else { ZEPHIR_MAKE_REF(&sorted); - ZEPHIR_CALL_FUNCTION(NULL, "krsort", NULL, 289, &sorted); + ZEPHIR_CALL_FUNCTION(NULL, "krsort", NULL, 296, &sorted); ZEPHIR_UNREF(&sorted); zephir_check_call_status(); } @@ -1049,7 +1049,7 @@ PHP_METHOD(Phalcon_Helper_Arr, sliceLeft) ZVAL_LONG(&_0, 0); ZVAL_LONG(&_1, elements); - ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 290, &collection, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 297, &collection, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -1093,7 +1093,7 @@ PHP_METHOD(Phalcon_Helper_Arr, sliceRight) ZVAL_LONG(&_0, elements); - ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 290, &collection, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 297, &collection, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -1209,7 +1209,7 @@ PHP_METHOD(Phalcon_Helper_Arr, validateAll) } - ZEPHIR_CALL_SELF(&_0, "filter", &_1, 281, &collection, method); + ZEPHIR_CALL_SELF(&_0, "filter", &_1, 288, &collection, method); zephir_check_call_status(); RETURN_MM_BOOL(zephir_fast_count_int(&_0) == zephir_fast_count_int(&collection)); } @@ -1255,7 +1255,7 @@ PHP_METHOD(Phalcon_Helper_Arr, validateAny) } - ZEPHIR_CALL_SELF(&_0, "filter", &_1, 281, &collection, method); + ZEPHIR_CALL_SELF(&_0, "filter", &_1, 288, &collection, method); zephir_check_call_status(); RETURN_MM_BOOL(zephir_fast_count_int(&_0) > 0); } @@ -1303,7 +1303,7 @@ PHP_METHOD(Phalcon_Helper_Arr, whiteList) ZEPHIR_CALL_FUNCTION(&_1, "array_filter", NULL, 18, &whiteList, &_0); zephir_check_call_status(); ZEPHIR_CPY_WRT(&whiteList, &_1); - ZEPHIR_CALL_FUNCTION(&_2, "array_flip", NULL, 185, &whiteList); + ZEPHIR_CALL_FUNCTION(&_2, "array_flip", NULL, 186, &whiteList); zephir_check_call_status(); ZEPHIR_RETURN_CALL_FUNCTION("array_intersect_key", NULL, 2, &collection, &_2); zephir_check_call_status(); diff --git a/ext/phalcon/helper/base64.zep.c b/ext/phalcon/helper/base64.zep.c index 11d2435649c..836b12f24e8 100644 --- a/ext/phalcon/helper/base64.zep.c +++ b/ext/phalcon/helper/base64.zep.c @@ -83,7 +83,7 @@ PHP_METHOD(Phalcon_Helper_Base64, encodeUrl) } - ZEPHIR_CALL_FUNCTION(&_0, "base64_encode", NULL, 226, &input); + ZEPHIR_CALL_FUNCTION(&_0, "base64_encode", NULL, 227, &input); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "+/"); @@ -159,7 +159,7 @@ PHP_METHOD(Phalcon_Helper_Base64, 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, 224, &_5); + ZEPHIR_CALL_FUNCTION(&data, "base64_decode", NULL, 225, &_5); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&data)) { ZEPHIR_INIT_NVAR(&data); diff --git a/ext/phalcon/helper/fs.zep.c b/ext/phalcon/helper/fs.zep.c index bd3936985c2..03190e2ebe7 100644 --- a/ext/phalcon/helper/fs.zep.c +++ b/ext/phalcon/helper/fs.zep.c @@ -110,7 +110,7 @@ PHP_METHOD(Phalcon_Helper_Fs, basename) ZVAL_STRING(&_2, "/"); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "@"); - ZEPHIR_CALL_FUNCTION(&_4, "preg_quote", NULL, 291, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "preg_quote", NULL, 298, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5); ZEPHIR_CONCAT_SVS(&_5, "@[^", &_4, "]+$@"); @@ -126,7 +126,7 @@ PHP_METHOD(Phalcon_Helper_Fs, basename) if (zephir_is_true(suffix)) { ZEPHIR_INIT_VAR(&_6$$3); ZVAL_STRING(&_6$$3, "@"); - ZEPHIR_CALL_FUNCTION(&_7$$3, "preg_quote", NULL, 291, suffix, &_6$$3); + ZEPHIR_CALL_FUNCTION(&_7$$3, "preg_quote", NULL, 298, suffix, &_6$$3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_8$$3); ZEPHIR_CONCAT_SVS(&_8$$3, "@", &_7$$3, "$@"); diff --git a/ext/phalcon/helper/json.zep.c b/ext/phalcon/helper/json.zep.c index c4f48cc7fee..f7f690778e8 100644 --- a/ext/phalcon/helper/json.zep.c +++ b/ext/phalcon/helper/json.zep.c @@ -129,12 +129,12 @@ PHP_METHOD(Phalcon_Helper_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, 292); + ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 299); 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, 293); + ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 300); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6$$3); ZEPHIR_CONCAT_SV(&_6$$3, "json_decode error: ", &_5$$3); @@ -216,12 +216,12 @@ PHP_METHOD(Phalcon_Helper_Json, 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, 292); + ZEPHIR_CALL_FUNCTION(&_2, "json_last_error", NULL, 299); 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, 293); + ZEPHIR_CALL_FUNCTION(&_4$$3, "json_last_error_msg", NULL, 300); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5$$3); ZEPHIR_CONCAT_SV(&_5$$3, "json_encode error: ", &_4$$3); diff --git a/ext/phalcon/helper/str.zep.c b/ext/phalcon/helper/str.zep.c index fb3f07e8a49..134c9ad8432 100644 --- a/ext/phalcon/helper/str.zep.c +++ b/ext/phalcon/helper/str.zep.c @@ -169,14 +169,14 @@ PHP_METHOD(Phalcon_Helper_Str, concat) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_helper_exception_ce, "concat needs at least three parameters", "phalcon/Helper/Str.zep", 78); return; } - ZEPHIR_CALL_CE_STATIC(&delimiter, phalcon_helper_arr_ce, "first", &_0, 294, &arguments); + ZEPHIR_CALL_CE_STATIC(&delimiter, phalcon_helper_arr_ce, "first", &_0, 301, &arguments); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&_1, phalcon_helper_arr_ce, "sliceright", &_2, 295, &arguments); + ZEPHIR_CALL_CE_STATIC(&_1, phalcon_helper_arr_ce, "sliceright", &_2, 302, &arguments); zephir_check_call_status(); ZEPHIR_CPY_WRT(&arguments, &_1); - ZEPHIR_CALL_CE_STATIC(&first, phalcon_helper_arr_ce, "first", &_0, 294, &arguments); + ZEPHIR_CALL_CE_STATIC(&first, phalcon_helper_arr_ce, "first", &_0, 301, &arguments); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&last, phalcon_helper_arr_ce, "last", &_3, 296, &arguments); + ZEPHIR_CALL_CE_STATIC(&last, phalcon_helper_arr_ce, "last", &_3, 303, &arguments); zephir_check_call_status(); ZEPHIR_INIT_VAR(&prefix); ZVAL_STRING(&prefix, ""); @@ -184,12 +184,12 @@ PHP_METHOD(Phalcon_Helper_Str, concat) ZVAL_STRING(&suffix, ""); ZEPHIR_INIT_VAR(&data); array_init(&data); - ZEPHIR_CALL_SELF(&_1, "startswith", &_4, 297, &first, &delimiter); + ZEPHIR_CALL_SELF(&_1, "startswith", &_4, 304, &first, &delimiter); zephir_check_call_status(); if (zephir_is_true(&_1)) { ZEPHIR_CPY_WRT(&prefix, &delimiter); } - ZEPHIR_CALL_SELF(&_5, "endswith", &_6, 298, &last, &delimiter); + ZEPHIR_CALL_SELF(&_5, "endswith", &_6, 305, &last, &delimiter); zephir_check_call_status(); if (zephir_is_true(&_5)) { ZEPHIR_CPY_WRT(&suffix, &delimiter); @@ -360,7 +360,7 @@ PHP_METHOD(Phalcon_Helper_Str, decapitalize) if ((zephir_function_exists_ex(ZEND_STRL("mb_substr")) == SUCCESS)) { ZVAL_LONG(&_0$$3, 1); - ZEPHIR_CALL_FUNCTION(&substr, "mb_substr", NULL, 221, &text, &_0$$3); + ZEPHIR_CALL_FUNCTION(&substr, "mb_substr", NULL, 222, &text, &_0$$3); zephir_check_call_status(); } else { ZVAL_LONG(&_1$$4, 1); @@ -369,7 +369,7 @@ PHP_METHOD(Phalcon_Helper_Str, decapitalize) } if (upperRest) { if ((zephir_function_exists_ex(ZEND_STRL("mb_strtoupper")) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&suffix, "mb_strtoupper", NULL, 299, &substr, &encoding); + ZEPHIR_CALL_FUNCTION(&suffix, "mb_strtoupper", NULL, 306, &substr, &encoding); zephir_check_call_status(); } else { ZEPHIR_CALL_METHOD(&suffix, &substr, "upper", NULL, 0); @@ -381,7 +381,7 @@ PHP_METHOD(Phalcon_Helper_Str, decapitalize) if ((zephir_function_exists_ex(ZEND_STRL("mb_strtolower")) == SUCCESS)) { ZVAL_LONG(&_2$$9, 0); ZVAL_LONG(&_3$$9, 1); - ZEPHIR_CALL_FUNCTION(&_4$$9, "mb_substr", NULL, 221, &text, &_2$$9, &_3$$9); + ZEPHIR_CALL_FUNCTION(&_4$$9, "mb_substr", NULL, 222, &text, &_2$$9, &_3$$9); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&_5$$9, "mb_strtolower", NULL, 10, &_4$$9, &encoding); zephir_check_call_status(); @@ -743,24 +743,24 @@ PHP_METHOD(Phalcon_Helper_Str, dynamic) } - ZEPHIR_CALL_FUNCTION(&_0, "substr_count", NULL, 300, &text, &leftDelimiter); + ZEPHIR_CALL_FUNCTION(&_0, "substr_count", NULL, 307, &text, &leftDelimiter); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "substr_count", NULL, 300, &text, &rightDelimiter); + ZEPHIR_CALL_FUNCTION(&_1, "substr_count", NULL, 307, &text, &rightDelimiter); zephir_check_call_status(); if (UNEXPECTED(!ZEPHIR_IS_IDENTICAL(&_0, &_1))) { ZEPHIR_INIT_VAR(&_2$$3); object_init_ex(&_2$$3, spl_ce_RuntimeException); ZEPHIR_INIT_VAR(&_3$$3); ZEPHIR_CONCAT_SVS(&_3$$3, "Syntax error in string \"", &text, "\""); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 301, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 308, &_3$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_2$$3, "phalcon/Helper/Str.zep", 290); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_FUNCTION(&ldS, "preg_quote", NULL, 291, &leftDelimiter); + ZEPHIR_CALL_FUNCTION(&ldS, "preg_quote", NULL, 298, &leftDelimiter); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&rdS, "preg_quote", NULL, 291, &rightDelimiter); + ZEPHIR_CALL_FUNCTION(&rdS, "preg_quote", NULL, 298, &rightDelimiter); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); ZEPHIR_CONCAT_SVSVVSVS(&_4, "/", &ldS, "([^", &ldS, &rdS, "]+)", &rdS, "/"); @@ -790,11 +790,11 @@ PHP_METHOD(Phalcon_Helper_Str, dynamic) 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, 195, &words); + ZEPHIR_CALL_FUNCTION(&_10$$6, "array_rand", &_11, 196, &words); zephir_check_call_status(); zephir_array_fetch(&word, &words, &_10$$6, PH_NOISY, "phalcon/Helper/Str.zep", 309); zephir_array_fetch_long(&_12$$6, &match, 0, PH_NOISY | PH_READONLY, "phalcon/Helper/Str.zep", 310); - ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 291, &_12$$6, &separator); + ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 298, &_12$$6, &separator); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_13$$6); ZEPHIR_CONCAT_SVS(&_13$$6, "/", &sub, "/"); @@ -825,11 +825,11 @@ PHP_METHOD(Phalcon_Helper_Str, dynamic) 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, 195, &words); + ZEPHIR_CALL_FUNCTION(&_19$$8, "array_rand", &_11, 196, &words); zephir_check_call_status(); zephir_array_fetch(&word, &words, &_19$$8, PH_NOISY, "phalcon/Helper/Str.zep", 309); zephir_array_fetch_long(&_20$$8, &match, 0, PH_NOISY | PH_READONLY, "phalcon/Helper/Str.zep", 310); - ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 291, &_20$$8, &separator); + ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 298, &_20$$8, &separator); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_21$$8); ZEPHIR_CONCAT_SVS(&_21$$8, "/", &sub, "/"); @@ -971,16 +971,16 @@ PHP_METHOD(Phalcon_Helper_Str, firstBetween) if ((zephir_function_exists_ex(ZEND_STRL("mb_strstr")) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&_0$$3, "mb_strstr", NULL, 302, &text, &start); + ZEPHIR_CALL_FUNCTION(&_0$$3, "mb_strstr", NULL, 309, &text, &start); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1$$3, "mb_strstr", NULL, 302, &_0$$3, &end, &__$true); + ZEPHIR_CALL_FUNCTION(&_1$$3, "mb_strstr", NULL, 309, &_0$$3, &end, &__$true); zephir_check_call_status(); zephir_cast_to_string(&_2$$3, &_1$$3); ZEPHIR_CPY_WRT(&text, &_2$$3); } else { - ZEPHIR_CALL_FUNCTION(&_3$$4, "strstr", NULL, 303, &text, &start); + ZEPHIR_CALL_FUNCTION(&_3$$4, "strstr", NULL, 310, &text, &start); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_4$$4, "strstr", NULL, 303, &_3$$4, &end, &__$true); + ZEPHIR_CALL_FUNCTION(&_4$$4, "strstr", NULL, 310, &_3$$4, &end, &__$true); zephir_check_call_status(); zephir_cast_to_string(&_5$$4, &_4$$4); ZEPHIR_CPY_WRT(&text, &_5$$4); @@ -1344,7 +1344,7 @@ PHP_METHOD(Phalcon_Helper_Str, includes) if ((zephir_function_exists_ex(ZEND_STRL("mb_strpos")) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&_0$$3, "mb_strpos", NULL, 304, &haystack, &needle); + ZEPHIR_CALL_FUNCTION(&_0$$3, "mb_strpos", NULL, 311, &haystack, &needle); zephir_check_call_status(); RETURN_MM_BOOL(!ZEPHIR_IS_FALSE_IDENTICAL(&_0$$3)); } else { @@ -1472,10 +1472,10 @@ PHP_METHOD(Phalcon_Helper_Str, isAnagram) ZVAL_LONG(&_0, 1); - ZEPHIR_CALL_FUNCTION(&_1, "count_chars", NULL, 305, &first, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "count_chars", NULL, 312, &first, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, 1); - ZEPHIR_CALL_FUNCTION(&_2, "count_chars", NULL, 305, &second, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "count_chars", NULL, 312, &second, &_0); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_IDENTICAL(&_1, &_2)); } @@ -1587,7 +1587,7 @@ PHP_METHOD(Phalcon_Helper_Str, isPalindrome) } - ZEPHIR_CALL_FUNCTION(&_0, "strrev", NULL, 306, &text); + ZEPHIR_CALL_FUNCTION(&_0, "strrev", NULL, 313, &text); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_IDENTICAL(&_0, &text)); } @@ -1651,7 +1651,7 @@ PHP_METHOD(Phalcon_Helper_Str, isUpper) if ((zephir_function_exists_ex(ZEND_STRL("mb_strtoupper")) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&_0$$3, "mb_strtoupper", NULL, 299, &text, &encoding); + ZEPHIR_CALL_FUNCTION(&_0$$3, "mb_strtoupper", NULL, 306, &text, &encoding); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_IDENTICAL(&text, &_0$$3)); } else { @@ -1814,13 +1814,13 @@ PHP_METHOD(Phalcon_Helper_Str, random) ZVAL_STRING(&_0$$3, "a"); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "z"); - ZEPHIR_CALL_FUNCTION(&_2$$3, "range", NULL, 307, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(&_2$$3, "range", NULL, 314, &_0$$3, &_1$$3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_0$$3); ZVAL_STRING(&_0$$3, "A"); ZEPHIR_INIT_NVAR(&_1$$3); ZVAL_STRING(&_1$$3, "Z"); - ZEPHIR_CALL_FUNCTION(&_3$$3, "range", NULL, 307, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(&_3$$3, "range", NULL, 314, &_0$$3, &_1$$3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&pool); zephir_fast_array_merge(&pool, &_2$$3, &_3$$3); @@ -1829,13 +1829,13 @@ PHP_METHOD(Phalcon_Helper_Str, random) if (type == 2) { ZVAL_LONG(&_4$$4, 0); ZVAL_LONG(&_5$$4, 9); - ZEPHIR_CALL_FUNCTION(&_6$$4, "range", NULL, 307, &_4$$4, &_5$$4); + ZEPHIR_CALL_FUNCTION(&_6$$4, "range", NULL, 314, &_4$$4, &_5$$4); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_7$$4); ZVAL_STRING(&_7$$4, "a"); ZEPHIR_INIT_VAR(&_8$$4); ZVAL_STRING(&_8$$4, "f"); - ZEPHIR_CALL_FUNCTION(&_9$$4, "range", NULL, 307, &_7$$4, &_8$$4); + ZEPHIR_CALL_FUNCTION(&_9$$4, "range", NULL, 314, &_7$$4, &_8$$4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&pool); zephir_fast_array_merge(&pool, &_6$$4, &_9$$4); @@ -1844,14 +1844,14 @@ PHP_METHOD(Phalcon_Helper_Str, random) if (type == 3) { ZVAL_LONG(&_10$$5, 0); ZVAL_LONG(&_11$$5, 9); - ZEPHIR_CALL_FUNCTION(&pool, "range", NULL, 307, &_10$$5, &_11$$5); + ZEPHIR_CALL_FUNCTION(&pool, "range", NULL, 314, &_10$$5, &_11$$5); zephir_check_call_status(); break; } if (type == 4) { ZVAL_LONG(&_12$$6, 1); ZVAL_LONG(&_13$$6, 9); - ZEPHIR_CALL_FUNCTION(&pool, "range", NULL, 307, &_12$$6, &_13$$6); + ZEPHIR_CALL_FUNCTION(&pool, "range", NULL, 314, &_12$$6, &_13$$6); zephir_check_call_status(); break; } @@ -1864,21 +1864,21 @@ PHP_METHOD(Phalcon_Helper_Str, random) } ZVAL_LONG(&_15$$8, 0); ZVAL_LONG(&_16$$8, 9); - ZEPHIR_CALL_FUNCTION(&_17$$8, "range", NULL, 307, &_15$$8, &_16$$8); + ZEPHIR_CALL_FUNCTION(&_17$$8, "range", NULL, 314, &_15$$8, &_16$$8); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_18$$8); ZVAL_STRING(&_18$$8, "a"); ZEPHIR_INIT_VAR(&_19$$8); ZVAL_STRING(&_19$$8, "z"); - ZEPHIR_CALL_FUNCTION(&_20$$8, "range", NULL, 307, &_18$$8, &_19$$8); + ZEPHIR_CALL_FUNCTION(&_20$$8, "range", NULL, 314, &_18$$8, &_19$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_18$$8); ZVAL_STRING(&_18$$8, "A"); ZEPHIR_INIT_NVAR(&_19$$8); ZVAL_STRING(&_19$$8, "Z"); - ZEPHIR_CALL_FUNCTION(&_21$$8, "range", NULL, 307, &_18$$8, &_19$$8); + ZEPHIR_CALL_FUNCTION(&_21$$8, "range", NULL, 314, &_18$$8, &_19$$8); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&pool, "array_merge", NULL, 308, &_17$$8, &_20$$8, &_21$$8); + ZEPHIR_CALL_FUNCTION(&pool, "array_merge", NULL, 315, &_17$$8, &_20$$8, &_21$$8); zephir_check_call_status(); break; } while(0); @@ -2200,7 +2200,7 @@ PHP_METHOD(Phalcon_Helper_Str, upper) if ((zephir_function_exists_ex(ZEND_STRL("mb_strtoupper")) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_strtoupper", NULL, 299, &text, &encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strtoupper", NULL, 306, &text, &encoding); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/html/breadcrumbs.zep.c b/ext/phalcon/html/breadcrumbs.zep.c index c89e24997a2..faeee07fc1e 100644 --- a/ext/phalcon/html/breadcrumbs.zep.c +++ b/ext/phalcon/html/breadcrumbs.zep.c @@ -267,7 +267,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, 287, &urls); + ZEPHIR_CALL_FUNCTION(&lastUrl, "end", NULL, 294, &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 d0f75f43fe2..c8104244214 100644 --- a/ext/phalcon/html/escaper.zep.c +++ b/ext/phalcon/html/escaper.zep.c @@ -122,7 +122,7 @@ PHP_METHOD(Phalcon_Html_Escaper, attributes) zephir_read_property(&_0, this_ptr, ZEND_STRL("encoding"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_1, this_ptr, ZEND_STRL("doubleEncode"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_2, 3); - ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 309, &input, &_2, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 316, &input, &_2, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -158,9 +158,9 @@ PHP_METHOD(Phalcon_Html_Escaper, css) zephir_get_strval(&input, input_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 310, &input); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 317, &input); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapecss", NULL, 311, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapecss", NULL, 318, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -233,7 +233,7 @@ PHP_METHOD(Phalcon_Html_Escaper, detectEncoding) { ZEPHIR_INIT_NVAR(&charset); ZVAL_COPY(&charset, _2); - ZEPHIR_CALL_FUNCTION(&_4$$5, "mb_detect_encoding", &_5, 312, &input, &charset, &__$true); + ZEPHIR_CALL_FUNCTION(&_4$$5, "mb_detect_encoding", &_5, 319, &input, &charset, &__$true); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&_4$$5)) { RETURN_CCTOR(&charset); @@ -250,7 +250,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, 312, &input, &charset, &__$true); + ZEPHIR_CALL_FUNCTION(&_6$$7, "mb_detect_encoding", &_5, 319, &input, &charset, &__$true); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&_6$$7)) { RETURN_CCTOR(&charset); @@ -260,7 +260,7 @@ PHP_METHOD(Phalcon_Html_Escaper, detectEncoding) } } ZEPHIR_INIT_NVAR(&charset); - ZEPHIR_RETURN_CALL_FUNCTION("mb_detect_encoding", &_5, 312, &input); + ZEPHIR_RETURN_CALL_FUNCTION("mb_detect_encoding", &_5, 319, &input); zephir_check_call_status(); RETURN_MM(); } @@ -499,7 +499,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, 309, &input, &_0, &_1, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 316, &input, &_0, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -535,9 +535,9 @@ PHP_METHOD(Phalcon_Html_Escaper, js) zephir_get_strval(&input, input_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 310, &input); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 317, &input); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapejs", NULL, 313, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapejs", NULL, 320, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -573,11 +573,11 @@ PHP_METHOD(Phalcon_Html_Escaper, normalizeEncoding) zephir_get_strval(&input, input_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "detectencoding", NULL, 314, &input); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "detectencoding", NULL, 321, &input); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "UTF-32"); - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 315, &input, &_1, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 322, &input, &_1, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -753,7 +753,7 @@ PHP_METHOD(Phalcon_Html_Escaper, url) zephir_get_strval(&input, input_param); - ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 316, &input); + ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 323, &input); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/html/helper/input/select.zep.c b/ext/phalcon/html/helper/input/select.zep.c index 1f4de849640..29016461fe1 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, 317, &attributes, &value); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "processvalue", NULL, 324, &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 1dc88389749..6637ff9f4a2 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, 318, &_0, &httpEquiv, &content); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addelement", NULL, 325, &_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, 318, &_0, &name, &content); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 325, &_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, 318, &_0, &name, &content); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 325, &_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 b8d40c939c7..2464ab431bd 100644 --- a/ext/phalcon/html/helper/title.zep.c +++ b/ext/phalcon/html/helper/title.zep.c @@ -163,7 +163,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, 308, &_0, &_1, &_3); + ZEPHIR_CALL_FUNCTION(&items, "array_merge", NULL, 315, &_0, &_1, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); zephir_read_property(&_5, this_ptr, ZEND_STRL("indent"), PH_NOISY_CC | PH_READONLY); diff --git a/ext/phalcon/http/cookie.zep.c b/ext/phalcon/http/cookie.zep.c index 0febdaf9af5..12bf5b2692d 100644 --- a/ext/phalcon/http/cookie.zep.c +++ b/ext/phalcon/http/cookie.zep.c @@ -335,7 +335,7 @@ PHP_METHOD(Phalcon_Http_Cookie, delete) ZEPHIR_CALL_CE_STATIC(&_13, phalcon_helper_arr_ce, "get", &_8, 81, &options, &_9, &httpOnly); zephir_check_call_status(); zephir_array_update_string(&options, SL("httponly"), &_13, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 319, &name, &__$null, &options); + ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 326, &name, &__$null, &options); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -917,7 +917,7 @@ PHP_METHOD(Phalcon_Http_Cookie, send) ZEPHIR_CALL_CE_STATIC(&_22, phalcon_helper_arr_ce, "get", &_18, 81, &options, &_3, &httpOnly); zephir_check_call_status(); zephir_array_update_string(&options, SL("httponly"), &_22, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 319, &name, &encryptValue, &options); + ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 326, &name, &encryptValue, &options); zephir_check_call_status(); RETURN_THIS(); } @@ -1301,7 +1301,7 @@ PHP_METHOD(Phalcon_Http_Cookie, assertSignKeyIsLongEnough) } - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 231, &signKey); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 232, &signKey); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_LT_LONG(&length, 32))) { ZEPHIR_INIT_VAR(&_0$$3); diff --git a/ext/phalcon/http/message/request.zep.c b/ext/phalcon/http/message/request.zep.c index be6b8d6d7d5..83f6c4ce230 100644 --- a/ext/phalcon/http/message/request.zep.c +++ b/ext/phalcon/http/message/request.zep.c @@ -111,13 +111,13 @@ PHP_METHOD(Phalcon_Http_Message_Request, __construct) if (UNEXPECTED(ZEPHIR_IS_IDENTICAL(&_0, body))) { ZEPHIR_INIT_NVAR(body); object_init_ex(body, phalcon_http_message_stream_input_ce); - ZEPHIR_CALL_METHOD(NULL, body, "__construct", NULL, 320); + ZEPHIR_CALL_METHOD(NULL, body, "__construct", NULL, 327); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&_1, this_ptr, "processuri", NULL, 321, uri); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "processuri", NULL, 328, uri); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("uri"), &_1); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "processheaders", NULL, 322, headers); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "processheaders", NULL, 329, headers); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("headers"), &_2); ZEPHIR_CALL_METHOD(&_3, this_ptr, "processmethod", NULL, 110, &method); diff --git a/ext/phalcon/http/message/requestfactory.zep.c b/ext/phalcon/http/message/requestfactory.zep.c index 537e0f72e40..32dc0b1d9d6 100644 --- a/ext/phalcon/http/message/requestfactory.zep.c +++ b/ext/phalcon/http/message/requestfactory.zep.c @@ -84,7 +84,7 @@ PHP_METHOD(Phalcon_Http_Message_RequestFactory, createRequest) object_init_ex(return_value, phalcon_http_message_request_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 323, &method, uri); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 330, &method, uri); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/http/message/response.zep.c b/ext/phalcon/http/message/response.zep.c index db068d1050e..40e30f4dea1 100644 --- a/ext/phalcon/http/message/response.zep.c +++ b/ext/phalcon/http/message/response.zep.c @@ -161,9 +161,9 @@ PHP_METHOD(Phalcon_Http_Message_Response, __construct) ZVAL_LONG(&_0, code); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "processcode", NULL, 324, &_0); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "processcode", NULL, 331, &_0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "processheaders", NULL, 322, &headers); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "processheaders", NULL, 329, &headers); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("headers"), &_1); ZEPHIR_INIT_VAR(&_3); @@ -373,14 +373,14 @@ PHP_METHOD(Phalcon_Http_Message_Response, processCode) } - ZEPHIR_CALL_METHOD(&phrases, this_ptr, "getphrases", NULL, 325); + ZEPHIR_CALL_METHOD(&phrases, this_ptr, "getphrases", NULL, 332); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkcodetype", NULL, 326, code); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkcodetype", NULL, 333, code); zephir_check_call_status(); _0 = zephir_get_intval(code); ZEPHIR_INIT_NVAR(code); ZVAL_LONG(code, _0); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkcodevalue", NULL, 327, code); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkcodevalue", NULL, 334, code); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(phrase) != IS_STRING)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Invalid response reason", "phalcon/Http/Message/Response.zep", 226); @@ -471,7 +471,7 @@ PHP_METHOD(Phalcon_Http_Message_Response, checkCodeValue) ZVAL_LONG(&_2, code); ZVAL_LONG(&_3, 100); ZVAL_LONG(&_4, 599); - ZEPHIR_CALL_CE_STATIC(&_0, phalcon_helper_number_ce, "between", &_1, 328, &_2, &_3, &_4); + ZEPHIR_CALL_CE_STATIC(&_0, phalcon_helper_number_ce, "between", &_1, 335, &_2, &_3, &_4); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { ZEPHIR_INIT_VAR(&_5$$3); diff --git a/ext/phalcon/http/message/responsefactory.zep.c b/ext/phalcon/http/message/responsefactory.zep.c index 0da04f36bd4..3e83c31fdf3 100644 --- a/ext/phalcon/http/message/responsefactory.zep.c +++ b/ext/phalcon/http/message/responsefactory.zep.c @@ -90,10 +90,10 @@ PHP_METHOD(Phalcon_Http_Message_ResponseFactory, createResponse) ZEPHIR_INIT_VAR(&_0); object_init_ex(&_0, phalcon_http_message_response_ce); - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 329); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 336); zephir_check_call_status(); ZVAL_LONG(&_1, code); - ZEPHIR_RETURN_CALL_METHOD(&_0, "withstatus", NULL, 330, &_1, &reasonPhrase); + ZEPHIR_RETURN_CALL_METHOD(&_0, "withstatus", NULL, 337, &_1, &reasonPhrase); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/http/message/serverrequest.zep.c b/ext/phalcon/http/message/serverrequest.zep.c index 3227ff24af2..cea0ea9b2f4 100644 --- a/ext/phalcon/http/message/serverrequest.zep.c +++ b/ext/phalcon/http/message/serverrequest.zep.c @@ -334,10 +334,10 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequest, __construct) if (UNEXPECTED(ZEPHIR_IS_IDENTICAL(&_0, body))) { ZEPHIR_INIT_NVAR(body); object_init_ex(body, phalcon_http_message_stream_input_ce); - ZEPHIR_CALL_METHOD(NULL, body, "__construct", NULL, 320); + ZEPHIR_CALL_METHOD(NULL, body, "__construct", NULL, 327); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkuploadedfiles", NULL, 331, &uploadFiles); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkuploadedfiles", NULL, 338, &uploadFiles); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_1, this_ptr, "processprotocol", NULL, 38, &protocol); zephir_check_call_status(); @@ -345,10 +345,10 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequest, __construct) ZEPHIR_CALL_METHOD(&_2, this_ptr, "processmethod", NULL, 110, &method); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("method"), &_2); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "processheaders", NULL, 322, headers); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "processheaders", NULL, 329, headers); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("headers"), &_3); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "processuri", NULL, 321, uri); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "processuri", NULL, 328, uri); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("uri"), &_4); ZEPHIR_INIT_VAR(&_6); @@ -696,7 +696,7 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequest, withUploadedFiles) zephir_get_arrval(&uploadedFiles, uploadedFiles_param); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkuploadedfiles", NULL, 331, &uploadedFiles); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkuploadedfiles", NULL, 338, &uploadedFiles); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "uploadedFiles"); @@ -796,7 +796,7 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequest, checkUploadedFiles) ZEPHIR_INIT_NVAR(&file); ZVAL_COPY(&file, _0); if (UNEXPECTED(Z_TYPE_P(&file) == IS_ARRAY)) { - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkuploadedfiles", &_2, 331, &file); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkuploadedfiles", &_2, 338, &file); zephir_check_call_status(); } else { _3$$5 = Z_TYPE_P(&file) == IS_OBJECT; @@ -821,7 +821,7 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequest, checkUploadedFiles) ZEPHIR_CALL_METHOD(&file, &files, "current", NULL, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&file) == IS_ARRAY)) { - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkuploadedfiles", &_2, 331, &file); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkuploadedfiles", &_2, 338, &file); zephir_check_call_status(); } else { _4$$9 = Z_TYPE_P(&file) == IS_OBJECT; diff --git a/ext/phalcon/http/message/serverrequestfactory.zep.c b/ext/phalcon/http/message/serverrequestfactory.zep.c index c78c05ae138..990f0f80586 100644 --- a/ext/phalcon/http/message/serverrequestfactory.zep.c +++ b/ext/phalcon/http/message/serverrequestfactory.zep.c @@ -102,7 +102,7 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, createServerRequest) object_init_ex(return_value, phalcon_http_message_serverrequest_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 332, &method, uri, &serverParams); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 339, &method, uri, &serverParams); zephir_check_call_status(); RETURN_MM(); } @@ -238,22 +238,22 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, load) if (!(ZEPHIR_IS_EMPTY(&_SERVER))) { ZEPHIR_CPY_WRT(&globalServer, &_SERVER); } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "checknullarray", NULL, 333, &server, &globalServer); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "checknullarray", NULL, 340, &server, &globalServer); zephir_check_call_status(); ZEPHIR_CPY_WRT(&server, &_0); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "checknullarray", NULL, 333, &files, &globalFiles); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "checknullarray", NULL, 340, &files, &globalFiles); zephir_check_call_status(); ZEPHIR_CPY_WRT(&files, &_1); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "checknullarray", NULL, 333, &cookies, &globalCookies); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "checknullarray", NULL, 340, &cookies, &globalCookies); zephir_check_call_status(); ZEPHIR_CPY_WRT(&cookies, &_2); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "checknullarray", NULL, 333, &get, &globalGet); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "checknullarray", NULL, 340, &get, &globalGet); zephir_check_call_status(); ZEPHIR_CPY_WRT(&get, &_3); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "checknullarray", NULL, 333, &post, &globalPost); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "checknullarray", NULL, 340, &post, &globalPost); zephir_check_call_status(); ZEPHIR_CPY_WRT(&post, &_4); - ZEPHIR_CALL_METHOD(&serverCollection, this_ptr, "parseserver", NULL, 334, &server); + ZEPHIR_CALL_METHOD(&serverCollection, this_ptr, "parseserver", NULL, 341, &server); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5); ZVAL_STRING(&_5, "REQUEST_METHOD"); @@ -261,11 +261,11 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, load) ZVAL_STRING(&_6, "GET"); ZEPHIR_CALL_METHOD(&method, &serverCollection, "get", NULL, 0, &_5, &_6); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&protocol, this_ptr, "parseprotocol", NULL, 335, &serverCollection); + ZEPHIR_CALL_METHOD(&protocol, this_ptr, "parseprotocol", NULL, 342, &serverCollection); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&headers, this_ptr, "parseheaders", NULL, 336, &serverCollection); + ZEPHIR_CALL_METHOD(&headers, this_ptr, "parseheaders", NULL, 343, &serverCollection); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&filesCollection, this_ptr, "parseuploadedfiles", NULL, 337, &files); + ZEPHIR_CALL_METHOD(&filesCollection, this_ptr, "parseuploadedfiles", NULL, 344, &files); zephir_check_call_status(); ZEPHIR_CPY_WRT(&cookiesCollection, &cookies); _7 = ZEPHIR_IS_EMPTY(&cookies); @@ -281,11 +281,11 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, load) ZVAL_STRING(&_10$$8, "cookie"); ZEPHIR_CALL_METHOD(&_9$$8, &headers, "get", NULL, 0, &_10$$8); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&cookiesCollection, this_ptr, "parsecookieheader", NULL, 338, &_9$$8); + ZEPHIR_CALL_METHOD(&cookiesCollection, this_ptr, "parsecookieheader", NULL, 345, &_9$$8); zephir_check_call_status(); } object_init_ex(return_value, phalcon_http_message_serverrequest_ce); - ZEPHIR_CALL_METHOD(&_11, this_ptr, "parseuri", NULL, 339, &serverCollection, &headers); + ZEPHIR_CALL_METHOD(&_11, this_ptr, "parseuri", NULL, 346, &serverCollection, &headers); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_12, &serverCollection, "toarray", NULL, 0); zephir_check_call_status(); @@ -295,7 +295,7 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, load) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_5); ZVAL_STRING(&_5, "php://input"); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 332, &method, &_11, &_12, &_5, &_13, &cookiesCollection, &get, &_14, &post, &protocol); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 339, &method, &_11, &_12, &_5, &_13, &cookiesCollection, &get, &_14, &post, &protocol); zephir_check_call_status(); RETURN_MM(); } @@ -316,7 +316,7 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, getHeaders) ZEPHIR_MM_GROW(); if (EXPECTED((zephir_function_exists_ex(ZEND_STRL("apache_request_headers")) == SUCCESS))) { - ZEPHIR_RETURN_CALL_FUNCTION("apache_request_headers", NULL, 340); + ZEPHIR_RETURN_CALL_FUNCTION("apache_request_headers", NULL, 347); zephir_check_call_status(); RETURN_MM(); } @@ -372,14 +372,14 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, calculateUriHost) ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "host"); ZVAL_BOOL(&_2, 0); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "getheader", NULL, 341, headers, &_0, &_2); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getheader", NULL, 348, headers, &_0, &_2); zephir_check_call_status(); if (UNEXPECTED(zephir_is_true(&_1))) { ZEPHIR_INIT_VAR(&_3$$3); ZVAL_STRING(&_3$$3, "host"); - ZEPHIR_CALL_METHOD(&host, this_ptr, "getheader", NULL, 341, headers, &_3$$3); + ZEPHIR_CALL_METHOD(&host, this_ptr, "getheader", NULL, 348, headers, &_3$$3); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "calculateurihostfromheader", NULL, 342, &host); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "calculateurihostfromheader", NULL, 349, &host); zephir_check_call_status(); RETURN_MM(); } @@ -669,7 +669,7 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, calculateUriScheme) ZVAL_STRING(&_1, "x-forwarded-proto"); ZEPHIR_INIT_VAR(&_8); ZVAL_STRING(&_8, "https"); - ZEPHIR_CALL_METHOD(&header, this_ptr, "getheader", NULL, 341, headers, &_1, &_8); + ZEPHIR_CALL_METHOD(&header, this_ptr, "getheader", NULL, 348, headers, &_1, &_8); zephir_check_call_status(); _9 = !zephir_is_true(&isHttps); if (!(_9)) { @@ -795,7 +795,7 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, createUploadedFile) zephir_array_fetch_string(&_4, &file, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Message/ServerRequestFactory.zep", 326); zephir_array_fetch_string(&_5, &file, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Message/ServerRequestFactory.zep", 327); zephir_array_fetch_string(&_6, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Message/ServerRequestFactory.zep", 328); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 343, &_4, &_5, &_6, &name, &type); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 350, &_4, &_5, &_6, &name, &type); zephir_check_call_status(); RETURN_MM(); } @@ -897,7 +897,7 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseCookieHeader) ZEPHIR_CALL_FUNCTION(&_1, "strtr", NULL, 5, &cookieHeader, &_0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&cookies); - ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 344, &_1, &cookies); + ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 351, &_1, &cookies); ZEPHIR_UNREF(&cookies); zephir_check_call_status(); RETURN_CCTOR(&cookies); @@ -1278,7 +1278,7 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseServer) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "HTTP_AUTHORIZATION"); - ZEPHIR_CALL_METHOD(&_0, &collection, "has", NULL, 345, &_1); + ZEPHIR_CALL_METHOD(&_0, &collection, "has", NULL, 352, &_1); zephir_check_call_status(); _2 = !zephir_is_true(&_0); if (_2) { @@ -1291,12 +1291,12 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseServer) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4$$3); ZVAL_STRING(&_4$$3, "Authorization"); - ZEPHIR_CALL_METHOD(&_3$$3, &headersCollection, "has", NULL, 345, &_4$$3); + ZEPHIR_CALL_METHOD(&_3$$3, &headersCollection, "has", NULL, 352, &_4$$3); zephir_check_call_status(); if (UNEXPECTED(zephir_is_true(&_3$$3))) { ZEPHIR_INIT_VAR(&_6$$4); ZVAL_STRING(&_6$$4, "Authorization"); - ZEPHIR_CALL_METHOD(&_5$$4, &headersCollection, "get", NULL, 346, &_6$$4); + ZEPHIR_CALL_METHOD(&_5$$4, &headersCollection, "get", NULL, 353, &_6$$4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_6$$4); ZVAL_STRING(&_6$$4, "HTTP_AUTHORIZATION"); @@ -1385,14 +1385,14 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseUploadedFiles) _7$$3 = zephir_array_isset_string(&file, SL("tmp_name")); } if (EXPECTED(_7$$3)) { - ZEPHIR_CALL_METHOD(&_8$$5, this_ptr, "createuploadedfile", &_9, 347, &file); + ZEPHIR_CALL_METHOD(&_8$$5, this_ptr, "createuploadedfile", &_9, 354, &file); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &collection, "set", &_6, 42, &key, &_8$$5); zephir_check_call_status(); continue; } if (UNEXPECTED(Z_TYPE_P(&file) == IS_ARRAY)) { - ZEPHIR_CALL_METHOD(&data, this_ptr, "parseuploadedfiles", &_10, 337, &file); + ZEPHIR_CALL_METHOD(&data, this_ptr, "parseuploadedfiles", &_10, 344, &file); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_11$$6, &data, "toarray", NULL, 0); zephir_check_call_status(); @@ -1430,14 +1430,14 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseUploadedFiles) _14$$7 = zephir_array_isset_string(&file, SL("tmp_name")); } if (EXPECTED(_14$$7)) { - ZEPHIR_CALL_METHOD(&_15$$9, this_ptr, "createuploadedfile", &_9, 347, &file); + ZEPHIR_CALL_METHOD(&_15$$9, this_ptr, "createuploadedfile", &_9, 354, &file); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &collection, "set", &_6, 42, &key, &_15$$9); zephir_check_call_status(); continue; } if (UNEXPECTED(Z_TYPE_P(&file) == IS_ARRAY)) { - ZEPHIR_CALL_METHOD(&data, this_ptr, "parseuploadedfiles", &_10, 337, &file); + ZEPHIR_CALL_METHOD(&data, this_ptr, "parseuploadedfiles", &_10, 344, &file); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_16$$10, &data, "toarray", NULL, 0); zephir_check_call_status(); @@ -1504,30 +1504,30 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseUri) object_init_ex(&uri, phalcon_http_message_uri_ce); ZEPHIR_CALL_METHOD(NULL, &uri, "__construct", NULL, 111); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&scheme, this_ptr, "calculateurischeme", NULL, 348, server, headers); + ZEPHIR_CALL_METHOD(&scheme, this_ptr, "calculateurischeme", NULL, 355, server, headers); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_0, &uri, "withscheme", NULL, 349, &scheme); + ZEPHIR_CALL_METHOD(&_0, &uri, "withscheme", NULL, 356, &scheme); zephir_check_call_status(); ZEPHIR_CPY_WRT(&uri, &_0); - ZEPHIR_CALL_METHOD(&split, this_ptr, "calculateurihost", NULL, 350, server, headers); + ZEPHIR_CALL_METHOD(&split, this_ptr, "calculateurihost", NULL, 357, server, headers); zephir_check_call_status(); ZEPHIR_OBS_VAR(&_1); zephir_array_fetch_long(&_1, &split, 0, PH_NOISY, "phalcon/Http/Message/ServerRequestFactory.zep", 586); if (EXPECTED(!(ZEPHIR_IS_EMPTY(&_1)))) { zephir_array_fetch_long(&_3$$3, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Message/ServerRequestFactory.zep", 587); - ZEPHIR_CALL_METHOD(&_2$$3, &uri, "withhost", NULL, 351, &_3$$3); + ZEPHIR_CALL_METHOD(&_2$$3, &uri, "withhost", NULL, 358, &_3$$3); zephir_check_call_status(); ZEPHIR_CPY_WRT(&uri, &_2$$3); ZEPHIR_OBS_VAR(&_4$$3); zephir_array_fetch_long(&_4$$3, &split, 1, PH_NOISY, "phalcon/Http/Message/ServerRequestFactory.zep", 588); if (UNEXPECTED(!(ZEPHIR_IS_EMPTY(&_4$$3)))) { zephir_array_fetch_long(&_6$$4, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Message/ServerRequestFactory.zep", 589); - ZEPHIR_CALL_METHOD(&_5$$4, &uri, "withport", NULL, 352, &_6$$4); + ZEPHIR_CALL_METHOD(&_5$$4, &uri, "withport", NULL, 359, &_6$$4); zephir_check_call_status(); ZEPHIR_CPY_WRT(&uri, &_5$$4); } } - ZEPHIR_CALL_METHOD(&path, this_ptr, "calculateuripath", NULL, 353, server); + ZEPHIR_CALL_METHOD(&path, this_ptr, "calculateuripath", NULL, 360, server); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&split); zephir_fast_explode_str(&split, SL("#"), &path, LONG_MAX); @@ -1535,18 +1535,18 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseUri) ZEPHIR_INIT_NVAR(&path); zephir_fast_explode_str(&path, SL("?"), &_7, LONG_MAX); zephir_array_fetch_long(&_8, &path, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Message/ServerRequestFactory.zep", 599); - ZEPHIR_CALL_METHOD(&_0, &uri, "withpath", NULL, 354, &_8); + ZEPHIR_CALL_METHOD(&_0, &uri, "withpath", NULL, 361, &_8); zephir_check_call_status(); ZEPHIR_CPY_WRT(&uri, &_0); if (UNEXPECTED(zephir_fast_count_int(&split) > 1)) { zephir_array_fetch_long(&_10$$5, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Message/ServerRequestFactory.zep", 602); - ZEPHIR_CALL_METHOD(&_9$$5, &uri, "withfragment", NULL, 355, &_10$$5); + ZEPHIR_CALL_METHOD(&_9$$5, &uri, "withfragment", NULL, 362, &_10$$5); zephir_check_call_status(); ZEPHIR_CPY_WRT(&uri, &_9$$5); } - ZEPHIR_CALL_METHOD(&query, this_ptr, "calculateuriquery", NULL, 356, server); + ZEPHIR_CALL_METHOD(&query, this_ptr, "calculateuriquery", NULL, 363, server); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_0, &uri, "withquery", NULL, 357, &query); + ZEPHIR_CALL_METHOD(&_0, &uri, "withquery", NULL, 364, &query); zephir_check_call_status(); ZEPHIR_CPY_WRT(&uri, &_0); RETURN_CCTOR(&uri); diff --git a/ext/phalcon/http/message/streamfactory.zep.c b/ext/phalcon/http/message/streamfactory.zep.c index 477783b4316..d5c48a91b9a 100644 --- a/ext/phalcon/http/message/streamfactory.zep.c +++ b/ext/phalcon/http/message/streamfactory.zep.c @@ -103,9 +103,9 @@ PHP_METHOD(Phalcon_Http_Message_StreamFactory, createStream) return; } zephir_fwrite(NULL, &handle, &content); - ZEPHIR_CALL_FUNCTION(NULL, "rewind", NULL, 358, &handle); + ZEPHIR_CALL_FUNCTION(NULL, "rewind", NULL, 365, &handle); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "createstreamfromresource", NULL, 359, &handle); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "createstreamfromresource", NULL, 366, &handle); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/http/message/uploadedfile.zep.c b/ext/phalcon/http/message/uploadedfile.zep.c index 8bc14aef0a2..0638d5d4795 100644 --- a/ext/phalcon/http/message/uploadedfile.zep.c +++ b/ext/phalcon/http/message/uploadedfile.zep.c @@ -256,10 +256,10 @@ PHP_METHOD(Phalcon_Http_Message_UploadedFile, __construct) ZVAL_LONG(&_0, error); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkstream", NULL, 360, stream, &_0); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkstream", NULL, 367, stream, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, error); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkerror", NULL, 361, &_0); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkerror", NULL, 368, &_0); zephir_check_call_status(); ZEPHIR_INIT_ZVAL_NREF(_0); ZVAL_LONG(&_0, size); @@ -308,7 +308,7 @@ PHP_METHOD(Phalcon_Http_Message_UploadedFile, getStream) ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_http_message_exception_invalidargumentexception_ce); zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("error"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "geterrordescription", NULL, 362, &_3$$3); + ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "geterrordescription", NULL, 369, &_3$$3); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 40, &_2$$3); zephir_check_call_status(); @@ -415,7 +415,7 @@ PHP_METHOD(Phalcon_Http_Message_UploadedFile, moveTo) ZEPHIR_INIT_VAR(&_2$$4); object_init_ex(&_2$$4, phalcon_http_message_exception_invalidargumentexception_ce); zephir_read_property(&_4$$4, this_ptr, ZEND_STRL("error"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "geterrordescription", NULL, 362, &_4$$4); + ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "geterrordescription", NULL, 369, &_4$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 40, &_3$$4); zephir_check_call_status(); @@ -429,17 +429,17 @@ PHP_METHOD(Phalcon_Http_Message_UploadedFile, moveTo) } _6 = _5; if (_6) { - ZEPHIR_CALL_FUNCTION(&_7, "dirname", NULL, 363, targetPath); + ZEPHIR_CALL_FUNCTION(&_7, "dirname", NULL, 370, targetPath); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_8, "is_dir", NULL, 147, &_7); + ZEPHIR_CALL_FUNCTION(&_8, "is_dir", NULL, 152, &_7); zephir_check_call_status(); _6 = zephir_is_true(&_8); } _9 = _6; if (_9) { - ZEPHIR_CALL_FUNCTION(&_10, "dirname", NULL, 363, targetPath); + ZEPHIR_CALL_FUNCTION(&_10, "dirname", NULL, 370, targetPath); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_11, "is_writable", NULL, 364, &_10); + ZEPHIR_CALL_FUNCTION(&_11, "is_writable", NULL, 371, &_10); zephir_check_call_status(); _9 = zephir_is_true(&_11); } @@ -466,11 +466,11 @@ PHP_METHOD(Phalcon_Http_Message_UploadedFile, moveTo) _16 = zephir_start_with_str(&sapi, SL("phpdbg")); } if (UNEXPECTED(_16)) { - ZEPHIR_CALL_METHOD(NULL, this_ptr, "storefile", NULL, 365, targetPath); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "storefile", NULL, 372, targetPath); zephir_check_call_status(); } else { zephir_read_property(&_17$$7, this_ptr, ZEND_STRL("fileName"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_18$$7, "move_uploaded_file", NULL, 366, &_17$$7, targetPath); + ZEPHIR_CALL_FUNCTION(&_18$$7, "move_uploaded_file", NULL, 373, &_17$$7, targetPath); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(&_18$$7)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "The file cannot be moved to the target folder", "phalcon/Http/Message/UploadedFile.zep", 246); @@ -518,7 +518,7 @@ PHP_METHOD(Phalcon_Http_Message_UploadedFile, checkError) ZVAL_LONG(&_2, error); ZVAL_LONG(&_3, 0); ZVAL_LONG(&_4, 8); - ZEPHIR_CALL_CE_STATIC(&_0, phalcon_helper_number_ce, "between", &_1, 328, &_2, &_3, &_4); + ZEPHIR_CALL_CE_STATIC(&_0, phalcon_helper_number_ce, "between", &_1, 335, &_2, &_3, &_4); zephir_check_call_status(); if (UNEXPECTED(!ZEPHIR_IS_TRUE_IDENTICAL(&_0))) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Invalid error. Must be one of the UPLOAD_ERR_* constants", "phalcon/Http/Message/UploadedFile.zep", 263); @@ -679,7 +679,7 @@ PHP_METHOD(Phalcon_Http_Message_UploadedFile, storeFile) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Cannot write to file.", "phalcon/Http/Message/UploadedFile.zep", 330); return; } - ZEPHIR_CALL_METHOD(&stream, this_ptr, "getstream", NULL, 367); + ZEPHIR_CALL_METHOD(&stream, this_ptr, "getstream", NULL, 374); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &stream, "rewind", NULL, 0); zephir_check_call_status(); diff --git a/ext/phalcon/http/message/uploadedfilefactory.zep.c b/ext/phalcon/http/message/uploadedfilefactory.zep.c index 4e152076102..bb47bf0a80d 100644 --- a/ext/phalcon/http/message/uploadedfilefactory.zep.c +++ b/ext/phalcon/http/message/uploadedfilefactory.zep.c @@ -112,7 +112,7 @@ PHP_METHOD(Phalcon_Http_Message_UploadedFileFactory, createUploadedFile) object_init_ex(return_value, phalcon_http_message_uploadedfile_ce); ZVAL_LONG(&_0, size); ZVAL_LONG(&_1, error); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 343, stream, &_0, &_1, &clientFilename, &clientMediaType); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 350, stream, &_0, &_1, &clientFilename, &clientMediaType); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/http/message/uri.zep.c b/ext/phalcon/http/message/uri.zep.c index 057a473eabf..2b4bba841de 100644 --- a/ext/phalcon/http/message/uri.zep.c +++ b/ext/phalcon/http/message/uri.zep.c @@ -296,7 +296,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, __construct) ZVAL_STRING(&_5$$3, ""); ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_helper_arr_ce, "get", &_3, 81, &urlParts, &_4$$3, &_5$$3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "filterfragment", NULL, 368, &_2$$3); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "filterfragment", NULL, 375, &_2$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("fragment"), &_1$$3); ZEPHIR_INIT_NVAR(&_4$$3); @@ -314,7 +314,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, __construct) ZVAL_STRING(&_7$$3, ""); ZEPHIR_CALL_CE_STATIC(&_8$$3, phalcon_helper_arr_ce, "get", &_3, 81, &urlParts, &_5$$3, &_7$$3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_9$$3, "rawurlencode", NULL, 316, &_8$$3); + ZEPHIR_CALL_FUNCTION(&_9$$3, "rawurlencode", NULL, 323, &_8$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("pass"), &_9$$3); ZEPHIR_INIT_NVAR(&_5$$3); @@ -323,7 +323,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, __construct) ZVAL_STRING(&_7$$3, ""); ZEPHIR_CALL_CE_STATIC(&_11$$3, phalcon_helper_arr_ce, "get", &_3, 81, &urlParts, &_5$$3, &_7$$3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_10$$3, this_ptr, "filterpath", NULL, 369, &_11$$3); + ZEPHIR_CALL_METHOD(&_10$$3, this_ptr, "filterpath", NULL, 376, &_11$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("path"), &_10$$3); ZEPHIR_INIT_NVAR(&_5$$3); @@ -331,7 +331,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, __construct) ZVAL_NULL(&_14$$3); ZEPHIR_CALL_CE_STATIC(&_13$$3, phalcon_helper_arr_ce, "get", &_3, 81, &urlParts, &_5$$3, &_14$$3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_12$$3, this_ptr, "filterport", NULL, 370, &_13$$3); + ZEPHIR_CALL_METHOD(&_12$$3, this_ptr, "filterport", NULL, 377, &_13$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("port"), &_12$$3); ZEPHIR_INIT_NVAR(&_5$$3); @@ -340,7 +340,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, __construct) ZVAL_STRING(&_7$$3, ""); ZEPHIR_CALL_CE_STATIC(&_16$$3, phalcon_helper_arr_ce, "get", &_3, 81, &urlParts, &_5$$3, &_7$$3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_15$$3, this_ptr, "filterquery", NULL, 371, &_16$$3); + ZEPHIR_CALL_METHOD(&_15$$3, this_ptr, "filterquery", NULL, 378, &_16$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("query"), &_15$$3); ZEPHIR_INIT_NVAR(&_5$$3); @@ -349,7 +349,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, __construct) ZVAL_STRING(&_7$$3, ""); ZEPHIR_CALL_CE_STATIC(&_18$$3, phalcon_helper_arr_ce, "get", &_3, 81, &urlParts, &_5$$3, &_7$$3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_17$$3, this_ptr, "filterscheme", NULL, 372, &_18$$3); + ZEPHIR_CALL_METHOD(&_17$$3, this_ptr, "filterscheme", NULL, 379, &_18$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("scheme"), &_17$$3); ZEPHIR_INIT_NVAR(&_5$$3); @@ -358,7 +358,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, __construct) ZVAL_STRING(&_7$$3, ""); ZEPHIR_CALL_CE_STATIC(&_19$$3, phalcon_helper_arr_ce, "get", &_3, 81, &urlParts, &_5$$3, &_7$$3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_20$$3, "rawurlencode", NULL, 316, &_19$$3); + ZEPHIR_CALL_FUNCTION(&_20$$3, "rawurlencode", NULL, 323, &_19$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("user"), &_20$$3); } @@ -402,7 +402,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, __toString) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&authority, this_ptr, "getauthority", NULL, 373); + ZEPHIR_CALL_METHOD(&authority, this_ptr, "getauthority", NULL, 380); zephir_check_call_status(); zephir_read_property(&_0, this_ptr, ZEND_STRL("path"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&path, &_0); @@ -428,21 +428,21 @@ PHP_METHOD(Phalcon_Http_Message_Uri, __toString) ZVAL_STRING(&_7, ""); ZEPHIR_INIT_VAR(&_8); ZVAL_STRING(&_8, ":"); - ZEPHIR_CALL_METHOD(&_6, this_ptr, "checkvalue", NULL, 374, &_0, &_7, &_8); + ZEPHIR_CALL_METHOD(&_6, this_ptr, "checkvalue", NULL, 381, &_0, &_7, &_8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_7); ZVAL_STRING(&_7, "//"); - ZEPHIR_CALL_METHOD(&_9, this_ptr, "checkvalue", NULL, 374, &authority, &_7); + ZEPHIR_CALL_METHOD(&_9, this_ptr, "checkvalue", NULL, 381, &authority, &_7); zephir_check_call_status(); zephir_read_property(&_11, this_ptr, ZEND_STRL("query"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_7); ZVAL_STRING(&_7, "?"); - ZEPHIR_CALL_METHOD(&_10, this_ptr, "checkvalue", NULL, 374, &_11, &_7); + ZEPHIR_CALL_METHOD(&_10, this_ptr, "checkvalue", NULL, 381, &_11, &_7); zephir_check_call_status(); zephir_read_property(&_13, this_ptr, ZEND_STRL("fragment"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_7); ZVAL_STRING(&_7, "#"); - ZEPHIR_CALL_METHOD(&_12, this_ptr, "checkvalue", NULL, 374, &_13, &_7); + ZEPHIR_CALL_METHOD(&_12, this_ptr, "checkvalue", NULL, 381, &_13, &_7); zephir_check_call_status(); ZEPHIR_INIT_VAR(&uri); ZEPHIR_CONCAT_VVVVV(&uri, &_6, &_9, &path, &_10, &_12); @@ -482,7 +482,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, getAuthority) } ZEPHIR_OBS_VAR(&authority); zephir_read_property(&authority, this_ptr, ZEND_STRL("host"), PH_NOISY_CC); - ZEPHIR_CALL_METHOD(&userInfo, this_ptr, "getuserinfo", NULL, 375); + ZEPHIR_CALL_METHOD(&userInfo, this_ptr, "getuserinfo", NULL, 382); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, ""); @@ -580,7 +580,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, withFragment) ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkstringparameter", NULL, 21, fragment); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "filterfragment", NULL, 368, fragment); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "filterfragment", NULL, 375, fragment); zephir_check_call_status(); ZEPHIR_CPY_WRT(fragment, &_0); ZEPHIR_INIT_VAR(&_1); @@ -659,7 +659,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, withPath) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Path cannot contain a query string or fragment", "phalcon/Http/Message/Uri.zep", 290); return; } - ZEPHIR_CALL_METHOD(&_5, this_ptr, "filterpath", NULL, 369, path); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "filterpath", NULL, 376, path); zephir_check_call_status(); ZEPHIR_CPY_WRT(path, &_5); ZEPHIR_INIT_VAR(&_6); @@ -711,7 +711,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, withPort) if (UNEXPECTED(Z_TYPE_P(port) != IS_NULL)) { - ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "filterport", NULL, 370, port); + ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "filterport", NULL, 377, port); zephir_check_call_status(); ZEPHIR_CPY_WRT(port, &_0$$3); _1$$3 = Z_TYPE_P(port) != IS_NULL; @@ -785,7 +785,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, withQuery) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Query cannot contain a query fragment", "phalcon/Http/Message/Uri.zep", 353); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "filterquery", NULL, 371, query); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "filterquery", NULL, 378, query); zephir_check_call_status(); ZEPHIR_CPY_WRT(query, &_2); ZEPHIR_INIT_VAR(&_3); @@ -837,12 +837,12 @@ PHP_METHOD(Phalcon_Http_Message_Uri, withScheme) ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkstringparameter", NULL, 21, scheme); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "filterscheme", NULL, 372, scheme); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "filterscheme", NULL, 379, scheme); zephir_check_call_status(); ZEPHIR_CPY_WRT(scheme, &_0); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "scheme"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processwith", NULL, 376, scheme, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processwith", NULL, 383, scheme, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -896,11 +896,11 @@ PHP_METHOD(Phalcon_Http_Message_Uri, withUserInfo) ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkstringparameter", NULL, 21, user); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_0, "rawurlencode", NULL, 316, user); + ZEPHIR_CALL_FUNCTION(&_0, "rawurlencode", NULL, 323, user); zephir_check_call_status(); ZEPHIR_CPY_WRT(user, &_0); if (UNEXPECTED(Z_TYPE_P(password) != IS_NULL)) { - ZEPHIR_CALL_FUNCTION(&_1$$4, "rawurlencode", NULL, 316, password); + ZEPHIR_CALL_FUNCTION(&_1$$4, "rawurlencode", NULL, 323, password); zephir_check_call_status(); ZEPHIR_CPY_WRT(password, &_1$$4); } @@ -949,7 +949,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, withHost) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "host"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processwith", NULL, 376, host, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processwith", NULL, 383, host, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -1085,7 +1085,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, filterFragment) } - ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 316, &fragment); + ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 323, &fragment); zephir_check_call_status(); RETURN_MM(); } @@ -1183,7 +1183,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, filterPath) } ZEPHIR_INIT_NVAR(&element); ZVAL_COPY(&element, _2); - ZEPHIR_CALL_FUNCTION(&_6$$4, "rawurlencode", &_7, 316, &element); + ZEPHIR_CALL_FUNCTION(&_6$$4, "rawurlencode", &_7, 323, &element); zephir_check_call_status(); zephir_array_update_zval(&parts, &key, &_6$$4, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -1200,7 +1200,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, filterPath) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&element, &parts, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_8$$5, "rawurlencode", &_7, 316, &element); + ZEPHIR_CALL_FUNCTION(&_8$$5, "rawurlencode", &_7, 323, &element); zephir_check_call_status(); zephir_array_update_zval(&parts, &key, &_8$$5, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &parts, "next", NULL, 0); @@ -1360,21 +1360,21 @@ PHP_METHOD(Phalcon_Http_Message_Uri, filterQuery) } ZEPHIR_INIT_NVAR(&part); ZVAL_COPY(&part, _3); - ZEPHIR_CALL_METHOD(&split, this_ptr, "splitqueryvalue", &_7, 377, &part); + ZEPHIR_CALL_METHOD(&split, this_ptr, "splitqueryvalue", &_7, 384, &part); zephir_check_call_status(); zephir_array_fetch_long(&_8$$4, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 589); if (UNEXPECTED(Z_TYPE_P(&_8$$4) == IS_NULL)) { zephir_array_fetch_long(&_9$$5, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 590); - ZEPHIR_CALL_FUNCTION(&_10$$5, "rawurlencode", &_11, 316, &_9$$5); + ZEPHIR_CALL_FUNCTION(&_10$$5, "rawurlencode", &_11, 323, &_9$$5); zephir_check_call_status(); zephir_array_update_zval(&parts, &index, &_10$$5, PH_COPY | PH_SEPARATE); continue; } zephir_array_fetch_long(&_12$$4, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 594); - ZEPHIR_CALL_FUNCTION(&_13$$4, "rawurlencode", &_11, 316, &_12$$4); + ZEPHIR_CALL_FUNCTION(&_13$$4, "rawurlencode", &_11, 323, &_12$$4); zephir_check_call_status(); zephir_array_fetch_long(&_14$$4, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 594); - ZEPHIR_CALL_FUNCTION(&_15$$4, "rawurlencode", &_11, 316, &_14$$4); + ZEPHIR_CALL_FUNCTION(&_15$$4, "rawurlencode", &_11, 323, &_14$$4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$4); ZEPHIR_CONCAT_VSV(&_16$$4, &_13$$4, "=", &_15$$4); @@ -1393,21 +1393,21 @@ PHP_METHOD(Phalcon_Http_Message_Uri, filterQuery) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&part, &parts, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&split, this_ptr, "splitqueryvalue", &_7, 377, &part); + ZEPHIR_CALL_METHOD(&split, this_ptr, "splitqueryvalue", &_7, 384, &part); zephir_check_call_status(); zephir_array_fetch_long(&_17$$6, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 589); if (UNEXPECTED(Z_TYPE_P(&_17$$6) == IS_NULL)) { zephir_array_fetch_long(&_18$$7, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 590); - ZEPHIR_CALL_FUNCTION(&_19$$7, "rawurlencode", &_11, 316, &_18$$7); + ZEPHIR_CALL_FUNCTION(&_19$$7, "rawurlencode", &_11, 323, &_18$$7); zephir_check_call_status(); zephir_array_update_zval(&parts, &index, &_19$$7, PH_COPY | PH_SEPARATE); continue; } zephir_array_fetch_long(&_20$$6, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 594); - ZEPHIR_CALL_FUNCTION(&_21$$6, "rawurlencode", &_11, 316, &_20$$6); + ZEPHIR_CALL_FUNCTION(&_21$$6, "rawurlencode", &_11, 323, &_20$$6); zephir_check_call_status(); zephir_array_fetch_long(&_22$$6, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 594); - ZEPHIR_CALL_FUNCTION(&_23$$6, "rawurlencode", &_11, 316, &_22$$6); + ZEPHIR_CALL_FUNCTION(&_23$$6, "rawurlencode", &_11, 323, &_22$$6); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_24$$6); ZEPHIR_CONCAT_VSV(&_24$$6, &_21$$6, "=", &_23$$6); diff --git a/ext/phalcon/http/request.zep.c b/ext/phalcon/http/request.zep.c index 6fbc84c63b9..6355702a946 100644 --- a/ext/phalcon/http/request.zep.c +++ b/ext/phalcon/http/request.zep.c @@ -221,7 +221,7 @@ PHP_METHOD(Phalcon_Http_Request, get) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 378, &_REQUEST, &name, filters, defaultValue, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 385, &_REQUEST, &name, filters, defaultValue, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -247,7 +247,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, 379, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 386, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -274,13 +274,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, 380, &_1); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 387, &_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, 380, &_1); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "hasserver", NULL, 387, &_1); zephir_check_call_status(); _2 = !zephir_is_true(&_3); } @@ -322,7 +322,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, 381, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 388, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -348,7 +348,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, 381, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 388, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -374,7 +374,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, 381, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 388, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -463,7 +463,7 @@ PHP_METHOD(Phalcon_Http_Request, getClientAddress) ZEPHIR_INIT_VAR(&address); ZVAL_NULL(&address); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 382); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 389); zephir_check_call_status(); if (trustForwardedHeader) { ZEPHIR_OBS_NVAR(&address); @@ -510,7 +510,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, 379, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 386, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -531,7 +531,7 @@ PHP_METHOD(Phalcon_Http_Request, getContentType) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 382); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 389); zephir_check_call_status(); if (!(zephir_array_isset_string_fetch(&contentType, &server, SL("CONTENT_TYPE"), 1))) { RETURN_MM_NULL(); @@ -570,7 +570,7 @@ PHP_METHOD(Phalcon_Http_Request, getDigestAuth) ZEPHIR_INIT_VAR(&auth); array_init(&auth); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 382); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 389); zephir_check_call_status(); ZEPHIR_OBS_VAR(&digest); if (zephir_array_isset_string_fetch(&digest, &server, SL("PHP_AUTH_DIGEST"), 0)) { @@ -925,7 +925,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, 382); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 389); zephir_check_call_status(); ZEPHIR_OBS_VAR(&value); if (zephir_array_isset_fetch(&value, &server, &name, 0)) { @@ -1019,7 +1019,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, 382); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 389); zephir_check_call_status(); zephir_is_iterable(&server, 0, "phalcon/Http/Request.zep", 442); if (Z_TYPE_P(&server) == IS_ARRAY) { @@ -1045,7 +1045,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, 273, &_4$$4); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 280, &_4$$4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_11$$4); ZEPHIR_INIT_NVAR(&_12$$4); @@ -1069,7 +1069,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, 273, &_15$$5); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 280, &_15$$5); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_19$$5); ZEPHIR_INIT_NVAR(&_20$$5); @@ -1106,7 +1106,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, 273, &_22$$7); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 280, &_22$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_28$$7); ZEPHIR_INIT_NVAR(&_29$$7); @@ -1130,7 +1130,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, 273, &_32$$8); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 280, &_32$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_36$$8); ZEPHIR_INIT_NVAR(&_37$$8); @@ -1268,7 +1268,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, 383, &_13$$7); + ZEPHIR_CALL_METHOD(NULL, &_12$$7, "__construct", NULL, 390, &_13$$7); zephir_check_call_status(); zephir_throw_exception_debug(&_12$$7, "phalcon/Http/Request.zep", 526); ZEPHIR_MM_RESTORE(); @@ -1297,7 +1297,7 @@ PHP_METHOD(Phalcon_Http_Request, getHTTPReferer) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 382); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 389); zephir_check_call_status(); if (!(zephir_array_isset_string_fetch(&httpReferer, &server, SL("HTTP_REFERER"), 1))) { RETURN_MM_STRING(""); @@ -1367,7 +1367,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, 379, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 386, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -1407,7 +1407,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, 382); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 389); zephir_check_call_status(); ZEPHIR_OBS_VAR(&requestMethod); if (EXPECTED(zephir_array_isset_string_fetch(&requestMethod, &server, SL("REQUEST_METHOD"), 0))) { @@ -1421,7 +1421,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, 384, &_1$$5); + ZEPHIR_CALL_METHOD(&overridedMethod, this_ptr, "getheader", NULL, 391, &_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))) { @@ -1590,7 +1590,7 @@ PHP_METHOD(Phalcon_Http_Request, getPost) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 378, &_POST, &name, filters, defaultValue, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 385, &_POST, &name, filters, defaultValue, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -1684,7 +1684,7 @@ PHP_METHOD(Phalcon_Http_Request, getPut) if (_0$$3) { ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "json"); - ZEPHIR_CALL_FUNCTION(&_2$$3, "stripos", NULL, 385, &contentType, &_1$$3); + ZEPHIR_CALL_FUNCTION(&_2$$3, "stripos", NULL, 392, &contentType, &_1$$3); zephir_check_call_status(); _0$$3 = !ZEPHIR_IS_FALSE(&_2$$3); } @@ -1702,7 +1702,7 @@ PHP_METHOD(Phalcon_Http_Request, getPut) ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "getrawbody", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&put); - ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 344, &_4$$6, &put); + ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 351, &_4$$6, &put); ZEPHIR_UNREF(&put); zephir_check_call_status(); } @@ -1718,7 +1718,7 @@ PHP_METHOD(Phalcon_Http_Request, getPut) } else { ZVAL_BOOL(&_6, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 378, &put, &name, filters, defaultValue, &_5, &_6); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 385, &put, &name, filters, defaultValue, &_5, &_6); zephir_check_call_status(); RETURN_MM(); } @@ -1813,7 +1813,7 @@ PHP_METHOD(Phalcon_Http_Request, getQuery) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 378, &_GET, &name, filters, defaultValue, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 385, &_GET, &name, filters, defaultValue, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -1914,7 +1914,7 @@ PHP_METHOD(Phalcon_Http_Request, getServer) } - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 382); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 389); zephir_check_call_status(); if (!(zephir_array_isset_fetch(&serverValue, &server, &name, 1))) { RETURN_MM_NULL(); @@ -1946,7 +1946,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, 386, &_1$$3); + ZEPHIR_RETURN_CALL_FUNCTION("gethostbyname", NULL, 393, &_1$$3); zephir_check_call_status(); RETURN_MM(); } @@ -2103,7 +2103,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", 862); zephir_array_fetch_string(&_8$$5, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 863); zephir_array_fetch_string(&_9$$5, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 864); - ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 387, &_5$$5, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &prefix); + ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 394, &_5$$5, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &prefix); zephir_check_call_status(); zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 891); if (Z_TYPE_P(&smoothInput) == IS_ARRAY) { @@ -2138,7 +2138,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", 882); - ZEPHIR_CALL_METHOD(NULL, &_16$$8, "__construct", &_18, 388, &dataFile, &_17$$8); + ZEPHIR_CALL_METHOD(NULL, &_16$$8, "__construct", &_18, 395, &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", 879); @@ -2147,7 +2147,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", 887); - ZEPHIR_CALL_METHOD(NULL, &_20$$9, "__construct", &_18, 388, &dataFile, &_21$$9); + ZEPHIR_CALL_METHOD(NULL, &_20$$9, "__construct", &_18, 395, &dataFile, &_21$$9); zephir_check_call_status(); zephir_array_append(&files, &_20$$9, PH_SEPARATE, "phalcon/Http/Request.zep", 887); } @@ -2192,7 +2192,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", 882); - ZEPHIR_CALL_METHOD(NULL, &_26$$12, "__construct", &_18, 388, &dataFile, &_27$$12); + ZEPHIR_CALL_METHOD(NULL, &_26$$12, "__construct", &_18, 395, &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", 879); @@ -2201,7 +2201,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", 887); - ZEPHIR_CALL_METHOD(NULL, &_29$$13, "__construct", &_18, 388, &dataFile, &_30$$13); + ZEPHIR_CALL_METHOD(NULL, &_29$$13, "__construct", &_18, 395, &dataFile, &_30$$13); zephir_check_call_status(); zephir_array_append(&files, &_29$$13, PH_SEPARATE, "phalcon/Http/Request.zep", 887); } @@ -2221,13 +2221,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, 388, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_33$$16, "__construct", &_18, 395, &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, 388, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_34$$17, "__construct", &_18, 395, &input, &prefix); zephir_check_call_status(); zephir_array_append(&files, &_34$$17, PH_SEPARATE, "phalcon/Http/Request.zep", 896); } @@ -2255,7 +2255,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", 862); zephir_array_fetch_string(&_39$$19, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 863); zephir_array_fetch_string(&_40$$19, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 864); - ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 387, &_36$$19, &_37$$19, &_38$$19, &_39$$19, &_40$$19, &prefix); + ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 394, &_36$$19, &_37$$19, &_38$$19, &_39$$19, &_40$$19, &prefix); zephir_check_call_status(); zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 891); if (Z_TYPE_P(&smoothInput) == IS_ARRAY) { @@ -2291,7 +2291,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", 882); - ZEPHIR_CALL_METHOD(NULL, &_47$$22, "__construct", &_18, 388, &dataFile, &_48$$22); + ZEPHIR_CALL_METHOD(NULL, &_47$$22, "__construct", &_18, 395, &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", 879); @@ -2300,7 +2300,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", 887); - ZEPHIR_CALL_METHOD(NULL, &_50$$23, "__construct", &_18, 388, &dataFile, &_51$$23); + ZEPHIR_CALL_METHOD(NULL, &_50$$23, "__construct", &_18, 395, &dataFile, &_51$$23); zephir_check_call_status(); zephir_array_append(&files, &_50$$23, PH_SEPARATE, "phalcon/Http/Request.zep", 887); } @@ -2345,7 +2345,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", 882); - ZEPHIR_CALL_METHOD(NULL, &_56$$26, "__construct", &_18, 388, &dataFile, &_57$$26); + ZEPHIR_CALL_METHOD(NULL, &_56$$26, "__construct", &_18, 395, &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", 879); @@ -2354,7 +2354,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", 887); - ZEPHIR_CALL_METHOD(NULL, &_59$$27, "__construct", &_18, 388, &dataFile, &_60$$27); + ZEPHIR_CALL_METHOD(NULL, &_59$$27, "__construct", &_18, 395, &dataFile, &_60$$27); zephir_check_call_status(); zephir_array_append(&files, &_59$$27, PH_SEPARATE, "phalcon/Http/Request.zep", 887); } @@ -2374,13 +2374,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, 388, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_63$$30, "__construct", &_18, 395, &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, 388, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_64$$31, "__construct", &_18, 395, &input, &prefix); zephir_check_call_status(); zephir_array_append(&files, &_64$$31, PH_SEPARATE, "phalcon/Http/Request.zep", 896); } @@ -2593,13 +2593,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, 380, &name); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "hasserver", NULL, 387, &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, 380, &_6); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "hasserver", NULL, 387, &_6); zephir_check_call_status(); _4 = zephir_is_true(&_5); } @@ -2753,7 +2753,7 @@ PHP_METHOD(Phalcon_Http_Request, hasServer) } - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 382); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 389); zephir_check_call_status(); RETURN_MM_BOOL(zephir_array_isset(&server, &name)); } @@ -2778,7 +2778,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, 380, &_1); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 387, &_1); zephir_check_call_status(); _2 = zephir_is_true(&_0); if (_2) { @@ -2807,7 +2807,7 @@ PHP_METHOD(Phalcon_Http_Request, isConnect) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 389); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 396); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "CONNECT")); } @@ -2828,7 +2828,7 @@ PHP_METHOD(Phalcon_Http_Request, isDelete) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 389); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 396); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "DELETE")); } @@ -2849,7 +2849,7 @@ PHP_METHOD(Phalcon_Http_Request, isGet) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 389); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 396); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "GET")); } @@ -2870,7 +2870,7 @@ PHP_METHOD(Phalcon_Http_Request, isHead) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 389); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 396); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "HEAD")); } @@ -2918,7 +2918,7 @@ PHP_METHOD(Phalcon_Http_Request, isMethod) } - ZEPHIR_CALL_METHOD(&httpMethod, this_ptr, "getmethod", NULL, 389); + ZEPHIR_CALL_METHOD(&httpMethod, this_ptr, "getmethod", NULL, 396); zephir_check_call_status(); if (Z_TYPE_P(methods) == IS_STRING) { _0$$3 = strict; @@ -2952,7 +2952,7 @@ PHP_METHOD(Phalcon_Http_Request, isMethod) } else { ZVAL_BOOL(&_7$$6, 0); } - ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "ismethod", &_8, 390, &method, &_7$$6); + ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "ismethod", &_8, 397, &method, &_7$$6); zephir_check_call_status(); if (zephir_is_true(&_6$$6)) { RETURN_MM_BOOL(1); @@ -2974,7 +2974,7 @@ PHP_METHOD(Phalcon_Http_Request, isMethod) } else { ZVAL_BOOL(&_10$$8, 0); } - ZEPHIR_CALL_METHOD(&_9$$8, this_ptr, "ismethod", &_8, 390, &method, &_10$$8); + ZEPHIR_CALL_METHOD(&_9$$8, this_ptr, "ismethod", &_8, 397, &method, &_10$$8); zephir_check_call_status(); if (zephir_is_true(&_9$$8)) { RETURN_MM_BOOL(1); @@ -3009,7 +3009,7 @@ PHP_METHOD(Phalcon_Http_Request, isOptions) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 389); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 396); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "OPTIONS")); } @@ -3030,7 +3030,7 @@ PHP_METHOD(Phalcon_Http_Request, isPatch) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 389); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 396); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "PATCH")); } @@ -3051,7 +3051,7 @@ PHP_METHOD(Phalcon_Http_Request, isPost) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 389); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 396); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "POST")); } @@ -3072,7 +3072,7 @@ PHP_METHOD(Phalcon_Http_Request, isPut) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 389); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 396); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "PUT")); } @@ -3093,7 +3093,7 @@ PHP_METHOD(Phalcon_Http_Request, isPurge) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 389); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 396); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "PURGE")); } @@ -3150,7 +3150,7 @@ PHP_METHOD(Phalcon_Http_Request, isSoap) ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "HTTP_SOAPACTION"); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 380, &_1); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 387, &_1); zephir_check_call_status(); if (zephir_is_true(&_0)) { RETURN_MM_BOOL(1); @@ -3179,7 +3179,7 @@ PHP_METHOD(Phalcon_Http_Request, isTrace) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 389); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 396); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "TRACE")); } @@ -3288,7 +3288,7 @@ PHP_METHOD(Phalcon_Http_Request, numFiles) } else { ZVAL_BOOL(&_4$$8, 0); } - ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "hasfilehelper", &_5, 391, &error, &_4$$8); + ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "hasfilehelper", &_5, 398, &error, &_4$$8); zephir_check_call_status(); numberFiles += zephir_get_numberval(&_3$$8); } @@ -3322,7 +3322,7 @@ PHP_METHOD(Phalcon_Http_Request, numFiles) } else { ZVAL_BOOL(&_8$$13, 0); } - ZEPHIR_CALL_METHOD(&_7$$13, this_ptr, "hasfilehelper", &_5, 391, &error, &_8$$13); + ZEPHIR_CALL_METHOD(&_7$$13, this_ptr, "hasfilehelper", &_5, 398, &error, &_8$$13); zephir_check_call_status(); numberFiles += zephir_get_numberval(&_7$$13); } @@ -3416,7 +3416,7 @@ PHP_METHOD(Phalcon_Http_Request, setParameterFilters) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 392); + ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 399); zephir_check_call_status(); zephir_is_iterable(&filters, 0, "phalcon/Http/Request.zep", 1273); if (Z_TYPE_P(&filters) == IS_ARRAY) { @@ -3754,7 +3754,7 @@ PHP_METHOD(Phalcon_Http_Request, getHelper) RETURN_MM(); } if (Z_TYPE_P(filters) != IS_NULL) { - ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 392); + ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 399); zephir_check_call_status(); if (noRecursive) { ZVAL_BOOL(&_3$$6, 1); @@ -3826,7 +3826,7 @@ PHP_METHOD(Phalcon_Http_Request, hasFileHelper) } else { ZVAL_BOOL(&_4$$7, 0); } - ZEPHIR_CALL_METHOD(&_3$$7, this_ptr, "hasfilehelper", &_5, 391, &value, &_4$$7); + ZEPHIR_CALL_METHOD(&_3$$7, this_ptr, "hasfilehelper", &_5, 398, &value, &_4$$7); zephir_check_call_status(); numberFiles += zephir_get_numberval(&_3$$7); } @@ -3857,7 +3857,7 @@ PHP_METHOD(Phalcon_Http_Request, hasFileHelper) } else { ZVAL_BOOL(&_8$$11, 0); } - ZEPHIR_CALL_METHOD(&_7$$11, this_ptr, "hasfilehelper", &_5, 391, &value, &_8$$11); + ZEPHIR_CALL_METHOD(&_7$$11, this_ptr, "hasfilehelper", &_5, 398, &value, &_8$$11); zephir_check_call_status(); numberFiles += zephir_get_numberval(&_7$$11); } @@ -4243,7 +4243,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, 382); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 389); zephir_check_call_status(); if (Z_TYPE_P(&container) == IS_OBJECT) { ZEPHIR_INIT_VAR(&_2$$3); @@ -4279,13 +4279,13 @@ PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) } ZEPHIR_INIT_VAR(&_9); ZVAL_STRING(&_9, "PHP_AUTH_USER"); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 380, &_9); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 387, &_9); zephir_check_call_status(); _10 = zephir_is_true(&_0); if (_10) { ZEPHIR_INIT_NVAR(&_9); ZVAL_STRING(&_9, "PHP_AUTH_PW"); - ZEPHIR_CALL_METHOD(&_11, this_ptr, "hasserver", NULL, 380, &_9); + ZEPHIR_CALL_METHOD(&_11, this_ptr, "hasserver", NULL, 387, &_9); zephir_check_call_status(); _10 = zephir_is_true(&_11); } @@ -4303,11 +4303,11 @@ PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) } else { ZEPHIR_INIT_VAR(&_16$$8); ZVAL_STRING(&_16$$8, "HTTP_AUTHORIZATION"); - ZEPHIR_CALL_METHOD(&_15$$8, this_ptr, "hasserver", NULL, 380, &_16$$8); + ZEPHIR_CALL_METHOD(&_15$$8, this_ptr, "hasserver", NULL, 387, &_16$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$8); ZVAL_STRING(&_16$$8, "REDIRECT_HTTP_AUTHORIZATION"); - ZEPHIR_CALL_METHOD(&_17$$8, this_ptr, "hasserver", NULL, 380, &_16$$8); + ZEPHIR_CALL_METHOD(&_17$$8, this_ptr, "hasserver", NULL, 387, &_16$$8); zephir_check_call_status(); if (zephir_is_true(&_15$$8)) { ZEPHIR_INIT_VAR(&_18$$9); @@ -4323,29 +4323,29 @@ PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) if (zephir_is_true(&authHeader)) { ZEPHIR_INIT_VAR(&_20$$11); ZVAL_STRING(&_20$$11, "basic "); - ZEPHIR_CALL_FUNCTION(&_21$$11, "stripos", NULL, 385, &authHeader, &_20$$11); + ZEPHIR_CALL_FUNCTION(&_21$$11, "stripos", NULL, 392, &authHeader, &_20$$11); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_20$$11); ZVAL_STRING(&_20$$11, "digest "); - ZEPHIR_CALL_FUNCTION(&_22$$11, "stripos", NULL, 385, &authHeader, &_20$$11); + ZEPHIR_CALL_FUNCTION(&_22$$11, "stripos", NULL, 392, &authHeader, &_20$$11); zephir_check_call_status(); _23$$11 = ZEPHIR_IS_LONG_IDENTICAL(&_22$$11, 0); if (_23$$11) { ZEPHIR_INIT_NVAR(&_20$$11); ZVAL_STRING(&_20$$11, "PHP_AUTH_DIGEST"); - ZEPHIR_CALL_METHOD(&_24$$11, this_ptr, "hasserver", NULL, 380, &_20$$11); + ZEPHIR_CALL_METHOD(&_24$$11, this_ptr, "hasserver", NULL, 387, &_20$$11); zephir_check_call_status(); _23$$11 = !zephir_is_true(&_24$$11); } ZEPHIR_INIT_NVAR(&_20$$11); ZVAL_STRING(&_20$$11, "bearer "); - ZEPHIR_CALL_FUNCTION(&_25$$11, "stripos", NULL, 385, &authHeader, &_20$$11); + ZEPHIR_CALL_FUNCTION(&_25$$11, "stripos", NULL, 392, &authHeader, &_20$$11); zephir_check_call_status(); if (ZEPHIR_IS_LONG_IDENTICAL(&_21$$11, 0)) { ZVAL_LONG(&_26$$12, 6); ZEPHIR_INIT_VAR(&_27$$12); zephir_substr(&_27$$12, &authHeader, 6 , 0, ZEPHIR_SUBSTR_NO_LENGTH); - ZEPHIR_CALL_FUNCTION(&_28$$12, "base64_decode", NULL, 224, &_27$$12); + ZEPHIR_CALL_FUNCTION(&_28$$12, "base64_decode", NULL, 225, &_27$$12); zephir_check_call_status(); ZEPHIR_INIT_VAR(&exploded); zephir_fast_explode_str(&exploded, SL(":"), &_28$$12, 2 ); @@ -4369,7 +4369,7 @@ PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) zephir_array_fetch_string(&_32$$17, &headers, SL("Php-Auth-Pw"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1503); ZEPHIR_INIT_VAR(&_33$$17); ZEPHIR_CONCAT_VSV(&_33$$17, &_31$$17, ":", &_32$$17); - ZEPHIR_CALL_FUNCTION(&_34$$17, "base64_encode", NULL, 226, &_33$$17); + ZEPHIR_CALL_FUNCTION(&_34$$17, "base64_encode", NULL, 227, &_33$$17); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_35$$17); ZEPHIR_CONCAT_SV(&_35$$17, "Basic ", &_34$$17); @@ -4508,7 +4508,7 @@ PHP_METHOD(Phalcon_Http_Request, smoothFiles) zephir_array_fetch(&_8$$5, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1555); zephir_array_fetch(&_9$$5, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1556); zephir_array_fetch(&_10$$5, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1557); - ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 387, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &_10$$5, &p); + ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 394, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &_10$$5, &p); zephir_check_call_status(); zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1564); if (Z_TYPE_P(&parentFiles) == IS_ARRAY) { @@ -4577,7 +4577,7 @@ PHP_METHOD(Phalcon_Http_Request, smoothFiles) zephir_array_fetch(&_18$$10, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1555); zephir_array_fetch(&_19$$10, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1556); zephir_array_fetch(&_20$$10, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1557); - ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 387, &_16$$10, &_17$$10, &_18$$10, &_19$$10, &_20$$10, &p); + ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 394, &_16$$10, &_17$$10, &_18$$10, &_19$$10, &_20$$10, &p); zephir_check_call_status(); zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1564); if (Z_TYPE_P(&parentFiles) == IS_ARRAY) { diff --git a/ext/phalcon/http/request/file.zep.c b/ext/phalcon/http/request/file.zep.c index 1ed8ef5974e..5b63bdd8278 100644 --- a/ext/phalcon/http/request/file.zep.c +++ b/ext/phalcon/http/request/file.zep.c @@ -239,15 +239,15 @@ PHP_METHOD(Phalcon_Http_Request_File, getRealType) ZEPHIR_MM_GROW(); ZVAL_LONG(&_0, 16); - ZEPHIR_CALL_FUNCTION(&finfo, "finfo_open", NULL, 393, &_0); + ZEPHIR_CALL_FUNCTION(&finfo, "finfo_open", NULL, 400, &_0); zephir_check_call_status(); if (Z_TYPE_P(&finfo) != IS_RESOURCE) { RETURN_MM_STRING(""); } zephir_read_property(&_0, this_ptr, ZEND_STRL("tmp"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 394, &finfo, &_0); + ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 401, &finfo, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 395, &finfo); + ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 402, &finfo); zephir_check_call_status(); RETURN_CCTOR(&mime); } @@ -352,7 +352,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, 366, &_0, &destination); + ZEPHIR_RETURN_CALL_FUNCTION("move_uploaded_file", NULL, 373, &_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 291c44d23f6..b96210906b1 100644 --- a/ext/phalcon/http/response.zep.c +++ b/ext/phalcon/http/response.zep.c @@ -516,7 +516,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, 303, location, &_1$$5); + ZEPHIR_CALL_FUNCTION(&_2$$5, "strstr", NULL, 310, location, &_1$$5); zephir_check_call_status(); _0$$5 = zephir_is_true(&_2$$5); } @@ -683,7 +683,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, 396, &file); + ZEPHIR_CALL_FUNCTION(NULL, "readfile", NULL, 403, &file); zephir_check_call_status(); } } @@ -1177,16 +1177,16 @@ PHP_METHOD(Phalcon_Http_Response, setFileToSend) ZEPHIR_INIT_VAR(&basePathEncoding); ZVAL_STRING(&basePathEncoding, "ASCII"); if (Z_TYPE_P(attachmentName) != IS_STRING) { - ZEPHIR_CALL_CE_STATIC(&basePath, phalcon_helper_fs_ce, "basename", &_0, 397, &filePath); + ZEPHIR_CALL_CE_STATIC(&basePath, phalcon_helper_fs_ce, "basename", &_0, 404, &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(&_1$$6, "mb_detect_order", NULL, 398); + ZEPHIR_CALL_FUNCTION(&_1$$6, "mb_detect_order", NULL, 405); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&basePathEncoding, "mb_detect_encoding", NULL, 312, &basePath, &_1$$6, &__$true); + ZEPHIR_CALL_FUNCTION(&basePathEncoding, "mb_detect_encoding", NULL, 319, &basePath, &_1$$6, &__$true); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_2$$5); @@ -1202,7 +1202,7 @@ PHP_METHOD(Phalcon_Http_Response, setFileToSend) ZEPHIR_CALL_METHOD(NULL, this_ptr, "setrawheader", NULL, 0, &_2$$5); zephir_check_call_status(); if (!ZEPHIR_IS_STRING(&basePathEncoding, "ASCII")) { - ZEPHIR_CALL_FUNCTION(&_3$$7, "rawurlencode", NULL, 316, &basePath); + ZEPHIR_CALL_FUNCTION(&_3$$7, "rawurlencode", NULL, 323, &basePath); zephir_check_call_status(); ZEPHIR_CPY_WRT(&basePath, &_3$$7); ZEPHIR_INIT_VAR(&_4$$7); @@ -1214,7 +1214,7 @@ PHP_METHOD(Phalcon_Http_Response, setFileToSend) } else { ZEPHIR_INIT_VAR(&_6$$8); ZVAL_STRING(&_6$$8, "\15\17\\\""); - ZEPHIR_CALL_FUNCTION(&_7$$8, "addcslashes", NULL, 208, &basePath, &_6$$8); + ZEPHIR_CALL_FUNCTION(&_7$$8, "addcslashes", NULL, 209, &basePath, &_6$$8); zephir_check_call_status(); ZEPHIR_CPY_WRT(&basePath, &_7$$8); ZEPHIR_INIT_VAR(&_8$$8); @@ -1564,7 +1564,7 @@ PHP_METHOD(Phalcon_Http_Response, setStatusCode) if (_5$$3) { ZEPHIR_INIT_NVAR(&_6$$3); ZVAL_STRING(&_6$$3, "HTTP/"); - ZEPHIR_CALL_FUNCTION(&_7$$3, "strstr", &_8, 303, &key, &_6$$3); + ZEPHIR_CALL_FUNCTION(&_7$$3, "strstr", &_8, 310, &key, &_6$$3); zephir_check_call_status(); _5$$3 = zephir_is_true(&_7$$3); } @@ -1590,7 +1590,7 @@ PHP_METHOD(Phalcon_Http_Response, setStatusCode) if (_10$$5) { ZEPHIR_INIT_NVAR(&_11$$5); ZVAL_STRING(&_11$$5, "HTTP/"); - ZEPHIR_CALL_FUNCTION(&_12$$5, "strstr", &_8, 303, &key, &_11$$5); + ZEPHIR_CALL_FUNCTION(&_12$$5, "strstr", &_8, 310, &key, &_11$$5); zephir_check_call_status(); _10$$5 = zephir_is_true(&_12$$5); } diff --git a/ext/phalcon/http/response/cookies.zep.c b/ext/phalcon/http/response/cookies.zep.c index 3879be47365..2d0aba317a8 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, 399); + ZEPHIR_CALL_FUNCTION(&_0, "headers_sent", NULL, 406); 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 b4eb833abbb..4d86bd6db18 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, 399); + ZEPHIR_CALL_FUNCTION(&_0, "headers_sent", NULL, 406); zephir_check_call_status(); _1 = ZEPHIR_IS_TRUE_IDENTICAL(&_0); if (!(_1)) { @@ -244,7 +244,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, 400, &_8$$5, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 407, &_8$$5, &__$true); zephir_check_call_status(); } else { _10$$6 = zephir_memnstr_str(&header, SL(":"), "phalcon/Http/Response/Headers.zep", 102); @@ -256,12 +256,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, 400, &header, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 407, &header, &__$true); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&_14$$8); ZEPHIR_CONCAT_VS(&_14$$8, &header, ": "); - ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 400, &_14$$8, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 407, &_14$$8, &__$true); zephir_check_call_status(); } } @@ -282,7 +282,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, 400, &_15$$10, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 407, &_15$$10, &__$true); zephir_check_call_status(); } else { _16$$11 = zephir_memnstr_str(&header, SL(":"), "phalcon/Http/Response/Headers.zep", 102); @@ -294,12 +294,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, 400, &header, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 407, &header, &__$true); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&_20$$13); ZEPHIR_CONCAT_VS(&_20$$13, &header, ": "); - ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 400, &_20$$13, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 407, &_20$$13, &__$true); zephir_check_call_status(); } } diff --git a/ext/phalcon/image/adapter/gd.zep.c b/ext/phalcon/image/adapter/gd.zep.c index d76482562a9..28c4f32c95a 100644 --- a/ext/phalcon/image/adapter/gd.zep.c +++ b/ext/phalcon/image/adapter/gd.zep.c @@ -137,7 +137,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("realpath"), &_3$$4); zephir_read_property(&_4$$4, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&imageinfo, "getimagesize", NULL, 401, &_4$$4); + ZEPHIR_CALL_FUNCTION(&imageinfo, "getimagesize", NULL, 408, &_4$$4); zephir_check_call_status(); if (zephir_is_true(&imageinfo)) { zephir_array_fetch_long(&_5$$5, &imageinfo, 0, PH_NOISY | PH_READONLY, "phalcon/Image/Adapter/Gd.zep", 38); @@ -153,35 +153,35 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) do { if (ZEPHIR_IS_LONG(&_9$$4, 1)) { zephir_read_property(&_10$$6, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_11$$6, "imagecreatefromgif", NULL, 402, &_10$$6); + ZEPHIR_CALL_FUNCTION(&_11$$6, "imagecreatefromgif", NULL, 409, &_10$$6); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_11$$6); break; } if (ZEPHIR_IS_LONG(&_9$$4, 2)) { zephir_read_property(&_12$$7, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_13$$7, "imagecreatefromjpeg", NULL, 403, &_12$$7); + ZEPHIR_CALL_FUNCTION(&_13$$7, "imagecreatefromjpeg", NULL, 410, &_12$$7); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_13$$7); break; } if (ZEPHIR_IS_LONG(&_9$$4, 3)) { zephir_read_property(&_14$$8, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_15$$8, "imagecreatefrompng", NULL, 404, &_14$$8); + ZEPHIR_CALL_FUNCTION(&_15$$8, "imagecreatefrompng", NULL, 411, &_14$$8); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_15$$8); break; } if (ZEPHIR_IS_LONG(&_9$$4, 15)) { zephir_read_property(&_16$$9, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_17$$9, "imagecreatefromwbmp", NULL, 405, &_16$$9); + ZEPHIR_CALL_FUNCTION(&_17$$9, "imagecreatefromwbmp", NULL, 412, &_16$$9); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_17$$9); break; } if (ZEPHIR_IS_LONG(&_9$$4, 16)) { zephir_read_property(&_18$$10, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_19$$10, "imagecreatefromxbm", NULL, 406, &_18$$10); + ZEPHIR_CALL_FUNCTION(&_19$$10, "imagecreatefromxbm", NULL, 413, &_18$$10); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_19$$10); break; @@ -204,7 +204,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) } while(0); zephir_read_property(&_24$$4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 407, &_24$$4, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 414, &_24$$4, &__$true); zephir_check_call_status(); } else { _25$$13 = !width; @@ -225,14 +225,14 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) } ZVAL_LONG(&_29$$13, width); ZVAL_LONG(&_30$$13, height); - ZEPHIR_CALL_FUNCTION(&_31$$13, "imagecreatetruecolor", NULL, 408, &_29$$13, &_30$$13); + ZEPHIR_CALL_FUNCTION(&_31$$13, "imagecreatetruecolor", NULL, 415, &_29$$13, &_30$$13); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_31$$13); zephir_read_property(&_29$$13, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 409, &_29$$13, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 416, &_29$$13, &__$true); zephir_check_call_status(); zephir_read_property(&_30$$13, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 407, &_30$$13, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 414, &_30$$13, &__$true); zephir_check_call_status(); zephir_read_property(&_32$$13, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); zephir_update_property_zval(this_ptr, ZEND_STRL("realpath"), &_32$$13); @@ -269,7 +269,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_RESOURCE) { - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 410, &image); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 417, &image); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -361,7 +361,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, getVersion) ZEPHIR_INIT_NVAR(&version); ZEPHIR_GET_CONSTANT(&version, "GD_VERSION"); } else { - ZEPHIR_CALL_FUNCTION(&info, "gd_info", NULL, 411); + ZEPHIR_CALL_FUNCTION(&info, "gd_info", NULL, 418); zephir_check_call_status(); ZEPHIR_INIT_VAR(&matches); ZVAL_NULL(&matches); @@ -424,7 +424,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, 270, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 277, &_1); zephir_check_call_status(); zephir_round(&_0, &_2, NULL, NULL); opacity = zephir_get_intval(&_0); @@ -436,9 +436,9 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processBackground) ZVAL_LONG(&_5, g); ZVAL_LONG(&_6, b); ZVAL_LONG(&_7, opacity); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 412, &background, &_4, &_5, &_6, &_7); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 419, &background, &_4, &_5, &_6, &_7); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 409, &background, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 416, &background, &__$true); zephir_check_call_status(); zephir_read_property(&_4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_5, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY); @@ -447,11 +447,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processBackground) ZVAL_LONG(&_8, 0); ZVAL_LONG(&_9, 0); ZVAL_LONG(&_10, 0); - ZEPHIR_CALL_FUNCTION(&_11, "imagecopy", NULL, 413, &background, &_4, &_7, &_8, &_9, &_10, &_5, &_6); + ZEPHIR_CALL_FUNCTION(&_11, "imagecopy", NULL, 420, &background, &_4, &_7, &_8, &_9, &_10, &_5, &_6); zephir_check_call_status(); if (zephir_is_true(&_11)) { zephir_read_property(&_12$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 410, &_12$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 417, &_12$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &background); } @@ -488,7 +488,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, 414, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_2, 421, &_0$$3, &_1$$3); zephir_check_call_status(); i++; } @@ -524,11 +524,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processCreate) ZVAL_LONG(&_0, width); ZVAL_LONG(&_1, height); - ZEPHIR_CALL_FUNCTION(&image, "imagecreatetruecolor", NULL, 408, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&image, "imagecreatetruecolor", NULL, 415, &_0, &_1); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 409, &image, &__$false); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 416, &image, &__$false); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 407, &image, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 414, &image, &__$true); zephir_check_call_status(); RETURN_CCTOR(&image); } @@ -581,16 +581,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, 415, &_1, &rect); + ZEPHIR_CALL_FUNCTION(&image, "imagecrop", NULL, 422, &_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, 410, &_2); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 417, &_2); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &image); - ZEPHIR_CALL_FUNCTION(&_3, "imagesx", NULL, 416, &image); + ZEPHIR_CALL_FUNCTION(&_3, "imagesx", NULL, 423, &image); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("width"), &_3); - ZEPHIR_CALL_FUNCTION(&_4, "imagesy", NULL, 417, &image); + ZEPHIR_CALL_FUNCTION(&_4, "imagesy", NULL, 424, &image); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("height"), &_4); ZEPHIR_MM_RESTORE(); @@ -623,12 +623,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, 418, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imageflip", NULL, 425, &_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, 418, &_2$$4, &_3$$4); + ZEPHIR_CALL_FUNCTION(NULL, "imageflip", NULL, 425, &_2$$4, &_3$$4); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -693,32 +693,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, 419, &_0); + ZEPHIR_CALL_FUNCTION(&maskImage, "imagecreatefromstring", NULL, 426, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 416, &maskImage); + ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 423, &maskImage); zephir_check_call_status(); mask_width = zephir_get_intval(&_1); - ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 417, &maskImage); + ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 424, &maskImage); zephir_check_call_status(); mask_height = zephir_get_intval(&_2); alpha = 127; - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 407, &maskImage, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 414, &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, 407, &newimage, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 414, &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, 412, &newimage, &_5, &_6, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 419, &newimage, &_5, &_6, &_7, &_8); zephir_check_call_status(); ZVAL_LONG(&_5, 0); ZVAL_LONG(&_6, 0); - ZEPHIR_CALL_FUNCTION(NULL, "imagefill", NULL, 420, &newimage, &_5, &_6, &color); + ZEPHIR_CALL_FUNCTION(NULL, "imagefill", NULL, 427, &newimage, &_5, &_6, &color); zephir_check_call_status(); zephir_read_property(&_5, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY); _9 = !ZEPHIR_IS_LONG(&_5, mask_width); @@ -729,7 +729,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, 408, &_10$$3, &_11$$3); + ZEPHIR_CALL_FUNCTION(&tempImage, "imagecreatetruecolor", NULL, 415, &_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); @@ -739,9 +739,9 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processMask) ZVAL_LONG(&_17$$3, 0); ZVAL_LONG(&_18$$3, mask_width); ZVAL_LONG(&_19$$3, mask_height); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopyresampled", NULL, 421, &tempImage, &maskImage, &_14$$3, &_15$$3, &_16$$3, &_17$$3, &_12$$3, &_13$$3, &_18$$3, &_19$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopyresampled", NULL, 428, &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, 410, &maskImage); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 417, &maskImage); zephir_check_call_status(); ZEPHIR_CPY_WRT(&maskImage, &tempImage); } @@ -759,9 +759,9 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processMask) } ZVAL_LONG(&_21$$5, x); ZVAL_LONG(&_22$$5, y); - ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_23, 422, &maskImage, &_21$$5, &_22$$5); + ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_23, 429, &maskImage, &_21$$5, &_22$$5); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_24, 423, &maskImage, &index); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_24, 430, &maskImage, &index); zephir_check_call_status(); if (zephir_array_isset_string(&color, SL("red"))) { zephir_array_fetch_string(&_25$$6, &color, SL("red"), PH_NOISY | PH_READONLY, "phalcon/Image/Adapter/Gd.zep", 291); @@ -771,10 +771,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, 422, &_21$$5, &_22$$5, &_27$$5); + ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_23, 429, &_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, 423, &_22$$5, &index); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_24, 430, &_22$$5, &index); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&r); zephir_array_fetch_string(&r, &color, SL("red"), PH_NOISY, "phalcon/Image/Adapter/Gd.zep", 296); @@ -783,20 +783,20 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processMask) ZEPHIR_OBS_NVAR(&b); zephir_array_fetch_string(&b, &color, SL("blue"), PH_NOISY, "phalcon/Image/Adapter/Gd.zep", 298); ZVAL_LONG(&_27$$5, alpha); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 412, &newimage, &r, &g, &b, &_27$$5); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 419, &newimage, &r, &g, &b, &_27$$5); zephir_check_call_status(); ZVAL_LONG(&_27$$5, x); ZVAL_LONG(&_28$$5, y); - ZEPHIR_CALL_FUNCTION(NULL, "imagesetpixel", &_29, 424, &newimage, &_27$$5, &_28$$5, &color); + ZEPHIR_CALL_FUNCTION(NULL, "imagesetpixel", &_29, 431, &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, 410, &_8); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 417, &_8); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 410, &maskImage); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 417, &maskImage); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &newimage); ZEPHIR_MM_RESTORE(); @@ -861,7 +861,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, 422, &_5$$4, &_6$$4, &_7$$4); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorat", &_8, 429, &_5$$4, &_6$$4, &_7$$4); zephir_check_call_status(); x2 = (x + amount); y2 = (y + amount); @@ -870,7 +870,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processPixelate) ZVAL_LONG(&_9$$4, y); ZVAL_LONG(&_10$$4, x2); ZVAL_LONG(&_11$$4, y2); - ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", &_12, 425, &_6$$4, &_7$$4, &_9$$4, &_10$$4, &_11$$4, &color); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", &_12, 432, &_6$$4, &_7$$4, &_9$$4, &_10$$4, &_11$$4, &color); zephir_check_call_status(); y += amount; } @@ -937,7 +937,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, 270, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 277, &_1); zephir_check_call_status(); zephir_round(&_0, &_2, NULL, NULL); opacity = zephir_get_intval(&_0); @@ -958,7 +958,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, 413, &reflection, &_4, &_7, &_8, &_9, &_10, &_5, &_6); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", NULL, 420, &reflection, &_4, &_7, &_8, &_9, &_10, &_5, &_6); zephir_check_call_status(); offset = 0; while (1) { @@ -991,14 +991,14 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processReflection) ZVAL_LONG(&_22$$5, 0); ZVAL_LONG(&_23$$5, src_y); ZVAL_LONG(&_24$$5, 1); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", NULL, 413, &line, &_18$$5, &_20$$5, &_21$$5, &_22$$5, &_23$$5, &_19$$5, &_24$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", NULL, 420, &line, &_18$$5, &_20$$5, &_21$$5, &_22$$5, &_23$$5, &_19$$5, &_24$$5); zephir_check_call_status(); ZVAL_LONG(&_20$$5, 4); ZVAL_LONG(&_21$$5, 0); ZVAL_LONG(&_22$$5, 0); ZVAL_LONG(&_23$$5, 0); ZVAL_LONG(&_24$$5, dst_opacity); - ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_25, 414, &line, &_20$$5, &_21$$5, &_22$$5, &_23$$5, &_24$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_25, 421, &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); @@ -1006,18 +1006,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, 413, &reflection, &line, &_21$$5, &_22$$5, &_23$$5, &_24$$5, &_20$$5, &_26$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", NULL, 420, &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, 410, &_7); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 417, &_7); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &reflection); - ZEPHIR_CALL_FUNCTION(&_27, "imagesx", NULL, 416, &reflection); + ZEPHIR_CALL_FUNCTION(&_27, "imagesx", NULL, 423, &reflection); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("width"), &_27); - ZEPHIR_CALL_FUNCTION(&_28, "imagesy", NULL, 417, &reflection); + ZEPHIR_CALL_FUNCTION(&_28, "imagesy", NULL, 424, &reflection); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("height"), &_28); ZEPHIR_MM_RESTORE(); @@ -1068,56 +1068,56 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processRender) ZEPHIR_INIT_VAR(&_0); zephir_fast_strtolower(&_0, &ext); zephir_get_strval(&ext, &_0); - ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 426); + ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 433); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "gif"); - ZEPHIR_CALL_FUNCTION(&_2, "strcmp", NULL, 427, &ext, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "strcmp", NULL, 434, &ext, &_1); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "jpg"); - ZEPHIR_CALL_FUNCTION(&_3, "strcmp", NULL, 427, &ext, &_1); + ZEPHIR_CALL_FUNCTION(&_3, "strcmp", NULL, 434, &ext, &_1); zephir_check_call_status(); _4 = ZEPHIR_IS_LONG(&_3, 0); if (!(_4)) { ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "jpeg"); - ZEPHIR_CALL_FUNCTION(&_5, "strcmp", NULL, 427, &ext, &_1); + ZEPHIR_CALL_FUNCTION(&_5, "strcmp", NULL, 434, &ext, &_1); zephir_check_call_status(); _4 = ZEPHIR_IS_LONG(&_5, 0); } ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "png"); - ZEPHIR_CALL_FUNCTION(&_6, "strcmp", NULL, 427, &ext, &_1); + ZEPHIR_CALL_FUNCTION(&_6, "strcmp", NULL, 434, &ext, &_1); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "wbmp"); - ZEPHIR_CALL_FUNCTION(&_7, "strcmp", NULL, 427, &ext, &_1); + ZEPHIR_CALL_FUNCTION(&_7, "strcmp", NULL, 434, &ext, &_1); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "xbm"); - ZEPHIR_CALL_FUNCTION(&_8, "strcmp", NULL, 427, &ext, &_1); + ZEPHIR_CALL_FUNCTION(&_8, "strcmp", NULL, 434, &ext, &_1); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_2, 0)) { zephir_read_property(&_9$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 428, &_9$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 435, &_9$$3); zephir_check_call_status(); } else if (_4) { zephir_read_property(&_10$$4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_11$$4, quality); - ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 429, &_10$$4, &__$null, &_11$$4); + ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 436, &_10$$4, &__$null, &_11$$4); zephir_check_call_status(); } else if (ZEPHIR_IS_LONG(&_6, 0)) { zephir_read_property(&_12$$5, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 430, &_12$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 437, &_12$$5); zephir_check_call_status(); } else if (ZEPHIR_IS_LONG(&_7, 0)) { zephir_read_property(&_13$$6, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 431, &_13$$6); + ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 438, &_13$$6); zephir_check_call_status(); } else if (ZEPHIR_IS_LONG(&_8, 0)) { zephir_read_property(&_14$$7, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 432, &_14$$7, &__$null); + ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 439, &_14$$7, &__$null); zephir_check_call_status(); } else { ZEPHIR_INIT_VAR(&_15$$8); @@ -1130,7 +1130,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processRender) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", NULL, 433); + ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", NULL, 440); zephir_check_call_status(); RETURN_MM(); } @@ -1166,16 +1166,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, 434, &_0, &_1, &_2); + ZEPHIR_CALL_FUNCTION(&image, "imagescale", NULL, 441, &_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, 410, &_1); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 417, &_1); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &image); - ZEPHIR_CALL_FUNCTION(&_3, "imagesx", NULL, 416, &image); + ZEPHIR_CALL_FUNCTION(&_3, "imagesx", NULL, 423, &image); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("width"), &_3); - ZEPHIR_CALL_FUNCTION(&_4, "imagesy", NULL, 417, &image); + ZEPHIR_CALL_FUNCTION(&_4, "imagesy", NULL, 424, &image); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("height"), &_4); ZEPHIR_MM_RESTORE(); @@ -1221,18 +1221,18 @@ 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, 412, &_0, &_1, &_2, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&transparent, "imagecolorallocatealpha", NULL, 419, &_0, &_1, &_2, &_3, &_4); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_2, (360 - degrees)); ZVAL_LONG(&_3, 1); - ZEPHIR_CALL_FUNCTION(&image, "imagerotate", NULL, 435, &_1, &_2, &transparent, &_3); + ZEPHIR_CALL_FUNCTION(&image, "imagerotate", NULL, 442, &_1, &_2, &transparent, &_3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 407, &image, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 414, &image, &__$true); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&width, "imagesx", NULL, 416, &image); + ZEPHIR_CALL_FUNCTION(&width, "imagesx", NULL, 423, &image); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&height, "imagesy", NULL, 417, &image); + ZEPHIR_CALL_FUNCTION(&height, "imagesy", NULL, 424, &image); zephir_check_call_status(); zephir_read_property(&_2, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_3, 0); @@ -1240,11 +1240,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processRotate) ZVAL_LONG(&_5, 0); ZVAL_LONG(&_6, 0); ZVAL_LONG(&_7, 100); - ZEPHIR_CALL_FUNCTION(&_8, "imagecopymerge", NULL, 436, &_2, &image, &_3, &_4, &_5, &_6, &width, &height, &_7); + ZEPHIR_CALL_FUNCTION(&_8, "imagecopymerge", NULL, 443, &_2, &image, &_3, &_4, &_5, &_6, &width, &height, &_7); zephir_check_call_status(); if (zephir_is_true(&_8)) { zephir_read_property(&_9$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 410, &_9$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 417, &_9$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &image); zephir_update_property_zval(this_ptr, ZEND_STRL("width"), &width); @@ -1312,7 +1312,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processSave) zephir_check_call_status(); if (!(zephir_is_true(&ext))) { zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("type"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&ext, "image_type_to_extension", NULL, 437, &_1$$3, &__$false); + ZEPHIR_CALL_FUNCTION(&ext, "image_type_to_extension", NULL, 444, &_1$$3, &__$false); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_2); @@ -1320,30 +1320,30 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processSave) ZEPHIR_CPY_WRT(&ext, &_2); ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "gif"); - ZEPHIR_CALL_FUNCTION(&_3, "strcmp", NULL, 427, &ext, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "strcmp", NULL, 434, &ext, &_2); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_3, 0)) { ZEPHIR_INIT_ZVAL_NREF(_4$$4); ZVAL_LONG(&_4$$4, 1); zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_4$$4); zephir_read_property(&_4$$4, this_ptr, ZEND_STRL("type"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_5$$4, "image_type_to_mime_type", NULL, 438, &_4$$4); + ZEPHIR_CALL_FUNCTION(&_5$$4, "image_type_to_mime_type", NULL, 445, &_4$$4); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("mime"), &_5$$4); zephir_read_property(&_6$$4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 428, &_6$$4, &file); + ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 435, &_6$$4, &file); zephir_check_call_status(); RETURN_MM_BOOL(1); } ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "jpg"); - ZEPHIR_CALL_FUNCTION(&_7, "strcmp", NULL, 427, &ext, &_2); + ZEPHIR_CALL_FUNCTION(&_7, "strcmp", NULL, 434, &ext, &_2); zephir_check_call_status(); _8 = ZEPHIR_IS_LONG(&_7, 0); if (!(_8)) { ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "jpeg"); - ZEPHIR_CALL_FUNCTION(&_9, "strcmp", NULL, 427, &ext, &_2); + ZEPHIR_CALL_FUNCTION(&_9, "strcmp", NULL, 434, &ext, &_2); zephir_check_call_status(); _8 = ZEPHIR_IS_LONG(&_9, 0); } @@ -1352,7 +1352,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processSave) ZVAL_LONG(&_10$$5, 2); zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_10$$5); zephir_read_property(&_10$$5, this_ptr, ZEND_STRL("type"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_11$$5, "image_type_to_mime_type", NULL, 438, &_10$$5); + ZEPHIR_CALL_FUNCTION(&_11$$5, "image_type_to_mime_type", NULL, 445, &_10$$5); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("mime"), &_11$$5); if (quality >= 0) { @@ -1363,63 +1363,63 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processSave) } zephir_read_property(&_12$$6, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_13$$6, quality); - ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 429, &_12$$6, &file, &_13$$6); + ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 436, &_12$$6, &file, &_13$$6); zephir_check_call_status(); } else { zephir_read_property(&_14$$9, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 429, &_14$$9, &file); + ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 436, &_14$$9, &file); zephir_check_call_status(); } RETURN_MM_BOOL(1); } ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "png"); - ZEPHIR_CALL_FUNCTION(&_15, "strcmp", NULL, 427, &ext, &_2); + ZEPHIR_CALL_FUNCTION(&_15, "strcmp", NULL, 434, &ext, &_2); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_15, 0)) { ZEPHIR_INIT_ZVAL_NREF(_16$$10); ZVAL_LONG(&_16$$10, 3); zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_16$$10); zephir_read_property(&_16$$10, this_ptr, ZEND_STRL("type"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_17$$10, "image_type_to_mime_type", NULL, 438, &_16$$10); + ZEPHIR_CALL_FUNCTION(&_17$$10, "image_type_to_mime_type", NULL, 445, &_16$$10); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("mime"), &_17$$10); zephir_read_property(&_18$$10, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 430, &_18$$10, &file); + ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 437, &_18$$10, &file); zephir_check_call_status(); RETURN_MM_BOOL(1); } ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "wbmp"); - ZEPHIR_CALL_FUNCTION(&_19, "strcmp", NULL, 427, &ext, &_2); + ZEPHIR_CALL_FUNCTION(&_19, "strcmp", NULL, 434, &ext, &_2); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_19, 0)) { ZEPHIR_INIT_ZVAL_NREF(_20$$11); ZVAL_LONG(&_20$$11, 15); zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_20$$11); zephir_read_property(&_20$$11, this_ptr, ZEND_STRL("type"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_21$$11, "image_type_to_mime_type", NULL, 438, &_20$$11); + ZEPHIR_CALL_FUNCTION(&_21$$11, "image_type_to_mime_type", NULL, 445, &_20$$11); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("mime"), &_21$$11); zephir_read_property(&_22$$11, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 431, &_22$$11, &file); + ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 438, &_22$$11, &file); zephir_check_call_status(); RETURN_MM_BOOL(1); } ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "xbm"); - ZEPHIR_CALL_FUNCTION(&_23, "strcmp", NULL, 427, &ext, &_2); + ZEPHIR_CALL_FUNCTION(&_23, "strcmp", NULL, 434, &ext, &_2); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_23, 0)) { ZEPHIR_INIT_ZVAL_NREF(_24$$12); ZVAL_LONG(&_24$$12, 16); zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_24$$12); zephir_read_property(&_24$$12, this_ptr, ZEND_STRL("type"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_25$$12, "image_type_to_mime_type", NULL, 438, &_24$$12); + ZEPHIR_CALL_FUNCTION(&_25$$12, "image_type_to_mime_type", NULL, 445, &_24$$12); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("mime"), &_25$$12); zephir_read_property(&_26$$12, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 432, &_26$$12, &file); + ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 439, &_26$$12, &file); zephir_check_call_status(); RETURN_MM_BOOL(1); } @@ -1471,7 +1471,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, 270, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 277, &_1); zephir_check_call_status(); ZVAL_LONG(&_1, 2); zephir_round(&_0, &_2, &_1, NULL); @@ -1517,15 +1517,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(&_8, "imageconvolution", NULL, 439, &_5, &matrix, &_6, &_7); + ZEPHIR_CALL_FUNCTION(&_8, "imageconvolution", NULL, 446, &_5, &matrix, &_6, &_7); zephir_check_call_status(); if (zephir_is_true(&_8)) { zephir_read_property(&_9$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_10$$3, "imagesx", NULL, 416, &_9$$3); + ZEPHIR_CALL_FUNCTION(&_10$$3, "imagesx", NULL, 423, &_9$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("width"), &_10$$3); zephir_read_property(&_11$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_12$$3, "imagesy", NULL, 417, &_11$$3); + ZEPHIR_CALL_FUNCTION(&_12$$3, "imagesy", NULL, 424, &_11$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("height"), &_12$$3); } @@ -1605,14 +1605,14 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processText) topRightY = 0; ZEPHIR_INIT_VAR(&_0); ZVAL_DOUBLE(&_1, ((zephir_safe_div_long_long((opacity * 127), 100)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 270, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 277, &_1); zephir_check_call_status(); zephir_round(&_0, &_2, NULL, NULL); opacity = zephir_get_intval(&_0); if (!(ZEPHIR_IS_EMPTY(&fontfile))) { ZVAL_LONG(&_3$$3, size); ZVAL_LONG(&_4$$3, 0); - ZEPHIR_CALL_FUNCTION(&space, "imagettfbbox", NULL, 440, &_3$$3, &_4$$3, &fontfile, &text); + ZEPHIR_CALL_FUNCTION(&space, "imagettfbbox", NULL, 447, &_3$$3, &_4$$3, &fontfile, &text); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&space)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_image_exception_ce, "Call to imagettfbbox() failed", "phalcon/Image/Adapter/Gd.zep", 618); @@ -1633,11 +1633,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processText) topRightY = zephir_get_intval(&_8$$5); } ZVAL_LONG(&_3$$3, (topRightX - bottomLeftX)); - ZEPHIR_CALL_FUNCTION(&_9$$3, "abs", NULL, 270, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_9$$3, "abs", NULL, 277, &_3$$3); zephir_check_call_status(); width = (zephir_get_numberval(&_9$$3) + 10); ZVAL_LONG(&_3$$3, (topRightY - bottomLeftY)); - ZEPHIR_CALL_FUNCTION(&_10$$3, "abs", NULL, 270, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_10$$3, "abs", NULL, 277, &_3$$3); zephir_check_call_status(); height = (zephir_get_numberval(&_10$$3) + 10); if (offsetX < 0) { @@ -1653,7 +1653,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processText) ZVAL_LONG(&_13$$3, g); ZVAL_LONG(&_14$$3, b); ZVAL_LONG(&_15$$3, opacity); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 412, &_3$$3, &_4$$3, &_13$$3, &_14$$3, &_15$$3); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 419, &_3$$3, &_4$$3, &_13$$3, &_14$$3, &_15$$3); zephir_check_call_status(); angle = 0; zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); @@ -1661,15 +1661,15 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processText) ZVAL_LONG(&_14$$3, angle); ZVAL_LONG(&_15$$3, offsetX); ZVAL_LONG(&_16$$3, offsetY); - ZEPHIR_CALL_FUNCTION(NULL, "imagettftext", NULL, 441, &_4$$3, &_13$$3, &_14$$3, &_15$$3, &_16$$3, &color, &fontfile, &text); + ZEPHIR_CALL_FUNCTION(NULL, "imagettftext", NULL, 448, &_4$$3, &_13$$3, &_14$$3, &_15$$3, &_16$$3, &color, &fontfile, &text); zephir_check_call_status(); } else { ZVAL_LONG(&_17$$8, size); - ZEPHIR_CALL_FUNCTION(&_18$$8, "imagefontwidth", NULL, 442, &_17$$8); + ZEPHIR_CALL_FUNCTION(&_18$$8, "imagefontwidth", NULL, 449, &_17$$8); zephir_check_call_status(); width = (zephir_get_intval(&_18$$8) * zephir_fast_strlen_ev(&text)); ZVAL_LONG(&_17$$8, size); - ZEPHIR_CALL_FUNCTION(&_19$$8, "imagefontheight", NULL, 443, &_17$$8); + ZEPHIR_CALL_FUNCTION(&_19$$8, "imagefontheight", NULL, 450, &_17$$8); zephir_check_call_status(); height = zephir_get_intval(&_19$$8); if (offsetX < 0) { @@ -1685,13 +1685,13 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processText) ZVAL_LONG(&_23$$8, g); ZVAL_LONG(&_24$$8, b); ZVAL_LONG(&_25$$8, opacity); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 412, &_17$$8, &_22$$8, &_23$$8, &_24$$8, &_25$$8); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 419, &_17$$8, &_22$$8, &_23$$8, &_24$$8, &_25$$8); zephir_check_call_status(); zephir_read_property(&_22$$8, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_23$$8, size); ZVAL_LONG(&_24$$8, offsetX); ZVAL_LONG(&_25$$8, offsetY); - ZEPHIR_CALL_FUNCTION(NULL, "imagestring", NULL, 444, &_22$$8, &_23$$8, &_24$$8, &_25$$8, &text, &color); + ZEPHIR_CALL_FUNCTION(NULL, "imagestring", NULL, 451, &_22$$8, &_23$$8, &_24$$8, &_25$$8, &text, &color); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -1746,20 +1746,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, 419, &_0); + ZEPHIR_CALL_FUNCTION(&overlay, "imagecreatefromstring", NULL, 426, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 407, &overlay, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 414, &overlay, &__$true); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 416, &overlay); + ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 423, &overlay); zephir_check_call_status(); width = zephir_get_intval(&_1); - ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 417, &overlay); + ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 424, &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, 270, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "abs", NULL, 277, &_4$$3); zephir_check_call_status(); zephir_round(&_3$$3, &_5$$3, NULL, NULL); opacity = zephir_get_intval(&_3$$3); @@ -1767,20 +1767,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, 412, &overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 419, &overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3); zephir_check_call_status(); ZVAL_LONG(&_4$$3, 3); - ZEPHIR_CALL_FUNCTION(NULL, "imagelayereffect", NULL, 445, &overlay, &_4$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagelayereffect", NULL, 452, &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, 425, &overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3, &color); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", NULL, 432, &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, 409, &_9, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 416, &_9, &__$true); zephir_check_call_status(); zephir_read_property(&_10, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_11, offsetX); @@ -1789,10 +1789,10 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processWatermark) ZVAL_LONG(&_14, 0); ZVAL_LONG(&_15, width); ZVAL_LONG(&_16, height); - ZEPHIR_CALL_FUNCTION(&_17, "imagecopy", NULL, 413, &_10, &overlay, &_11, &_12, &_13, &_14, &_15, &_16); + ZEPHIR_CALL_FUNCTION(&_17, "imagecopy", NULL, 420, &_10, &overlay, &_11, &_12, &_13, &_14, &_15, &_16); zephir_check_call_status(); if (zephir_is_true(&_17)) { - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 410, &overlay); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 417, &overlay); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/loader.zep.c b/ext/phalcon/loader.zep.c index 0b798121a1c..6385bf250a7 100644 --- a/ext/phalcon/loader.zep.c +++ b/ext/phalcon/loader.zep.c @@ -306,7 +306,7 @@ PHP_METHOD(Phalcon_Loader, autoLoad) ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_16, 0, &_15$$11, this_ptr); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_17$$10, "call_user_func", &_18, 285, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_17$$10, "call_user_func", &_18, 292, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_17$$10)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { @@ -342,7 +342,7 @@ PHP_METHOD(Phalcon_Loader, autoLoad) ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_22, 0, &_21$$15, this_ptr); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_23$$14, "call_user_func", &_18, 285, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_23$$14, "call_user_func", &_18, 292, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_23$$14)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { @@ -393,7 +393,7 @@ PHP_METHOD(Phalcon_Loader, autoLoad) ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_30, 0, &_29$$20, this_ptr); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_31$$19, "call_user_func", &_18, 285, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_31$$19, "call_user_func", &_18, 292, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_31$$19)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { @@ -429,7 +429,7 @@ PHP_METHOD(Phalcon_Loader, autoLoad) ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_35, 0, &_34$$24, this_ptr); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_36$$23, "call_user_func", &_18, 285, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_36$$23, "call_user_func", &_18, 292, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_36$$23)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { @@ -507,7 +507,7 @@ PHP_METHOD(Phalcon_Loader, autoLoad) ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_48, 0, &_47$$32, this_ptr); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_49$$31, "call_user_func", &_18, 285, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_49$$31, "call_user_func", &_18, 292, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_49$$31)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { @@ -543,7 +543,7 @@ PHP_METHOD(Phalcon_Loader, autoLoad) ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_53, 0, &_52$$36, this_ptr); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_54$$35, "call_user_func", &_18, 285, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_54$$35, "call_user_func", &_18, 292, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_54$$35)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { @@ -594,7 +594,7 @@ PHP_METHOD(Phalcon_Loader, autoLoad) ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_61, 0, &_60$$41, this_ptr); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_62$$40, "call_user_func", &_18, 285, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_62$$40, "call_user_func", &_18, 292, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_62$$40)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { @@ -630,7 +630,7 @@ PHP_METHOD(Phalcon_Loader, autoLoad) ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_66, 0, &_65$$45, this_ptr); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_67$$44, "call_user_func", &_18, 285, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_67$$44, "call_user_func", &_18, 292, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_67$$44)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { @@ -690,7 +690,7 @@ PHP_METHOD(Phalcon_Loader, autoLoad) ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_76, 0, &_75$$50, this_ptr, &filePath); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_77$$49, "call_user_func", &_18, 285, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_77$$49, "call_user_func", &_18, 292, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_77$$49)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { @@ -726,7 +726,7 @@ PHP_METHOD(Phalcon_Loader, autoLoad) ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_81, 0, &_80$$54, this_ptr, &filePath); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_82$$53, "call_user_func", &_18, 285, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_82$$53, "call_user_func", &_18, 292, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_82$$53)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { @@ -777,7 +777,7 @@ PHP_METHOD(Phalcon_Loader, autoLoad) ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_89, 0, &_88$$59, this_ptr, &filePath); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_90$$58, "call_user_func", &_18, 285, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_90$$58, "call_user_func", &_18, 292, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_90$$58)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { @@ -813,7 +813,7 @@ PHP_METHOD(Phalcon_Loader, autoLoad) ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_94, 0, &_93$$63, this_ptr, &filePath); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_95$$62, "call_user_func", &_18, 285, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_95$$62, "call_user_func", &_18, 292, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_95$$62)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { @@ -995,7 +995,7 @@ PHP_METHOD(Phalcon_Loader, loadFiles) ZEPHIR_CALL_METHOD(NULL, &_4$$4, "fire", NULL, 0, &_5$$4, this_ptr, &filePath); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_6$$3, "call_user_func", &_7, 285, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_6$$3, "call_user_func", &_7, 292, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_6$$3)) { ZEPHIR_OBS_NVAR(&_8$$5); @@ -1034,7 +1034,7 @@ PHP_METHOD(Phalcon_Loader, loadFiles) ZEPHIR_CALL_METHOD(NULL, &_12$$8, "fire", NULL, 0, &_13$$8, this_ptr, &filePath); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_14$$7, "call_user_func", &_7, 285, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_14$$7, "call_user_func", &_7, 292, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_14$$7)) { ZEPHIR_OBS_NVAR(&_15$$9); @@ -1106,7 +1106,7 @@ PHP_METHOD(Phalcon_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, 446, &_1$$3, &__$true, &_3$$3); + ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_register", NULL, 453, &_1$$3, &__$true, &_3$$3); zephir_check_call_status(); if (1) { zephir_update_property_zval(this_ptr, ZEND_STRL("registered"), &__$true); @@ -1500,7 +1500,7 @@ PHP_METHOD(Phalcon_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, 447, &_1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_unregister", NULL, 454, &_1$$3); zephir_check_call_status(); if (0) { zephir_update_property_zval(this_ptr, ZEND_STRL("registered"), &__$true); diff --git a/ext/phalcon/logger/adapter/stream.zep.c b/ext/phalcon/logger/adapter/stream.zep.c index 8c3c08bf583..5e6d87227ef 100644 --- a/ext/phalcon/logger/adapter/stream.zep.c +++ b/ext/phalcon/logger/adapter/stream.zep.c @@ -231,7 +231,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_Stream, process) ZVAL_STRING(&_8$$4, "The file '%s' cannot be opened with mode '%s'"); ZEPHIR_CALL_FUNCTION(&_9$$4, "sprintf", NULL, 137, &_8$$4, &_6$$4, &_7$$4); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_5$$4, "__construct", NULL, 448, &_9$$4); + ZEPHIR_CALL_METHOD(NULL, &_5$$4, "__construct", NULL, 455, &_9$$4); zephir_check_call_status(); zephir_throw_exception_debug(&_5$$4, "phalcon/Logger/Adapter/Stream.zep", 133); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/logger/adapter/syslog.zep.c b/ext/phalcon/logger/adapter/syslog.zep.c index d4492cdd1f4..5662eb5415d 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, 449); + ZEPHIR_RETURN_CALL_FUNCTION("closelog", NULL, 456); zephir_check_call_status(); RETURN_MM(); } @@ -209,7 +209,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_Syslog, process) ZVAL_STRING(&_7$$3, "Cannot open syslog for name [%s] and facility [%s]"); ZEPHIR_CALL_FUNCTION(&_8$$3, "sprintf", NULL, 137, &_7$$3, &_4$$3, &_6$$3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 448, &_8$$3); + ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 455, &_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, 450, &_9); + ZEPHIR_CALL_METHOD(&level, this_ptr, "logleveltosyslog", NULL, 457, &_9); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "syslog", NULL, 451, &level, &message); + ZEPHIR_CALL_FUNCTION(NULL, "syslog", NULL, 458, &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, 452, &ident, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("openlog", NULL, 459, &ident, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/logger/logger.zep.c b/ext/phalcon/logger/logger.zep.c index 9ff48b7a804..ae60f394562 100644 --- a/ext/phalcon/logger/logger.zep.c +++ b/ext/phalcon/logger/logger.zep.c @@ -196,7 +196,7 @@ PHP_METHOD(Phalcon_Logger_Logger, __construct) ZEPHIR_CPY_WRT(&localTimeZone, timezone); if (ZEPHIR_IS_EMPTY(timezone)) { - ZEPHIR_CALL_FUNCTION(&localTimeZone, "date_default_timezone_get", NULL, 453); + ZEPHIR_CALL_FUNCTION(&localTimeZone, "date_default_timezone_get", NULL, 460); zephir_check_call_status(); if (ZEPHIR_IS_EMPTY(&localTimeZone)) { ZEPHIR_INIT_NVAR(&localTimeZone); @@ -703,7 +703,7 @@ PHP_METHOD(Phalcon_Logger_Logger, log) } - ZEPHIR_CALL_METHOD(&intLevel, this_ptr, "getlevelnumber", NULL, 454, level); + ZEPHIR_CALL_METHOD(&intLevel, this_ptr, "getlevelnumber", NULL, 461, level); zephir_check_call_status(); zephir_cast_to_string(&_0, message); ZEPHIR_CALL_METHOD(NULL, this_ptr, "addmessage", NULL, 0, &intLevel, &_0, &context); @@ -1011,9 +1011,9 @@ PHP_METHOD(Phalcon_Logger_Logger, addMessage) ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 0, &_3$$3, &_1$$3); zephir_check_call_status(); ZVAL_LONG(&_4$$3, level); - ZEPHIR_CALL_METHOD(NULL, &item, "__construct", NULL, 455, &message, &levelName, &_4$$3, &_2$$3, &context); + ZEPHIR_CALL_METHOD(NULL, &item, "__construct", NULL, 462, &message, &levelName, &_4$$3, &_2$$3, &context); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&adapters, "array_diff_key", NULL, 279, ®istered, &excluded); + ZEPHIR_CALL_FUNCTION(&adapters, "array_diff_key", NULL, 286, ®istered, &excluded); zephir_check_call_status(); zephir_is_iterable(&adapters, 0, "phalcon/Logger/Logger.zep", 427); if (Z_TYPE_P(&adapters) == IS_ARRAY) { @@ -1124,7 +1124,7 @@ PHP_METHOD(Phalcon_Logger_Logger, getLevelNumber) zephir_fast_strtoupper(&levelName, level); ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "getlevels", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&levels, "array_flip", NULL, 185, &_0$$3); + ZEPHIR_CALL_FUNCTION(&levels, "array_flip", NULL, 186, &_0$$3); zephir_check_call_status(); if (zephir_array_isset(&levels, &levelName)) { zephir_array_fetch(&_1$$4, &levels, &levelName, PH_NOISY | PH_READONLY, "phalcon/Logger/Logger.zep", 473); diff --git a/ext/phalcon/logger/loggerfactory.zep.c b/ext/phalcon/logger/loggerfactory.zep.c index 83740a3ae3c..42bf2f2f1b5 100644 --- a/ext/phalcon/logger/loggerfactory.zep.c +++ b/ext/phalcon/logger/loggerfactory.zep.c @@ -268,7 +268,7 @@ PHP_METHOD(Phalcon_Logger_LoggerFactory, newInstance) object_init_ex(return_value, phalcon_logger_logger_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 456, &name, &adapters, timezone); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 463, &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 35d61b85c1b..c34e9335571 100644 --- a/ext/phalcon/messages/messages.zep.c +++ b/ext/phalcon/messages/messages.zep.c @@ -559,7 +559,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, 457, &_1$$3, index, &_2$$3); + ZEPHIR_CALL_FUNCTION(NULL, "array_splice", NULL, 464, &_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 83a646e365f..45d89ae8f9a 100644 --- a/ext/phalcon/mvc/micro.zep.c +++ b/ext/phalcon/mvc/micro.zep.c @@ -581,11 +581,11 @@ PHP_METHOD(Phalcon_Mvc_Micro, getService) if (Z_TYPE_P(&container) != IS_OBJECT) { ZEPHIR_INIT_NVAR(&container); object_init_ex(&container, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 458); + ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 465); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container); } - ZEPHIR_RETURN_CALL_METHOD(&container, "get", NULL, 459, &serviceName); + ZEPHIR_RETURN_CALL_METHOD(&container, "get", NULL, 466, &serviceName); zephir_check_call_status(); RETURN_MM(); } @@ -632,11 +632,11 @@ PHP_METHOD(Phalcon_Mvc_Micro, getSharedService) if (Z_TYPE_P(&container) != IS_OBJECT) { ZEPHIR_INIT_NVAR(&container); object_init_ex(&container, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 458); + ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 465); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container); } - ZEPHIR_RETURN_CALL_METHOD(&container, "getshared", NULL, 460, &serviceName); + ZEPHIR_RETURN_CALL_METHOD(&container, "getshared", NULL, 467, &serviceName); zephir_check_call_status(); RETURN_MM(); } @@ -1449,11 +1449,11 @@ PHP_METHOD(Phalcon_Mvc_Micro, hasService) if (Z_TYPE_P(&container) != IS_OBJECT) { ZEPHIR_INIT_NVAR(&container); object_init_ex(&container, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 458); + ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 465); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container); } - ZEPHIR_RETURN_CALL_METHOD(&container, "has", NULL, 461, &serviceName); + ZEPHIR_RETURN_CALL_METHOD(&container, "has", NULL, 468, &serviceName); zephir_check_call_status(); RETURN_MM(); } @@ -1615,7 +1615,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, 462, &mainHandler); + ZEPHIR_CALL_METHOD(NULL, &lazyHandler, "__construct", NULL, 469, &mainHandler); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&lazyHandler, &mainHandler); @@ -1894,11 +1894,11 @@ PHP_METHOD(Phalcon_Mvc_Micro, offsetUnset) if (Z_TYPE_P(&container) != IS_OBJECT) { ZEPHIR_INIT_NVAR(&container); object_init_ex(&container, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 458); + ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 465); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container); } - ZEPHIR_CALL_METHOD(NULL, &container, "remove", NULL, 463, alias); + ZEPHIR_CALL_METHOD(NULL, &container, "remove", NULL, 470, alias); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -2301,7 +2301,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, setService) if (Z_TYPE_P(&container) != IS_OBJECT) { ZEPHIR_INIT_NVAR(&container); object_init_ex(&container, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 458); + ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 465); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container); } @@ -2310,7 +2310,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, setService) } else { ZVAL_BOOL(&_0, 0); } - ZEPHIR_RETURN_CALL_METHOD(&container, "set", NULL, 464, &serviceName, definition, &_0); + ZEPHIR_RETURN_CALL_METHOD(&container, "set", NULL, 471, &serviceName, definition, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/mvc/model.zep.c b/ext/phalcon/mvc/model.zep.c index 50b3e3cb72a..16c0d9390ee 100644 --- a/ext/phalcon/mvc/model.zep.c +++ b/ext/phalcon/mvc/model.zep.c @@ -300,7 +300,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __call) zephir_get_arrval(&arguments, arguments_param); - ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 465, &method, &arguments); + ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 472, &method, &arguments); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&records)) { RETURN_CCTOR(&records); @@ -366,7 +366,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __callStatic) zephir_get_arrval(&arguments, arguments_param); - ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 465, &method, &arguments); + ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 472, &method, &arguments); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&records)) { RETURN_CCTOR(&records); @@ -708,13 +708,13 @@ PHP_METHOD(Phalcon_Mvc_Model, __set) } } - ZEPHIR_CALL_METHOD(&_14, this_ptr, "possiblesetter", NULL, 466, &property, value); + ZEPHIR_CALL_METHOD(&_14, this_ptr, "possiblesetter", NULL, 473, &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, 467, this_ptr, &property); + ZEPHIR_CALL_FUNCTION(&_15, "property_exists", NULL, 474, this_ptr, &property); zephir_check_call_status(); if (zephir_is_true(&_15)) { ZEPHIR_CALL_METHOD(&manager, this_ptr, "getmodelsmanager", NULL, 0); @@ -1027,7 +1027,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, 468, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_8$$13, "caseinsensitivecolumnmap", &_9, 475, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_8$$13); } @@ -1059,7 +1059,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, 466, &attributeField, &value); + ZEPHIR_CALL_METHOD(&_14$$18, this_ptr, "possiblesetter", &_15, 473, &attributeField, &value); zephir_check_call_status(); _13$$18 = !zephir_is_true(&_14$$18); } @@ -1084,7 +1084,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, 468, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_17$$23, "caseinsensitivecolumnmap", &_9, 475, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_17$$23); } @@ -1116,7 +1116,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, 466, &attributeField, &value); + ZEPHIR_CALL_METHOD(&_21$$28, this_ptr, "possiblesetter", &_15, 473, &attributeField, &value); zephir_check_call_status(); _20$$28 = !zephir_is_true(&_21$$28); } @@ -1730,7 +1730,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, 468, columnMap, &key); + ZEPHIR_CALL_SELF(&_5$$8, "caseinsensitivecolumnmap", &_6, 475, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_5$$8); } @@ -1782,7 +1782,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, 468, columnMap, &key); + ZEPHIR_CALL_SELF(&_11$$17, "caseinsensitivecolumnmap", &_6, 475, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_11$$17); } @@ -1818,7 +1818,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate) ZEPHIR_INIT_NVAR(&value); ZEPHIR_INIT_NVAR(&key); if (hydrationMode != 1) { - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_helper_arr_ce, "toobject", &_14, 469, &hydrateArray); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_helper_arr_ce, "toobject", &_14, 476, &hydrateArray); zephir_check_call_status(); RETURN_MM(); } @@ -2027,7 +2027,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, 470); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getwriteconnection", NULL, 477); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, this_ptr, "exists", NULL, 0, &metaData, &_1); zephir_check_call_status(); @@ -2126,7 +2126,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, 470); + ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 477); zephir_check_call_status(); ZEPHIR_INIT_ZVAL_NREF(_0); ZVAL_LONG(&_0, 3); @@ -2135,7 +2135,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, 471); + ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "checkforeignkeysreverserestrict", NULL, 478); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&_2$$3)) { RETURN_MM_BOOL(0); @@ -2297,9 +2297,9 @@ PHP_METHOD(Phalcon_Mvc_Model, delete) RETURN_MM_BOOL(1); } } - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 472); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 479); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 473); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 480); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); @@ -2314,7 +2314,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, 474); + ZEPHIR_CALL_METHOD(&_28$$25, this_ptr, "checkforeignkeysreversecascade", NULL, 481); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&_28$$25)) { RETURN_MM_BOOL(0); @@ -2354,7 +2354,7 @@ PHP_METHOD(Phalcon_Mvc_Model, dump) ZEPHIR_MM_GROW(); - ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 475, this_ptr); + ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 482, this_ptr); zephir_check_call_status(); RETURN_MM(); } @@ -2576,7 +2576,7 @@ PHP_METHOD(Phalcon_Mvc_Model, find) } else { ZEPHIR_CPY_WRT(¶ms, parameters); } - ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_0, 476, ¶ms); + ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_0, 483, ¶ms); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&resultset, &query, "execute", NULL, 0); zephir_check_call_status(); @@ -2725,7 +2725,7 @@ PHP_METHOD(Phalcon_Mvc_Model, findFirst) return; } ZVAL_LONG(&_3, 1); - ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_2, 476, ¶ms, &_3); + ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_2, 483, ¶ms, &_3); zephir_check_call_status(); ZVAL_BOOL(&_3, 1); ZEPHIR_CALL_METHOD(NULL, &query, "setuniquerow", NULL, 0, &_3); @@ -3618,7 +3618,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, 477, fieldName, &changedFields); + ZEPHIR_CALL_FUNCTION(&intersect, "array_intersect", NULL, 484, fieldName, &changedFields); zephir_check_call_status(); if (allFields) { RETURN_MM_BOOL(ZEPHIR_IS_EQUAL(&intersect, fieldName)); @@ -3691,7 +3691,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, 477, fieldName, &updatedFields); + ZEPHIR_CALL_FUNCTION(&intersect, "array_intersect", NULL, 484, fieldName, &updatedFields); zephir_check_call_status(); if (allFields) { RETURN_MM_BOOL(ZEPHIR_IS_EQUAL(&intersect, fieldName)); @@ -3906,12 +3906,12 @@ PHP_METHOD(Phalcon_Mvc_Model, query) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 478, container); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 485, container); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_3); zephir_get_called_class(&_3); - ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 479, &_3); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 486, &_3); zephir_check_call_status(); RETURN_CCTOR(&criteria); } @@ -4011,13 +4011,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, 480); + ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 487); 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, 472); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 479); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 473); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 480); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); @@ -4176,7 +4176,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, 470); + ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 477); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "prepareSave"); @@ -4192,9 +4192,9 @@ PHP_METHOD(Phalcon_Mvc_Model, save) RETURN_MM_BOOL(0); } } - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 472); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 479); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 473); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 480); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); @@ -4204,7 +4204,7 @@ PHP_METHOD(Phalcon_Mvc_Model, save) } else { ZEPHIR_CPY_WRT(&table, &source); } - ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 480); + ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 487); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&exists, this_ptr, "exists", NULL, 0, &metaData, &readConnection); zephir_check_call_status(); @@ -4235,7 +4235,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, 481, this_ptr, &_7$$11); + ZEPHIR_CALL_METHOD(NULL, &_6$$11, "__construct", NULL, 488, this_ptr, &_7$$11); zephir_check_call_status(); zephir_throw_exception_debug(&_6$$11, "phalcon/Mvc/Model.zep", 2561); ZEPHIR_MM_RESTORE(); @@ -4843,7 +4843,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, 468, columnMap, &key); + ZEPHIR_CALL_SELF(&_5$$6, "caseinsensitivecolumnmap", &_6, 475, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_5$$6); } @@ -4902,7 +4902,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, 468, columnMap, &key); + ZEPHIR_CALL_SELF(&_13$$14, "caseinsensitivecolumnmap", &_6, 475, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_13$$14); } @@ -5323,7 +5323,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, 468, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_4$$5, "caseinsensitivecolumnmap", &_5, 475, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_4$$5); } @@ -5374,7 +5374,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, 468, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_10$$15, "caseinsensitivecolumnmap", &_5, 475, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_10$$15); } @@ -5454,7 +5454,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, 480); + ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getreadconnection", NULL, 487); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "exists", NULL, 0, &metaData, &_2$$3); zephir_check_call_status(); @@ -6580,9 +6580,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, 473); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 480); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 472); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 479); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&sequenceName); if (ZEPHIR_IS_EMPTY(&schema)) { @@ -7382,9 +7382,9 @@ PHP_METHOD(Phalcon_Mvc_Model, exists) 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, 472); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 479); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 473); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 480); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); @@ -7991,7 +7991,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSave) } } if (ZEPHIR_GLOBAL(orm).virtual_foreign_keys) { - ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "checkforeignkeysrestrict", NULL, 482); + ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "checkforeignkeysrestrict", NULL, 489); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&_3$$8)) { RETURN_MM_BOOL(0); diff --git a/ext/phalcon/mvc/model/behavior/timestampable.zep.c b/ext/phalcon/mvc/model/behavior/timestampable.zep.c index 0229ce4866f..75ce3786960 100644 --- a/ext/phalcon/mvc/model/behavior/timestampable.zep.c +++ b/ext/phalcon/mvc/model/behavior/timestampable.zep.c @@ -101,7 +101,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Behavior_Timestampable, notify) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The option 'field' is required", "phalcon/Mvc/Model/Behavior/Timestampable.zep", 50); return; } - ZEPHIR_CALL_METHOD(×tamp, this_ptr, "gettimestamp", NULL, 483, &options); + ZEPHIR_CALL_METHOD(×tamp, this_ptr, "gettimestamp", NULL, 490, &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, 484, &format); + ZEPHIR_RETURN_CALL_FUNCTION("date", NULL, 491, &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 fd3f86a155f..2c7812b9736 100644 --- a/ext/phalcon/mvc/model/binder.zep.c +++ b/ext/phalcon/mvc/model/binder.zep.c @@ -431,16 +431,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, 485, handler, &methodName); + ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 492, handler, &methodName); zephir_check_call_status(); } else { object_init_ex(&reflection, zephir_get_internal_ce(SL("reflectionfunction"))); - ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 162, handler); + ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 163, 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, 163); + ZEPHIR_CALL_METHOD(&methodParams, &reflection, "getparameters", NULL, 164); zephir_check_call_status(); ZEPHIR_INIT_VAR(¶msKeys); zephir_array_keys(¶msKeys, ¶ms); @@ -473,7 +473,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection) zephir_array_fetch(¶mValue, ¶ms, ¶mKey, PH_NOISY, "phalcon/Mvc/Model/Binder.zep", 179); ZEPHIR_INIT_NVAR(&_6$$5); ZVAL_STRING(&_6$$5, "Phalcon\\Mvc\\Model"); - ZEPHIR_CALL_FUNCTION(&_7$$5, "is_subclass_of", &_8, 486, &className, &_6$$5); + ZEPHIR_CALL_FUNCTION(&_7$$5, "is_subclass_of", &_8, 493, &className, &_6$$5); zephir_check_call_status(); if (ZEPHIR_IS_STRING(&className, "Phalcon\\Mvc\\Model")) { if (Z_TYPE_P(&realClasses) == IS_NULL) { @@ -555,7 +555,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection) zephir_array_fetch(¶mValue, ¶ms, ¶mKey, PH_NOISY, "phalcon/Mvc/Model/Binder.zep", 179); ZEPHIR_INIT_NVAR(&_15$$19); ZVAL_STRING(&_15$$19, "Phalcon\\Mvc\\Model"); - ZEPHIR_CALL_FUNCTION(&_16$$19, "is_subclass_of", &_8, 486, &className, &_15$$19); + ZEPHIR_CALL_FUNCTION(&_16$$19, "is_subclass_of", &_8, 493, &className, &_15$$19); zephir_check_call_status(); if (ZEPHIR_IS_STRING(&className, "Phalcon\\Mvc\\Model")) { if (Z_TYPE_P(&realClasses) == IS_NULL) { diff --git a/ext/phalcon/mvc/model/criteria.zep.c b/ext/phalcon/mvc/model/criteria.zep.c index b9d37a98177..de7ca91d5bf 100644 --- a/ext/phalcon/mvc/model/criteria.zep.c +++ b/ext/phalcon/mvc/model/criteria.zep.c @@ -783,19 +783,19 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, fromInput) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 478, container); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 485, 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, 487, &_16$$16); + ZEPHIR_CALL_METHOD(NULL, &criteria, "where", NULL, 494, &_16$$16); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &criteria, "bind", NULL, 488, &bind); + ZEPHIR_CALL_METHOD(NULL, &criteria, "bind", NULL, 495, &bind); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 479, &modelName); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 486, &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, 270, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 277, &_0); zephir_check_call_status(); limit = zephir_get_numberval(&_1); ZVAL_LONG(&_0, offset); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 270, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 277, &_0); zephir_check_call_status(); offset = zephir_get_numberval(&_2); if (UNEXPECTED(limit == 0)) { diff --git a/ext/phalcon/mvc/model/manager.zep.c b/ext/phalcon/mvc/model/manager.zep.c index 40a98731011..1337dabd766 100644 --- a/ext/phalcon/mvc/model/manager.zep.c +++ b/ext/phalcon/mvc/model/manager.zep.c @@ -675,10 +675,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, 167, &className); + ZEPHIR_CALL_METHOD(NULL, &classReflection, "__construct", NULL, 168, &className); zephir_check_call_status(); ZVAL_LONG(&_1$$3, 1); - ZEPHIR_CALL_METHOD(&reflectionProperties, &classReflection, "getproperties", NULL, 171, &_1$$3); + ZEPHIR_CALL_METHOD(&reflectionProperties, &classReflection, "getproperties", NULL, 172, &_1$$3); zephir_check_call_status(); zephir_is_iterable(&reflectionProperties, 0, "phalcon/Mvc/Model/Manager.zep", 434); if (Z_TYPE_P(&reflectionProperties) == IS_ARRAY) { @@ -1664,7 +1664,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, 489, &_2, &referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 496, &_2, &referencedModel, fields, referencedFields, options); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, options, SL("alias"), 0)) { @@ -1805,9 +1805,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, 489, &_1, &referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 496, &_1, &referencedModel, fields, referencedFields, options); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 490, intermediateFields, &intermediateModel, intermediateReferencedFields); + ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 497, intermediateFields, &intermediateModel, intermediateReferencedFields); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, options, SL("alias"), 0)) { @@ -1919,7 +1919,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, 489, &_2, &referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 496, &_2, &referencedModel, fields, referencedFields, options); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, options, SL("alias"), 0)) { @@ -2033,7 +2033,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, 489, &_1, &referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 496, &_1, &referencedModel, fields, referencedFields, options); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, options, SL("alias"), 0)) { @@ -2174,9 +2174,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, 489, &_1, &referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 496, &_1, &referencedModel, fields, referencedFields, options); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 490, intermediateFields, &intermediateModel, intermediateReferencedFields); + ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 497, intermediateFields, &intermediateModel, intermediateReferencedFields); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, options, SL("alias"), 0)) { @@ -2967,7 +2967,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", 1534); - ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "_mergefindparameters", NULL, 491, &extraParameters, parameters); + ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "_mergefindparameters", NULL, 498, &extraParameters, parameters); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&builder, this_ptr, "createbuilder", NULL, 0, &_5$$3); zephir_check_call_status(); @@ -3098,10 +3098,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, 491, &findParams, parameters); + ZEPHIR_CALL_METHOD(&findArguments, this_ptr, "_mergefindparameters", NULL, 498, &findParams, parameters); zephir_check_call_status(); if (Z_TYPE_P(&extraParameters) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&findParams, this_ptr, "_mergefindparameters", NULL, 491, &extraParameters, &findArguments); + ZEPHIR_CALL_METHOD(&findParams, this_ptr, "_mergefindparameters", NULL, 498, &extraParameters, &findArguments); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&findParams, &findArguments); diff --git a/ext/phalcon/mvc/model/metadata/stream.zep.c b/ext/phalcon/mvc/model/metadata/stream.zep.c index a2db10e7a06..e436966e65b 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(2, 3) @@ -544,20 +545,89 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, set) } + _0 = Z_TYPE_P(ttl) == IS_LONG; + if (_0) { + _0 = ZEPHIR_LT_LONG(ttl, 1); + } + if (_0) { + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "delete", NULL, 0, &key); + zephir_check_call_status(); + RETURN_MM(); + } + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getprefixedkey", NULL, 0, &key); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "getserializeddata", NULL, 0, value); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "getttl", NULL, 0, ttl); + zephir_check_call_status(); + ZEPHIR_CALL_FUNCTION(&result, "apcu_store", NULL, 128, &_1, &_2, &_3); + zephir_check_call_status(); + ZEPHIR_INIT_VAR(&_4); + if (((Z_TYPE_P(&result) == IS_TRUE || Z_TYPE_P(&result) == IS_FALSE) == 1)) { + ZEPHIR_CPY_WRT(&_4, &result); + } else { + ZVAL_BOOL(&_4, 0); + } + RETURN_CCTOR(&_4); +} + +/** + * Stores data in the adapter forever. The key needs to manually deleted + * from the adapter. + * + * @param string $key + * @param mixed $value + * + * @return bool + */ +PHP_METHOD(Phalcon_Storage_Adapter_Apcu, setForever) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *key_param = NULL, *value, value_sub, result, _0, _1, _2; + zval key; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&key); + ZVAL_UNDEF(&value_sub); + ZVAL_UNDEF(&result); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(2, 2) + Z_PARAM_STR(key) + Z_PARAM_ZVAL(value) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 2, 0, &key_param, &value); + 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_CALL_METHOD(&_0, this_ptr, "getprefixedkey", NULL, 0, &key); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_1, this_ptr, "getserializeddata", NULL, 0, value); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "getttl", NULL, 0, ttl); - zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&result, "apcu_store", NULL, 128, &_0, &_1, &_2); + ZEPHIR_CALL_FUNCTION(&result, "apcu_store", NULL, 128, &_0, &_1); zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_3); + ZEPHIR_INIT_VAR(&_2); if (((Z_TYPE_P(&result) == IS_TRUE || Z_TYPE_P(&result) == IS_FALSE) == 1)) { - ZEPHIR_CPY_WRT(&_3, &result); + ZEPHIR_CPY_WRT(&_2, &result); } else { - ZVAL_BOOL(&_3, 0); + ZVAL_BOOL(&_2, 0); } - RETURN_CCTOR(&_3); + RETURN_CCTOR(&_2); } diff --git a/ext/phalcon/storage/adapter/apcu.zep.h b/ext/phalcon/storage/adapter/apcu.zep.h index ebd6ff466a0..9d70c7057d3 100644 --- a/ext/phalcon/storage/adapter/apcu.zep.h +++ b/ext/phalcon/storage/adapter/apcu.zep.h @@ -12,6 +12,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, getKeys); PHP_METHOD(Phalcon_Storage_Adapter_Apcu, has); PHP_METHOD(Phalcon_Storage_Adapter_Apcu, increment); PHP_METHOD(Phalcon_Storage_Adapter_Apcu, set); +PHP_METHOD(Phalcon_Storage_Adapter_Apcu, setForever); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_adapter_apcu___construct, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, factory, Phalcon\\Storage\\SerializerFactory, 0) @@ -58,6 +59,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_adapter_apcu_set ZEND_ARG_INFO(0, ttl) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_adapter_apcu_setforever, 0, 2, _IS_BOOL, 0) + ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) + ZEND_ARG_INFO(0, value) +ZEND_END_ARG_INFO() + ZEPHIR_INIT_FUNCS(phalcon_storage_adapter_apcu_method_entry) { PHP_ME(Phalcon_Storage_Adapter_Apcu, __construct, arginfo_phalcon_storage_adapter_apcu___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) PHP_ME(Phalcon_Storage_Adapter_Apcu, clear, arginfo_phalcon_storage_adapter_apcu_clear, ZEND_ACC_PUBLIC) @@ -68,5 +74,6 @@ ZEPHIR_INIT_FUNCS(phalcon_storage_adapter_apcu_method_entry) { PHP_ME(Phalcon_Storage_Adapter_Apcu, has, arginfo_phalcon_storage_adapter_apcu_has, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Storage_Adapter_Apcu, increment, arginfo_phalcon_storage_adapter_apcu_increment, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Storage_Adapter_Apcu, set, arginfo_phalcon_storage_adapter_apcu_set, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Storage_Adapter_Apcu, setForever, arginfo_phalcon_storage_adapter_apcu_setforever, ZEND_ACC_PUBLIC) PHP_FE_END }; diff --git a/ext/phalcon/storage/adapter/libmemcached.zep.c b/ext/phalcon/storage/adapter/libmemcached.zep.c index 8c16cc41bc9..7c47393d76a 100644 --- a/ext/phalcon/storage/adapter/libmemcached.zep.c +++ b/ext/phalcon/storage/adapter/libmemcached.zep.c @@ -567,9 +567,9 @@ PHP_METHOD(Phalcon_Storage_Adapter_Libmemcached, increment) /** * Stores data in the adapter * - * @param string $key - * @param mixed $value - * @param DateInterval|int|null $ttl + * @param string $key + * @param mixed $value + * @param \DateInterval|int|null $ttl * * @return bool * @throws BaseException @@ -577,9 +577,10 @@ PHP_METHOD(Phalcon_Storage_Adapter_Libmemcached, increment) */ PHP_METHOD(Phalcon_Storage_Adapter_Libmemcached, set) { + zend_bool _0; 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, _2; + zval *key_param = NULL, *value, value_sub, *ttl = NULL, ttl_sub, __$null, result, _1, _2, _3, _4; zval key; zval *this_ptr = getThis(); @@ -587,9 +588,11 @@ PHP_METHOD(Phalcon_Storage_Adapter_Libmemcached, set) ZVAL_UNDEF(&value_sub); ZVAL_UNDEF(&ttl_sub); ZVAL_NULL(&__$null); - ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&result); ZVAL_UNDEF(&_1); ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_4); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 3) @@ -610,15 +613,84 @@ PHP_METHOD(Phalcon_Storage_Adapter_Libmemcached, set) } + _0 = Z_TYPE_P(ttl) == IS_LONG; + if (_0) { + _0 = ZEPHIR_LT_LONG(ttl, 1); + } + if (_0) { + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "delete", NULL, 0, &key); + zephir_check_call_status(); + RETURN_MM(); + } + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getadapter", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "getserializeddata", NULL, 0, value); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "getttl", NULL, 0, ttl); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&result, &_1, "set", NULL, 0, &key, &_2, &_3); + zephir_check_call_status(); + ZEPHIR_INIT_VAR(&_4); + if (((Z_TYPE_P(&result) == IS_TRUE || Z_TYPE_P(&result) == IS_FALSE) == 1)) { + ZEPHIR_CPY_WRT(&_4, &result); + } else { + ZVAL_BOOL(&_4, 0); + } + RETURN_CCTOR(&_4); +} + +/** + * Stores data in the adapter forever. The key needs to manually deleted + * from the adapter. + * + * @param string $key + * @param mixed $value + * + * @return bool + */ +PHP_METHOD(Phalcon_Storage_Adapter_Libmemcached, setForever) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *key_param = NULL, *value, value_sub, result, _0, _1, _2, _3; + zval key; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&key); + ZVAL_UNDEF(&value_sub); + ZVAL_UNDEF(&result); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(2, 2) + Z_PARAM_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_CALL_METHOD(&_0, this_ptr, "getadapter", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_1, this_ptr, "getserializeddata", NULL, 0, value); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "getttl", NULL, 0, ttl); - zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(&_0, "set", NULL, 0, &key, &_1, &_2); + ZVAL_LONG(&_2, 0); + ZEPHIR_CALL_METHOD(&result, &_0, "set", NULL, 0, &key, &_1, &_2); zephir_check_call_status(); - RETURN_MM(); + ZEPHIR_INIT_VAR(&_3); + if (((Z_TYPE_P(&result) == IS_TRUE || Z_TYPE_P(&result) == IS_FALSE) == 1)) { + ZEPHIR_CPY_WRT(&_3, &result); + } else { + ZVAL_BOOL(&_3, 0); + } + RETURN_CCTOR(&_3); } /** @@ -656,7 +728,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Libmemcached, setOptions) ZEPHIR_CALL_METHOD(&_0, connection, "setoptions", NULL, 0, &client); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_storage_exception_ce, "Cannot set Memcached client options", "phalcon/Storage/Adapter/Libmemcached.zep", 239); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_storage_exception_ce, "Cannot set Memcached client options", "phalcon/Storage/Adapter/Libmemcached.zep", 266); return; } RETURN_THIS(); @@ -749,7 +821,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Libmemcached, setSerializer) ZEPHIR_INIT_NVAR(&_1$$3); ZVAL_STRING(&_1$$3, ""); zephir_update_property_zval(this_ptr, ZEND_STRL("defaultSerializer"), &_1$$3); - zephir_array_fetch(&_2$$3, &map, &serializer, PH_NOISY | PH_READONLY, "phalcon/Storage/Adapter/Libmemcached.zep", 285); + zephir_array_fetch(&_2$$3, &map, &serializer, PH_NOISY | PH_READONLY, "phalcon/Storage/Adapter/Libmemcached.zep", 312); ZVAL_LONG(&_3$$3, -1003); ZEPHIR_CALL_METHOD(NULL, connection, "setoption", NULL, 0, &_3$$3, &_2$$3); zephir_check_call_status(); @@ -794,7 +866,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Libmemcached, setServers) ZEPHIR_CALL_METHOD(&_0, connection, "addservers", NULL, 0, &servers); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_storage_exception_ce, "Cannot connect to the Memcached server(s)", "phalcon/Storage/Adapter/Libmemcached.zep", 303); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_storage_exception_ce, "Cannot connect to the Memcached server(s)", "phalcon/Storage/Adapter/Libmemcached.zep", 330); return; } RETURN_THIS(); diff --git a/ext/phalcon/storage/adapter/libmemcached.zep.h b/ext/phalcon/storage/adapter/libmemcached.zep.h index 692acf602a1..8ad71afc1d3 100644 --- a/ext/phalcon/storage/adapter/libmemcached.zep.h +++ b/ext/phalcon/storage/adapter/libmemcached.zep.h @@ -13,6 +13,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Libmemcached, getKeys); PHP_METHOD(Phalcon_Storage_Adapter_Libmemcached, has); PHP_METHOD(Phalcon_Storage_Adapter_Libmemcached, increment); PHP_METHOD(Phalcon_Storage_Adapter_Libmemcached, set); +PHP_METHOD(Phalcon_Storage_Adapter_Libmemcached, setForever); PHP_METHOD(Phalcon_Storage_Adapter_Libmemcached, setOptions); PHP_METHOD(Phalcon_Storage_Adapter_Libmemcached, setSasl); PHP_METHOD(Phalcon_Storage_Adapter_Libmemcached, setSerializer); @@ -66,6 +67,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_adapter_libmemca ZEND_ARG_INFO(0, ttl) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_adapter_libmemcached_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_OBJ_INFO_EX(arginfo_phalcon_storage_adapter_libmemcached_setoptions, 0, 2, Phalcon\\Storage\\Adapter\\Libmemcached, 0) ZEND_ARG_OBJ_INFO(0, connection, Memcached, 0) ZEND_ARG_ARRAY_INFO(0, client, 0) @@ -102,6 +108,7 @@ ZEPHIR_INIT_FUNCS(phalcon_storage_adapter_libmemcached_method_entry) { PHP_ME(Phalcon_Storage_Adapter_Libmemcached, has, arginfo_phalcon_storage_adapter_libmemcached_has, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Storage_Adapter_Libmemcached, increment, arginfo_phalcon_storage_adapter_libmemcached_increment, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Storage_Adapter_Libmemcached, set, arginfo_phalcon_storage_adapter_libmemcached_set, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Storage_Adapter_Libmemcached, setForever, arginfo_phalcon_storage_adapter_libmemcached_setforever, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Storage_Adapter_Libmemcached, setOptions, arginfo_phalcon_storage_adapter_libmemcached_setoptions, ZEND_ACC_PRIVATE) PHP_ME(Phalcon_Storage_Adapter_Libmemcached, setSasl, arginfo_phalcon_storage_adapter_libmemcached_setsasl, ZEND_ACC_PRIVATE) PHP_ME(Phalcon_Storage_Adapter_Libmemcached, setSerializer, arginfo_phalcon_storage_adapter_libmemcached_setserializer, ZEND_ACC_PRIVATE) diff --git a/ext/phalcon/storage/adapter/memory.zep.c b/ext/phalcon/storage/adapter/memory.zep.c index 5767731f5ac..f8e3f2e2d52 100644 --- a/ext/phalcon/storage/adapter/memory.zep.c +++ b/ext/phalcon/storage/adapter/memory.zep.c @@ -431,18 +431,19 @@ PHP_METHOD(Phalcon_Storage_Adapter_Memory, increment) /** * Stores data in the adapter * - * @param string $key - * @param mixed $value - * @param DateInterval|int|null $ttl + * @param string $key + * @param mixed $value + * @param \DateInterval|int|null $ttl * * @return bool * @throws BaseException */ PHP_METHOD(Phalcon_Storage_Adapter_Memory, set) { + zend_bool _0; 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, content, lifetime, prefixedKey; + zval *key_param = NULL, *value, value_sub, *ttl = NULL, ttl_sub, __$null, content, prefixedKey; zval key; zval *this_ptr = getThis(); @@ -451,7 +452,6 @@ PHP_METHOD(Phalcon_Storage_Adapter_Memory, set) ZVAL_UNDEF(&ttl_sub); ZVAL_NULL(&__$null); ZVAL_UNDEF(&content); - ZVAL_UNDEF(&lifetime); ZVAL_UNDEF(&prefixedKey); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; @@ -481,16 +481,69 @@ PHP_METHOD(Phalcon_Storage_Adapter_Memory, set) } + _0 = Z_TYPE_P(ttl) == IS_LONG; + if (_0) { + _0 = ZEPHIR_LT_LONG(ttl, 1); + } + if (_0) { + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "delete", NULL, 0, &key); + zephir_check_call_status(); + RETURN_MM(); + } ZEPHIR_CALL_METHOD(&content, this_ptr, "getserializeddata", NULL, 0, value); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&lifetime, this_ptr, "getttl", NULL, 0, ttl); - zephir_check_call_status(); ZEPHIR_CALL_METHOD(&prefixedKey, this_ptr, "getprefixedkey", NULL, 0, &key); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("data"), &prefixedKey, &content); RETURN_MM_BOOL(1); } +/** + * Stores data in the adapter forever. The key needs to manually deleted + * from the adapter. + * + * @param string $key + * @param mixed $value + * + * @return bool + */ +PHP_METHOD(Phalcon_Storage_Adapter_Memory, 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); + 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_RETURN_CALL_METHOD(this_ptr, "set", NULL, 0, &key, value); + zephir_check_call_status(); + RETURN_MM(); +} + zend_object *zephir_init_properties_Phalcon_Storage_Adapter_Memory(zend_class_entry *class_type) { zval _0, _2, _1$$3, _3$$4; diff --git a/ext/phalcon/storage/adapter/memory.zep.h b/ext/phalcon/storage/adapter/memory.zep.h index 828502db041..79b08705d8f 100644 --- a/ext/phalcon/storage/adapter/memory.zep.h +++ b/ext/phalcon/storage/adapter/memory.zep.h @@ -12,6 +12,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Memory, getKeys); PHP_METHOD(Phalcon_Storage_Adapter_Memory, has); PHP_METHOD(Phalcon_Storage_Adapter_Memory, increment); PHP_METHOD(Phalcon_Storage_Adapter_Memory, set); +PHP_METHOD(Phalcon_Storage_Adapter_Memory, setForever); zend_object *zephir_init_properties_Phalcon_Storage_Adapter_Memory(zend_class_entry *class_type); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_adapter_memory___construct, 0, 0, 1) @@ -59,6 +60,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_adapter_memory_s ZEND_ARG_INFO(0, ttl) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_adapter_memory_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_INFO_EX(arginfo_phalcon_storage_adapter_memory_zephir_init_properties_phalcon_storage_adapter_memory, 0, 0, 0) ZEND_END_ARG_INFO() @@ -72,5 +78,6 @@ ZEPHIR_INIT_FUNCS(phalcon_storage_adapter_memory_method_entry) { PHP_ME(Phalcon_Storage_Adapter_Memory, has, arginfo_phalcon_storage_adapter_memory_has, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Storage_Adapter_Memory, increment, arginfo_phalcon_storage_adapter_memory_increment, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Storage_Adapter_Memory, set, arginfo_phalcon_storage_adapter_memory_set, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Storage_Adapter_Memory, setForever, arginfo_phalcon_storage_adapter_memory_setforever, ZEND_ACC_PUBLIC) PHP_FE_END }; diff --git a/ext/phalcon/storage/adapter/redis.zep.c b/ext/phalcon/storage/adapter/redis.zep.c index 3a6f1729e7c..555e351c8c3 100644 --- a/ext/phalcon/storage/adapter/redis.zep.c +++ b/ext/phalcon/storage/adapter/redis.zep.c @@ -579,18 +579,19 @@ PHP_METHOD(Phalcon_Storage_Adapter_Redis, increment) /** * Stores data in the adapter * - * @param string $key - * @param mixed $value - * @param DateInterval|int|null $ttl + * @param string $key + * @param mixed $value + * @param \DateInterval|int|null $ttl * * @return bool * @throws BaseException */ PHP_METHOD(Phalcon_Storage_Adapter_Redis, set) { + zend_bool _0; 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, _2; + zval *key_param = NULL, *value, value_sub, *ttl = NULL, ttl_sub, __$null, result, _1, _2, _3, _4; zval key; zval *this_ptr = getThis(); @@ -598,9 +599,11 @@ PHP_METHOD(Phalcon_Storage_Adapter_Redis, set) ZVAL_UNDEF(&value_sub); ZVAL_UNDEF(&ttl_sub); ZVAL_NULL(&__$null); - ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&result); ZVAL_UNDEF(&_1); ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_4); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 3) @@ -629,15 +632,90 @@ PHP_METHOD(Phalcon_Storage_Adapter_Redis, set) } + _0 = Z_TYPE_P(ttl) == IS_LONG; + if (_0) { + _0 = ZEPHIR_LT_LONG(ttl, 1); + } + if (_0) { + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "delete", NULL, 0, &key); + zephir_check_call_status(); + RETURN_MM(); + } + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getadapter", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "getserializeddata", NULL, 0, value); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "getttl", NULL, 0, ttl); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&result, &_1, "set", NULL, 0, &key, &_2, &_3); + zephir_check_call_status(); + ZEPHIR_INIT_VAR(&_4); + if (((Z_TYPE_P(&result) == IS_TRUE || Z_TYPE_P(&result) == IS_FALSE) == 1)) { + ZEPHIR_CPY_WRT(&_4, &result); + } else { + ZVAL_BOOL(&_4, 0); + } + RETURN_CCTOR(&_4); +} + +/** + * Stores data in the adapter forever. The key needs to manually deleted + * from the adapter. + * + * @param string $key + * @param mixed $value + * + * @return bool + */ +PHP_METHOD(Phalcon_Storage_Adapter_Redis, setForever) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *key_param = NULL, *value, value_sub, result, _0, _1, _2; + zval key; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&key); + ZVAL_UNDEF(&value_sub); + ZVAL_UNDEF(&result); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(2, 2) + Z_PARAM_STR(key) + Z_PARAM_ZVAL(value) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 2, 0, &key_param, &value); + 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_CALL_METHOD(&_0, this_ptr, "getadapter", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_1, this_ptr, "getserializeddata", NULL, 0, value); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "getttl", NULL, 0, ttl); + ZEPHIR_CALL_METHOD(&result, &_0, "set", NULL, 0, &key, &_1); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(&_0, "set", NULL, 0, &key, &_1, &_2); - zephir_check_call_status(); - RETURN_MM(); + ZEPHIR_INIT_VAR(&_2); + if (((Z_TYPE_P(&result) == IS_TRUE || Z_TYPE_P(&result) == IS_FALSE) == 1)) { + ZEPHIR_CPY_WRT(&_2, &result); + } else { + ZVAL_BOOL(&_2, 0); + } + RETURN_CCTOR(&_2); } /** @@ -674,7 +752,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Redis, checkAuth) zephir_read_property(&_0, this_ptr, ZEND_STRL("options"), PH_NOISY_CC | PH_READONLY); ZEPHIR_OBS_VAR(&auth); - zephir_array_fetch_string(&auth, &_0, SL("auth"), PH_NOISY, "phalcon/Storage/Adapter/Redis.zep", 217); + zephir_array_fetch_string(&auth, &_0, SL("auth"), PH_NOISY, "phalcon/Storage/Adapter/Redis.zep", 244); /* try_start_1: */ @@ -700,7 +778,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Redis, checkAuth) } } if (error) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_storage_exception_ce, "Failed to authenticate with the Redis server", "phalcon/Storage/Adapter/Redis.zep", 228); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_storage_exception_ce, "Failed to authenticate with the Redis server", "phalcon/Storage/Adapter/Redis.zep", 255); return; } RETURN_THIS(); @@ -752,16 +830,16 @@ PHP_METHOD(Phalcon_Storage_Adapter_Redis, checkConnect) zephir_read_property(&_0, this_ptr, ZEND_STRL("options"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&options, &_0); ZEPHIR_OBS_VAR(&host); - zephir_array_fetch_string(&host, &options, SL("host"), PH_NOISY, "phalcon/Storage/Adapter/Redis.zep", 246); + zephir_array_fetch_string(&host, &options, SL("host"), PH_NOISY, "phalcon/Storage/Adapter/Redis.zep", 273); ZEPHIR_OBS_VAR(&port); - zephir_array_fetch_string(&port, &options, SL("port"), PH_NOISY, "phalcon/Storage/Adapter/Redis.zep", 247); + zephir_array_fetch_string(&port, &options, SL("port"), PH_NOISY, "phalcon/Storage/Adapter/Redis.zep", 274); ZEPHIR_OBS_VAR(&timeout); - zephir_array_fetch_string(&timeout, &options, SL("timeout"), PH_NOISY, "phalcon/Storage/Adapter/Redis.zep", 248); + zephir_array_fetch_string(&timeout, &options, SL("timeout"), PH_NOISY, "phalcon/Storage/Adapter/Redis.zep", 275); ZEPHIR_OBS_VAR(&retryInterval); - zephir_array_fetch_string(&retryInterval, &options, SL("retryInterval"), PH_NOISY, "phalcon/Storage/Adapter/Redis.zep", 249); + zephir_array_fetch_string(&retryInterval, &options, SL("retryInterval"), PH_NOISY, "phalcon/Storage/Adapter/Redis.zep", 276); ZEPHIR_OBS_VAR(&readTimeout); - zephir_array_fetch_string(&readTimeout, &options, SL("readTimeout"), PH_NOISY, "phalcon/Storage/Adapter/Redis.zep", 250); - zephir_array_fetch_string(&_1, &options, SL("persistent"), PH_NOISY | PH_READONLY, "phalcon/Storage/Adapter/Redis.zep", 252); + zephir_array_fetch_string(&readTimeout, &options, SL("readTimeout"), PH_NOISY, "phalcon/Storage/Adapter/Redis.zep", 277); + zephir_array_fetch_string(&_1, &options, SL("persistent"), PH_NOISY | PH_READONLY, "phalcon/Storage/Adapter/Redis.zep", 279); ZEPHIR_INIT_VAR(&method); ZEPHIR_INIT_VAR(¶meter); if (!ZEPHIR_IS_TRUE_IDENTICAL(&_1)) { @@ -771,11 +849,11 @@ PHP_METHOD(Phalcon_Storage_Adapter_Redis, checkConnect) ZVAL_STRING(&method, "pconnect"); zephir_read_property(&_2$$4, this_ptr, ZEND_STRL("options"), PH_NOISY_CC | PH_READONLY); ZEPHIR_OBS_VAR(&persistentId); - zephir_array_fetch_string(&persistentId, &_2$$4, SL("persistentId"), PH_NOISY, "phalcon/Storage/Adapter/Redis.zep", 257); + zephir_array_fetch_string(&persistentId, &_2$$4, SL("persistentId"), PH_NOISY, "phalcon/Storage/Adapter/Redis.zep", 284); if (!(ZEPHIR_IS_EMPTY(&persistentId))) { ZEPHIR_CPY_WRT(¶meter, &persistentId); } else { - zephir_array_fetch_string(&_3$$4, &options, SL("index"), PH_NOISY | PH_READONLY, "phalcon/Storage/Adapter/Redis.zep", 258); + zephir_array_fetch_string(&_3$$4, &options, SL("index"), PH_NOISY | PH_READONLY, "phalcon/Storage/Adapter/Redis.zep", 285); ZEPHIR_CONCAT_SV(¶meter, "persistentId", &_3$$4); } } @@ -790,7 +868,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Redis, checkConnect) zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_4$$5, "__construct", NULL, 8, &_6$$5); zephir_check_call_status(); - zephir_throw_exception_debug(&_4$$5, "phalcon/Storage/Adapter/Redis.zep", 277); + zephir_throw_exception_debug(&_4$$5, "phalcon/Storage/Adapter/Redis.zep", 304); ZEPHIR_MM_RESTORE(); return; } @@ -829,7 +907,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Redis, checkIndex) zephir_read_property(&_0, this_ptr, ZEND_STRL("options"), PH_NOISY_CC | PH_READONLY); ZEPHIR_OBS_VAR(&index); - zephir_array_fetch_string(&index, &_0, SL("index"), PH_NOISY, "phalcon/Storage/Adapter/Redis.zep", 293); + zephir_array_fetch_string(&index, &_0, SL("index"), PH_NOISY, "phalcon/Storage/Adapter/Redis.zep", 320); _1 = ZEPHIR_GT_LONG(&index, 0); if (_1) { ZEPHIR_CALL_METHOD(&_2, connection, "select", NULL, 0, &index); @@ -837,7 +915,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Redis, checkIndex) _1 = !ZEPHIR_IS_TRUE_IDENTICAL(&_2); } if (_1) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_storage_exception_ce, "Redis server selected database failed", "phalcon/Storage/Adapter/Redis.zep", 298); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_storage_exception_ce, "Redis server selected database failed", "phalcon/Storage/Adapter/Redis.zep", 325); return; } RETURN_THIS(); @@ -917,7 +995,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Redis, setSerializer) ZEPHIR_INIT_NVAR(&_8$$5); ZVAL_STRING(&_8$$5, ""); zephir_update_property_zval(this_ptr, ZEND_STRL("defaultSerializer"), &_8$$5); - zephir_array_fetch(&_9$$5, &map, &serializer, PH_NOISY | PH_READONLY, "phalcon/Storage/Adapter/Redis.zep", 336); + zephir_array_fetch(&_9$$5, &map, &serializer, PH_NOISY | PH_READONLY, "phalcon/Storage/Adapter/Redis.zep", 363); ZVAL_LONG(&_10$$5, 1); ZEPHIR_CALL_METHOD(NULL, connection, "setoption", NULL, 0, &_10$$5, &_9$$5); zephir_check_call_status(); diff --git a/ext/phalcon/storage/adapter/redis.zep.h b/ext/phalcon/storage/adapter/redis.zep.h index da97249dac4..eb1354e802a 100644 --- a/ext/phalcon/storage/adapter/redis.zep.h +++ b/ext/phalcon/storage/adapter/redis.zep.h @@ -13,6 +13,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Redis, getKeys); PHP_METHOD(Phalcon_Storage_Adapter_Redis, has); PHP_METHOD(Phalcon_Storage_Adapter_Redis, increment); PHP_METHOD(Phalcon_Storage_Adapter_Redis, set); +PHP_METHOD(Phalcon_Storage_Adapter_Redis, setForever); PHP_METHOD(Phalcon_Storage_Adapter_Redis, checkAuth); PHP_METHOD(Phalcon_Storage_Adapter_Redis, checkConnect); PHP_METHOD(Phalcon_Storage_Adapter_Redis, checkIndex); @@ -66,6 +67,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_adapter_redis_se ZEND_ARG_INFO(0, ttl) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_adapter_redis_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_OBJ_INFO_EX(arginfo_phalcon_storage_adapter_redis_checkauth, 0, 1, Phalcon\\Storage\\Adapter\\Redis, 0) ZEND_ARG_OBJ_INFO(0, connection, Redis, 0) ZEND_END_ARG_INFO() @@ -98,6 +104,7 @@ ZEPHIR_INIT_FUNCS(phalcon_storage_adapter_redis_method_entry) { PHP_ME(Phalcon_Storage_Adapter_Redis, has, arginfo_phalcon_storage_adapter_redis_has, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Storage_Adapter_Redis, increment, arginfo_phalcon_storage_adapter_redis_increment, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Storage_Adapter_Redis, set, arginfo_phalcon_storage_adapter_redis_set, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Storage_Adapter_Redis, setForever, arginfo_phalcon_storage_adapter_redis_setforever, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Storage_Adapter_Redis, checkAuth, arginfo_phalcon_storage_adapter_redis_checkauth, ZEND_ACC_PRIVATE) PHP_ME(Phalcon_Storage_Adapter_Redis, checkConnect, arginfo_phalcon_storage_adapter_redis_checkconnect, ZEND_ACC_PRIVATE) PHP_ME(Phalcon_Storage_Adapter_Redis, checkIndex, arginfo_phalcon_storage_adapter_redis_checkindex, ZEND_ACC_PRIVATE) diff --git a/ext/phalcon/storage/adapter/stream.zep.c b/ext/phalcon/storage/adapter/stream.zep.c index 08572f06fcf..4fe7e37a0a6 100644 --- a/ext/phalcon/storage/adapter/stream.zep.c +++ b/ext/phalcon/storage/adapter/stream.zep.c @@ -636,34 +636,28 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, increment) /** * Stores data in the adapter * - * @param string $key - * @param mixed $value - * @param DateInterval|int|null $ttl + * @param string $key + * @param mixed $value + * @param \DateInterval|int|null $ttl * * @return bool */ PHP_METHOD(Phalcon_Storage_Adapter_Stream, set) { + zend_bool _0; zval payload; 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, __$true, __$null, directory, _0, _1, _2, _4, _5, _6, _3$$3; + zval *key_param = NULL, *value, value_sub, *ttl = NULL, ttl_sub, __$null, _1, _2; zval key; zval *this_ptr = getThis(); ZVAL_UNDEF(&key); ZVAL_UNDEF(&value_sub); ZVAL_UNDEF(&ttl_sub); - ZVAL_BOOL(&__$true, 1); ZVAL_NULL(&__$null); - ZVAL_UNDEF(&directory); - ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1); ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_4); - ZVAL_UNDEF(&_5); - ZVAL_UNDEF(&_6); - ZVAL_UNDEF(&_3$$3); ZVAL_UNDEF(&payload); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; @@ -693,35 +687,88 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, set) } + _0 = Z_TYPE_P(ttl) == IS_LONG; + if (_0) { + _0 = ZEPHIR_LT_LONG(ttl, 1); + } + if (_0) { + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "delete", NULL, 0, &key); + zephir_check_call_status(); + RETURN_MM(); + } + ZEPHIR_INIT_VAR(&payload); + zephir_create_array(&payload, 3, 0); + ZEPHIR_INIT_VAR(&_1); + zephir_time(&_1); + zephir_array_update_string(&payload, SL("created"), &_1, PH_COPY | PH_SEPARATE); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "getttl", NULL, 0, ttl); + zephir_check_call_status(); + zephir_array_update_string(&payload, SL("ttl"), &_2, PH_COPY | PH_SEPARATE); + 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, 147, &payload, &key); + zephir_check_call_status(); + RETURN_MM(); +} + +/** + * Stores data in the adapter forever. The key needs to manually deleted + * from the adapter. + * + * @param string $key + * @param mixed $value + * + * @return bool + */ +PHP_METHOD(Phalcon_Storage_Adapter_Stream, setForever) +{ + zval payload; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *key_param = NULL, *value, value_sub, _0, _1; + zval key; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&key); + ZVAL_UNDEF(&value_sub); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&payload); +#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); + 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_INIT_VAR(&payload); zephir_create_array(&payload, 3, 0); ZEPHIR_INIT_VAR(&_0); zephir_time(&_0); zephir_array_update_string(&payload, SL("created"), &_0, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "getttl", NULL, 0, ttl); - zephir_check_call_status(); - zephir_array_update_string(&payload, SL("ttl"), &_1, PH_COPY | PH_SEPARATE); + add_assoc_stringl_ex(&payload, SL("ttl"), SL("forever")); 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_CALL_FUNCTION(&_1, "serialize", NULL, 15, &payload); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "storepayload", NULL, 147, &payload, &key); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&payload, &_1); - ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 146, &key); - zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_2, "is_dir", NULL, 147, &directory); - zephir_check_call_status(); - if (!(zephir_is_true(&_2))) { - ZVAL_LONG(&_3$$3, 0777); - ZEPHIR_CALL_FUNCTION(NULL, "mkdir", NULL, 148, &directory, &_3$$3, &__$true); - zephir_check_call_status(); - } - ZEPHIR_INIT_VAR(&_4); - ZEPHIR_CONCAT_VV(&_4, &directory, &key); - ZVAL_LONG(&_5, 2); - ZEPHIR_CALL_FUNCTION(&_6, "file_put_contents", NULL, 149, &_4, &payload, &_5); - zephir_check_call_status(); - RETURN_MM_BOOL(!ZEPHIR_IS_FALSE_IDENTICAL(&_6)); + RETURN_MM(); } /** @@ -787,7 +834,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getDir) ZEPHIR_INIT_VAR(&_5); ZVAL_STRING(&_5, ""); zephir_fast_str_replace(&_3, &_4, &_5, &key); - ZEPHIR_CALL_METHOD(&dirFromFile, this_ptr, "getdirfromfile", NULL, 150, &_3); + ZEPHIR_CALL_METHOD(&dirFromFile, this_ptr, "getdirfromfile", NULL, 148, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6); ZEPHIR_CONCAT_VV(&_6, &dirPrefix, &dirFromFile); @@ -891,10 +938,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, 151, &dir, &_1); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 149, &dir, &_1); zephir_check_call_status(); ZVAL_LONG(&_1, 2); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 152, &_0, &_1); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 150, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -955,7 +1002,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getPayload) RETURN_MM(); } ZVAL_LONG(&_1, 1); - ZEPHIR_CALL_FUNCTION(&_2, "flock", NULL, 153, &pointer, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "flock", NULL, 151, &pointer, &_1); zephir_check_call_status(); if (zephir_is_true(&_2)) { ZEPHIR_INIT_NVAR(&payload); @@ -1017,7 +1064,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, isExpired) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *payload_param = NULL, created, ttl, _0, _1, _2, _3; + zval *payload_param = NULL, created, ttl, _0, _1, _2, _3, _4; zval payload; zval *this_ptr = getThis(); @@ -1028,6 +1075,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, isExpired) 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) @@ -1053,10 +1101,75 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, isExpired) ZEPHIR_CALL_METHOD(&ttl, this_ptr, "getarrval", NULL, 0, &payload, &_1, &_2); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3); - zephir_add_function(&_3, &created, &ttl); + ZVAL_STRING(&_3, "forever"); + if (ZEPHIR_IS_IDENTICAL(&_3, &ttl)) { + RETURN_MM_BOOL(0); + } + ZEPHIR_INIT_VAR(&_4); + zephir_add_function(&_4, &created, &ttl); ZEPHIR_INIT_NVAR(&_1); zephir_time(&_1); - RETURN_MM_BOOL(ZEPHIR_LT(&_3, &_1)); + RETURN_MM_BOOL(ZEPHIR_LT(&_4, &_1)); +} + +/** + * Stores an array payload on the file system + * + * @param array $payload + * @param string $key + * + * @return bool + */ +PHP_METHOD(Phalcon_Storage_Adapter_Stream, storePayload) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval key; + zval payload, *payload_param = NULL, *key_param = NULL, __$true, directory, _0, _2, _3, _4, _1$$3; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&payload); + ZVAL_BOOL(&__$true, 1); + ZVAL_UNDEF(&directory); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_4); + ZVAL_UNDEF(&_1$$3); + ZVAL_UNDEF(&key); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(2, 2) + Z_PARAM_ARRAY(payload) + Z_PARAM_STR(key) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 2, 0, &payload_param, &key_param); + zephir_get_arrval(&payload, payload_param); + zephir_get_strval(&key, key_param); + + + 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, 146, &key); + zephir_check_call_status(); + ZEPHIR_CALL_FUNCTION(&_0, "is_dir", NULL, 152, &directory); + zephir_check_call_status(); + if (!(zephir_is_true(&_0))) { + ZVAL_LONG(&_1$$3, 0777); + ZEPHIR_CALL_FUNCTION(NULL, "mkdir", NULL, 153, &directory, &_1$$3, &__$true); + zephir_check_call_status(); + } + ZEPHIR_INIT_VAR(&_2); + ZEPHIR_CONCAT_VV(&_2, &directory, &key); + ZVAL_LONG(&_3, 2); + ZEPHIR_CALL_FUNCTION(&_4, "file_put_contents", NULL, 154, &_2, &payload, &_3); + zephir_check_call_status(); + RETURN_MM_BOOL(!ZEPHIR_IS_FALSE_IDENTICAL(&_4)); } /** diff --git a/ext/phalcon/storage/adapter/stream.zep.h b/ext/phalcon/storage/adapter/stream.zep.h index cdb8edfa46f..00ac60f97c3 100644 --- a/ext/phalcon/storage/adapter/stream.zep.h +++ b/ext/phalcon/storage/adapter/stream.zep.h @@ -12,11 +12,13 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getKeys); PHP_METHOD(Phalcon_Storage_Adapter_Stream, has); PHP_METHOD(Phalcon_Storage_Adapter_Stream, increment); PHP_METHOD(Phalcon_Storage_Adapter_Stream, set); +PHP_METHOD(Phalcon_Storage_Adapter_Stream, setForever); PHP_METHOD(Phalcon_Storage_Adapter_Stream, getDir); PHP_METHOD(Phalcon_Storage_Adapter_Stream, getFilepath); PHP_METHOD(Phalcon_Storage_Adapter_Stream, getIterator); PHP_METHOD(Phalcon_Storage_Adapter_Stream, getPayload); PHP_METHOD(Phalcon_Storage_Adapter_Stream, isExpired); +PHP_METHOD(Phalcon_Storage_Adapter_Stream, storePayload); PHP_METHOD(Phalcon_Storage_Adapter_Stream, getDirFromFile); PHP_METHOD(Phalcon_Storage_Adapter_Stream, getDirSeparator); @@ -65,6 +67,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_adapter_stream_s ZEND_ARG_INFO(0, ttl) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_adapter_stream_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_stream_getdir, 0, 0, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -85,6 +92,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_adapter_stream_i ZEND_ARG_ARRAY_INFO(0, payload, 0) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_adapter_stream_storepayload, 0, 2, _IS_BOOL, 0) + ZEND_ARG_ARRAY_INFO(0, payload, 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_stream_getdirfromfile, 0, 1, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, file, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -103,11 +115,13 @@ ZEPHIR_INIT_FUNCS(phalcon_storage_adapter_stream_method_entry) { PHP_ME(Phalcon_Storage_Adapter_Stream, has, arginfo_phalcon_storage_adapter_stream_has, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Storage_Adapter_Stream, increment, arginfo_phalcon_storage_adapter_stream_increment, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Storage_Adapter_Stream, set, arginfo_phalcon_storage_adapter_stream_set, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Storage_Adapter_Stream, setForever, arginfo_phalcon_storage_adapter_stream_setforever, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Storage_Adapter_Stream, getDir, arginfo_phalcon_storage_adapter_stream_getdir, ZEND_ACC_PRIVATE) PHP_ME(Phalcon_Storage_Adapter_Stream, getFilepath, arginfo_phalcon_storage_adapter_stream_getfilepath, ZEND_ACC_PRIVATE) PHP_ME(Phalcon_Storage_Adapter_Stream, getIterator, arginfo_phalcon_storage_adapter_stream_getiterator, ZEND_ACC_PRIVATE) PHP_ME(Phalcon_Storage_Adapter_Stream, getPayload, arginfo_phalcon_storage_adapter_stream_getpayload, ZEND_ACC_PRIVATE) PHP_ME(Phalcon_Storage_Adapter_Stream, isExpired, arginfo_phalcon_storage_adapter_stream_isexpired, ZEND_ACC_PRIVATE) + PHP_ME(Phalcon_Storage_Adapter_Stream, storePayload, arginfo_phalcon_storage_adapter_stream_storepayload, ZEND_ACC_PRIVATE) PHP_ME(Phalcon_Storage_Adapter_Stream, getDirFromFile, arginfo_phalcon_storage_adapter_stream_getdirfromfile, ZEND_ACC_PRIVATE) PHP_ME(Phalcon_Storage_Adapter_Stream, getDirSeparator, arginfo_phalcon_storage_adapter_stream_getdirseparator, ZEND_ACC_PRIVATE) PHP_FE_END diff --git a/ext/phalcon/storage/serializer/base64.zep.c b/ext/phalcon/storage/serializer/base64.zep.c index 6f5097181ea..b2dd2d3193d 100644 --- a/ext/phalcon/storage/serializer/base64.zep.c +++ b/ext/phalcon/storage/serializer/base64.zep.c @@ -64,7 +64,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, 226, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 227, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -101,7 +101,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Base64, unserialize) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Data for the unserializer must of type string", "phalcon/Storage/Serializer/Base64.zep", 50); return; } - ZEPHIR_CALL_FUNCTION(&_0, "base64_decode", NULL, 224, data); + ZEPHIR_CALL_FUNCTION(&_0, "base64_decode", NULL, 225, data); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &_0); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/storage/serializer/json.zep.c b/ext/phalcon/storage/serializer/json.zep.c index b72d78ffa73..e975c42c1e5 100644 --- a/ext/phalcon/storage/serializer/json.zep.c +++ b/ext/phalcon/storage/serializer/json.zep.c @@ -198,12 +198,12 @@ 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, 292); + ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 299); 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, 293); + ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 300); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6$$3); ZEPHIR_CONCAT_SV(&_6$$3, "json_decode error: ", &_5$$3); @@ -263,12 +263,12 @@ 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, 292); + ZEPHIR_CALL_FUNCTION(&_2, "json_last_error", NULL, 299); 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, 293); + ZEPHIR_CALL_FUNCTION(&_4$$3, "json_last_error_msg", NULL, 300); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5$$3); ZEPHIR_CONCAT_SV(&_5$$3, "json_encode error: ", &_4$$3); diff --git a/ext/phalcon/support/collection/readonlycollection.zep.c b/ext/phalcon/support/collection/readonlycollection.zep.c new file mode 100644 index 00000000000..004d1f73d9f --- /dev/null +++ b/ext/phalcon/support/collection/readonlycollection.zep.c @@ -0,0 +1,95 @@ + +#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/exception.h" +#include "kernel/operators.h" +#include "kernel/memory.h" +#include "kernel/object.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. +*/ +/** + * A read only Collection object + */ +ZEPHIR_INIT_CLASS(Phalcon_Support_Collection_ReadOnlyCollection) +{ + ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Support\\Collection, ReadOnlyCollection, phalcon, support_collection_readonlycollection, phalcon_support_collection_ce, phalcon_support_collection_readonlycollection_method_entry, 0); + + return SUCCESS; +} + +/** + * Delete the element from the collection + */ +PHP_METHOD(Phalcon_Support_Collection_ReadOnlyCollection, remove) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *element_param = NULL; + zval element; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&element); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_STR(element) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &element_param); + zephir_get_strval(&element, element_param); + + + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_support_collection_exception_ce, "The object is read only", "phalcon/Support/Collection/ReadOnlyCollection.zep", 25); + return; +} + +/** + * Set an element in the collection + */ +PHP_METHOD(Phalcon_Support_Collection_ReadOnlyCollection, set) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *element_param = NULL, *value, value_sub; + zval element; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&element); + ZVAL_UNDEF(&value_sub); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(2, 2) + Z_PARAM_STR(element) + Z_PARAM_ZVAL(value) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 2, 0, &element_param, &value); + zephir_get_strval(&element, element_param); + + + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_support_collection_exception_ce, "The object is read only", "phalcon/Support/Collection/ReadOnlyCollection.zep", 33); + return; +} diff --git a/ext/phalcon/support/collection/readonlycollection.zep.h b/ext/phalcon/support/collection/readonlycollection.zep.h new file mode 100644 index 00000000000..84bfb314105 --- /dev/null +++ b/ext/phalcon/support/collection/readonlycollection.zep.h @@ -0,0 +1,24 @@ + +extern zend_class_entry *phalcon_support_collection_readonlycollection_ce; + +ZEPHIR_INIT_CLASS(Phalcon_Support_Collection_ReadOnlyCollection); + +PHP_METHOD(Phalcon_Support_Collection_ReadOnlyCollection, remove); +PHP_METHOD(Phalcon_Support_Collection_ReadOnlyCollection, set); + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_readonlycollection_remove, 0, 1, IS_VOID, 0) + + ZEND_ARG_TYPE_INFO(0, element, IS_STRING, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_readonlycollection_set, 0, 2, IS_VOID, 0) + + ZEND_ARG_TYPE_INFO(0, element, IS_STRING, 0) + ZEND_ARG_INFO(0, value) +ZEND_END_ARG_INFO() + +ZEPHIR_INIT_FUNCS(phalcon_support_collection_readonlycollection_method_entry) { + PHP_ME(Phalcon_Support_Collection_ReadOnlyCollection, remove, arginfo_phalcon_support_collection_readonlycollection_remove, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Support_Collection_ReadOnlyCollection, set, arginfo_phalcon_support_collection_readonlycollection_set, ZEND_ACC_PUBLIC) + PHP_FE_END +}; diff --git a/ext/phalcon/support/debug.zep.c b/ext/phalcon/support/debug.zep.c index 7de3431ef93..9c7f46c9914 100644 --- a/ext/phalcon/support/debug.zep.c +++ b/ext/phalcon/support/debug.zep.c @@ -1539,7 +1539,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, 167, &className); + ZEPHIR_CALL_METHOD(NULL, &classReflection, "__construct", NULL, 168, &className); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_8$$5, &classReflection, "isinternal", NULL, 0); zephir_check_call_status(); @@ -1572,7 +1572,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, 162, &functionName); + ZEPHIR_CALL_METHOD(NULL, &functionReflection, "__construct", NULL, 163, &functionName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_14$$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 58cab81901d..5c0db58aeee 100644 --- a/ext/phalcon/support/debug/dump.zep.c +++ b/ext/phalcon/support/debug/dump.zep.c @@ -891,7 +891,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, 475, variable); + ZEPHIR_CALL_FUNCTION(&_46$$12, "get_object_vars", NULL, 482, variable); zephir_check_call_status(); zephir_is_iterable(&_46$$12, 0, "phalcon/Support/Debug/Dump.zep", 263); if (Z_TYPE_P(&_46$$12) == IS_ARRAY) { @@ -982,10 +982,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, 167, variable); + ZEPHIR_CALL_METHOD(NULL, &reflect$$15, "__construct", NULL, 168, variable); zephir_check_call_status(); ZVAL_LONG(&_67$$15, ((1 | 2) | 4)); - ZEPHIR_CALL_METHOD(&props$$15, &reflect$$15, "getproperties", NULL, 171, &_67$$15); + ZEPHIR_CALL_METHOD(&props$$15, &reflect$$15, "getproperties", NULL, 172, &_67$$15); zephir_check_call_status(); zephir_is_iterable(&props$$15, 0, "phalcon/Support/Debug/Dump.zep", 289); if (Z_TYPE_P(&props$$15) == IS_ARRAY) { @@ -1263,7 +1263,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, 208, variable); zephir_check_call_status(); if (zephir_is_true(&_147)) { ZEPHIR_INIT_VAR(&_148$$27); diff --git a/ext/phalcon/support/helper/arr/blacklist.zep.c b/ext/phalcon/support/helper/arr/blacklist.zep.c index 6bdc03126cf..3189d1ae387 100644 --- a/ext/phalcon/support/helper/arr/blacklist.zep.c +++ b/ext/phalcon/support/helper/arr/blacklist.zep.c @@ -76,9 +76,9 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_Blacklist, __invoke) zephir_create_closure_ex(&_0, NULL, phalcon_16__closure_ce, SL("__invoke")); ZEPHIR_CALL_METHOD(&blackListed, this_ptr, "tofilter", NULL, 0, &blackList, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "array_flip", NULL, 185, &blackListed); + ZEPHIR_CALL_FUNCTION(&_1, "array_flip", NULL, 186, &blackListed); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("array_diff_key", NULL, 279, &collection, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("array_diff_key", NULL, 286, &collection, &_1); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/support/helper/arr/chunk.zep.c b/ext/phalcon/support/helper/arr/chunk.zep.c index af10e36214e..43e8b78761a 100644 --- a/ext/phalcon/support/helper/arr/chunk.zep.c +++ b/ext/phalcon/support/helper/arr/chunk.zep.c @@ -79,7 +79,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_Chunk, __invoke) ZVAL_LONG(&_0, size); ZVAL_BOOL(&_1, (preserveKeys ? 1 : 0)); - ZEPHIR_RETURN_CALL_FUNCTION("array_chunk", NULL, 280, &collection, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("array_chunk", NULL, 287, &collection, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/support/helper/arr/first.zep.c b/ext/phalcon/support/helper/arr/first.zep.c index d10665fe17d..ae8094b4106 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, 282, &filtered); + ZEPHIR_RETURN_CALL_FUNCTION("reset", NULL, 289, &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 fb99285dc93..5549e7ad99b 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, 285, method, element); + ZEPHIR_CALL_FUNCTION(&key, "call_user_func", NULL, 292, 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 3a7a7b11fae..d465c1e59d2 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, 286, &collection); + ZEPHIR_CALL_FUNCTION(&_0, "array_unique", NULL, 293, &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 4c8a8202e6d..97c7923b8d4 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, 287, &filtered); + ZEPHIR_RETURN_CALL_FUNCTION("end", NULL, 294, &filtered); ZEPHIR_UNREF(&filtered); zephir_check_call_status(); RETURN_MM(); diff --git a/ext/phalcon/support/helper/arr/order.zep.c b/ext/phalcon/support/helper/arr/order.zep.c index 19ffad34280..26c06a5ff17 100644 --- a/ext/phalcon/support/helper/arr/order.zep.c +++ b/ext/phalcon/support/helper/arr/order.zep.c @@ -136,13 +136,13 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_Order, __invoke) if (1 == order) { ZVAL_LONG(&_6$$5, flags); ZEPHIR_MAKE_REF(&sorted); - ZEPHIR_CALL_FUNCTION(NULL, "ksort", NULL, 288, &sorted, &_6$$5); + ZEPHIR_CALL_FUNCTION(NULL, "ksort", NULL, 295, &sorted, &_6$$5); ZEPHIR_UNREF(&sorted); zephir_check_call_status(); } else { ZVAL_LONG(&_7$$6, flags); ZEPHIR_MAKE_REF(&sorted); - ZEPHIR_CALL_FUNCTION(NULL, "krsort", NULL, 289, &sorted, &_7$$6); + ZEPHIR_CALL_FUNCTION(NULL, "krsort", NULL, 296, &sorted, &_7$$6); ZEPHIR_UNREF(&sorted); zephir_check_call_status(); } diff --git a/ext/phalcon/support/helper/arr/sliceleft.zep.c b/ext/phalcon/support/helper/arr/sliceleft.zep.c index cb951e8445e..ba444a56f81 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, 290, &collection, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 297, &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 5ba85d46d10..9699e5165dc 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, 290, &collection, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 297, &collection, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/support/helper/arr/whitelist.zep.c b/ext/phalcon/support/helper/arr/whitelist.zep.c index 51f71f95377..59ca96a0633 100644 --- a/ext/phalcon/support/helper/arr/whitelist.zep.c +++ b/ext/phalcon/support/helper/arr/whitelist.zep.c @@ -76,7 +76,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_Whitelist, __invoke) zephir_create_closure_ex(&_0, NULL, phalcon_17__closure_ce, SL("__invoke")); ZEPHIR_CALL_METHOD(&filtered, this_ptr, "tofilter", NULL, 0, &whiteList, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "array_flip", NULL, 185, &filtered); + ZEPHIR_CALL_FUNCTION(&_1, "array_flip", NULL, 186, &filtered); zephir_check_call_status(); ZEPHIR_RETURN_CALL_FUNCTION("array_intersect_key", NULL, 2, &collection, &_1); zephir_check_call_status(); diff --git a/ext/phalcon/support/helper/file/basename.zep.c b/ext/phalcon/support/helper/file/basename.zep.c index acc0d5a0987..bfe934be80c 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, 291, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "preg_quote", NULL, 298, &_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, 291, &suffix, &_6$$3); + ZEPHIR_CALL_FUNCTION(&_7$$3, "preg_quote", NULL, 298, &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 88ddc818f8c..bc9738f4307 100644 --- a/ext/phalcon/support/helper/json/decode.zep.c +++ b/ext/phalcon/support/helper/json/decode.zep.c @@ -107,12 +107,12 @@ 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, 292); + ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 299); 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, 293); + ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 300); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6$$3); ZEPHIR_CONCAT_SV(&_6$$3, "json_decode error: ", &_5$$3); diff --git a/ext/phalcon/support/helper/json/encode.zep.c b/ext/phalcon/support/helper/json/encode.zep.c index 5f1f995785f..48faccf7031 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, 292); + ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 299); 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, 293); + ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 300); 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 be086605c5c..e617093cec2 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, 282, &arguments); + ZEPHIR_CALL_FUNCTION(&delimiter, "reset", NULL, 289, &arguments); ZEPHIR_UNREF(&arguments); zephir_check_call_status(); ZVAL_LONG(&_0, 1); - ZEPHIR_CALL_FUNCTION(&_1, "array_slice", NULL, 290, &arguments, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "array_slice", NULL, 297, &arguments, &_0); zephir_check_call_status(); ZEPHIR_CPY_WRT(&arguments, &_1); ZEPHIR_MAKE_REF(&arguments); - ZEPHIR_CALL_FUNCTION(&first, "reset", NULL, 282, &arguments); + ZEPHIR_CALL_FUNCTION(&first, "reset", NULL, 289, &arguments); ZEPHIR_UNREF(&arguments); zephir_check_call_status(); ZEPHIR_MAKE_REF(&arguments); - ZEPHIR_CALL_FUNCTION(&last, "end", NULL, 287, &arguments); + ZEPHIR_CALL_FUNCTION(&last, "end", NULL, 294, &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 583a0f224dd..9762425b56c 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, 222, &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, 222, &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 2e910568828..594cba7ce0c 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, 222, &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, 222, &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 947bc1bea4d..4704f61c18a 100644 --- a/ext/phalcon/support/helper/str/dynamic.zep.c +++ b/ext/phalcon/support/helper/str/dynamic.zep.c @@ -127,24 +127,24 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Dynamic, __invoke) } - ZEPHIR_CALL_FUNCTION(&_0, "substr_count", NULL, 300, &text, &leftDelimiter); + ZEPHIR_CALL_FUNCTION(&_0, "substr_count", NULL, 307, &text, &leftDelimiter); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "substr_count", NULL, 300, &text, &rightDelimiter); + ZEPHIR_CALL_FUNCTION(&_1, "substr_count", NULL, 307, &text, &rightDelimiter); zephir_check_call_status(); if (UNEXPECTED(!ZEPHIR_IS_IDENTICAL(&_0, &_1))) { ZEPHIR_INIT_VAR(&_2$$3); object_init_ex(&_2$$3, spl_ce_RuntimeException); ZEPHIR_INIT_VAR(&_3$$3); ZEPHIR_CONCAT_SVS(&_3$$3, "Syntax error in string '", &text, "'"); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 301, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 308, &_3$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_2$$3, "phalcon/Support/Helper/Str/Dynamic.zep", 43); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_FUNCTION(&ldS, "preg_quote", NULL, 291, &leftDelimiter); + ZEPHIR_CALL_FUNCTION(&ldS, "preg_quote", NULL, 298, &leftDelimiter); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&rdS, "preg_quote", NULL, 291, &rightDelimiter); + ZEPHIR_CALL_FUNCTION(&rdS, "preg_quote", NULL, 298, &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, 195, &words); + ZEPHIR_CALL_FUNCTION(&_10$$6, "array_rand", &_11, 196, &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, 291, &_12$$6, &separator); + ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 298, &_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, 195, &words); + ZEPHIR_CALL_FUNCTION(&_19$$8, "array_rand", &_11, 196, &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, 291, &_20$$8, &separator); + ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 298, &_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/firstbetween.zep.c b/ext/phalcon/support/helper/str/firstbetween.zep.c index f0accc32bad..3f4fcc1964e 100644 --- a/ext/phalcon/support/helper/str/firstbetween.zep.c +++ b/ext/phalcon/support/helper/str/firstbetween.zep.c @@ -79,7 +79,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_FirstBetween, __invoke) zephir_get_strval(&end, end_param); - ZEPHIR_CALL_FUNCTION(&result, "mb_strstr", NULL, 302, &text, &start); + ZEPHIR_CALL_FUNCTION(&result, "mb_strstr", NULL, 309, &text, &start); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0); if (ZEPHIR_IS_FALSE_IDENTICAL(&result)) { @@ -89,7 +89,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_FirstBetween, __invoke) ZEPHIR_CPY_WRT(&_0, &result); } ZEPHIR_CPY_WRT(&result, &_0); - ZEPHIR_CALL_FUNCTION(&_1, "mb_strstr", NULL, 302, &result, &end, &__$true); + ZEPHIR_CALL_FUNCTION(&_1, "mb_strstr", NULL, 309, &result, &end, &__$true); zephir_check_call_status(); ZEPHIR_CPY_WRT(&result, &_1); ZEPHIR_INIT_NVAR(&_0); diff --git a/ext/phalcon/support/helper/str/includes.zep.c b/ext/phalcon/support/helper/str/includes.zep.c index 0c7ad2cbad8..f2dbf4a912a 100644 --- a/ext/phalcon/support/helper/str/includes.zep.c +++ b/ext/phalcon/support/helper/str/includes.zep.c @@ -68,7 +68,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Includes, __invoke) zephir_get_strval(&needle, needle_param); - ZEPHIR_CALL_FUNCTION(&_0, "mb_strpos", NULL, 304, &haystack, &needle); + ZEPHIR_CALL_FUNCTION(&_0, "mb_strpos", NULL, 311, &haystack, &needle); zephir_check_call_status(); RETURN_MM_BOOL(!ZEPHIR_IS_FALSE_IDENTICAL(&_0)); } diff --git a/ext/phalcon/support/helper/str/isanagram.zep.c b/ext/phalcon/support/helper/str/isanagram.zep.c index 8fd445c939b..cf27d728773 100644 --- a/ext/phalcon/support/helper/str/isanagram.zep.c +++ b/ext/phalcon/support/helper/str/isanagram.zep.c @@ -72,10 +72,10 @@ PHP_METHOD(Phalcon_Support_Helper_Str_IsAnagram, __invoke) ZVAL_LONG(&_0, 1); - ZEPHIR_CALL_FUNCTION(&_1, "count_chars", NULL, 305, &first, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "count_chars", NULL, 312, &first, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, 1); - ZEPHIR_CALL_FUNCTION(&_2, "count_chars", NULL, 305, &second, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "count_chars", NULL, 312, &second, &_0); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_IDENTICAL(&_1, &_2)); } diff --git a/ext/phalcon/support/helper/str/ispalindrome.zep.c b/ext/phalcon/support/helper/str/ispalindrome.zep.c index 22658c8e369..451913a548b 100644 --- a/ext/phalcon/support/helper/str/ispalindrome.zep.c +++ b/ext/phalcon/support/helper/str/ispalindrome.zep.c @@ -64,7 +64,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_IsPalindrome, __invoke) zephir_get_strval(&text, text_param); - ZEPHIR_CALL_FUNCTION(&_0, "strrev", NULL, 306, &text); + ZEPHIR_CALL_FUNCTION(&_0, "strrev", NULL, 313, &text); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_IDENTICAL(&_0, &text)); } diff --git a/ext/phalcon/support/helper/str/len.zep.c b/ext/phalcon/support/helper/str/len.zep.c index 332d1016964..8c23f6e769f 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, 231, &text, &encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strlen", NULL, 232, &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 0dbe2b3729b..f68e7c1af76 100644 --- a/ext/phalcon/support/helper/str/random.zep.c +++ b/ext/phalcon/support/helper/str/random.zep.c @@ -133,37 +133,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, 307, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&_5, "range", NULL, 314, &_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, 307, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&_6, "range", NULL, 314, &_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, 307, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_9, "range", NULL, 314, &_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, 307, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&_10, "range", NULL, 314, &_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, 307, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 314, &_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, 307, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 314, &_7, &_8); zephir_check_call_status(); zephir_array_update_long(&pools, 4, &_11, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); ZEPHIR_INIT_NVAR(&_2); @@ -173,21 +173,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, 307, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 314, &_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, 307, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_12, "range", NULL, 314, &_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, 307, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_13, "range", NULL, 314, &_2, &_3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_14, "array_merge", NULL, 308, &_11, &_12, &_13); + ZEPHIR_CALL_FUNCTION(&_14, "array_merge", NULL, 315, &_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/tag.zep.c b/ext/phalcon/tag.zep.c index 389e55fb636..589e896600f 100644 --- a/ext/phalcon/tag.zep.c +++ b/ext/phalcon/tag.zep.c @@ -3125,7 +3125,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 2c1a7e65e7b..f2ff52d9bae 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, 309, &optionValue); + ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_4, 316, &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, 309, &optionValue); + ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_4, 316, &optionValue); zephir_check_call_status(); if (Z_TYPE_P(&optionText) == IS_ARRAY) { ZEPHIR_INIT_NVAR(&_16$$12); diff --git a/ext/phalcon/text.zep.c b/ext/phalcon/text.zep.c index e6b555fc8c2..f8b8673203a 100644 --- a/ext/phalcon/text.zep.c +++ b/ext/phalcon/text.zep.c @@ -303,7 +303,7 @@ PHP_METHOD(Phalcon_Text, endsWith) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_helper_str_ce, "endswith", &_0, 298, &text, &end, &_1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_helper_str_ce, "endswith", &_0, 305, &text, &end, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -508,7 +508,7 @@ PHP_METHOD(Phalcon_Text, startsWith) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_helper_str_ce, "startswith", &_0, 297, &text, &start, &_1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_helper_str_ce, "startswith", &_0, 304, &text, &start, &_1); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/translate/interpolator/indexedarray.zep.c b/ext/phalcon/translate/interpolator/indexedarray.zep.c index 8b4b8223022..4b235fcb020 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, 257, &placeholders, &translation); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 264, &placeholders, &translation); ZEPHIR_UNREF(&placeholders); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0$$3); diff --git a/ext/phalcon/validation.zep.c b/ext/phalcon/validation.zep.c index 78dfcd8decf..e4bd104993f 100644 --- a/ext/phalcon/validation.zep.c +++ b/ext/phalcon/validation.zep.c @@ -596,7 +596,7 @@ PHP_METHOD(Phalcon_Validation, getValue) if (Z_TYPE_P(&entity) == IS_OBJECT) { ZEPHIR_INIT_NVAR(&method); ZEPHIR_CONCAT_SV(&method, "set", &camelizedField); - ZEPHIR_CALL_FUNCTION(&_10$$21, "property_exists", NULL, 467, &entity, &field); + ZEPHIR_CALL_FUNCTION(&_10$$21, "property_exists", NULL, 474, &entity, &field); zephir_check_call_status(); if ((zephir_method_exists(&entity, &method) == SUCCESS)) { ZEPHIR_CALL_METHOD_ZVAL(NULL, &entity, &method, NULL, 0, &value); @@ -705,7 +705,7 @@ PHP_METHOD(Phalcon_Validation, rules) ZEPHIR_CALL_METHOD(&validator, &validators, "current", NULL, 0); zephir_check_call_status(); if (zephir_instance_of_ev(&validator, phalcon_validation_validatorinterface_ce)) { - ZEPHIR_CALL_METHOD(NULL, this_ptr, "add", &_2, 275, field, &validator); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "add", &_2, 282, field, &validator); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, &validators, "next", NULL, 0); diff --git a/ext/phalcon/validation/validator/callback.zep.c b/ext/phalcon/validation/validator/callback.zep.c index 0065d41b2a5..ed068aafb82 100644 --- a/ext/phalcon/validation/validator/callback.zep.c +++ b/ext/phalcon/validation/validator/callback.zep.c @@ -166,7 +166,7 @@ PHP_METHOD(Phalcon_Validation_Validator_Callback, validate) ZEPHIR_CALL_METHOD(&data, validation, "getdata", NULL, 0); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&returnedValue, "call_user_func", NULL, 285, &callback, &data); + ZEPHIR_CALL_FUNCTION(&returnedValue, "call_user_func", NULL, 292, &callback, &data); zephir_check_call_status(); _1$$3 = Z_TYPE_P(&returnedValue) == IS_OBJECT; if (_1$$3) { diff --git a/ext/phalcon/validation/validator/confirmation.zep.c b/ext/phalcon/validation/validator/confirmation.zep.c index f8943dcc53f..e70500c54e3 100644 --- a/ext/phalcon/validation/validator/confirmation.zep.c +++ b/ext/phalcon/validation/validator/confirmation.zep.c @@ -253,7 +253,7 @@ PHP_METHOD(Phalcon_Validation_Validator_Confirmation, compare) zephir_check_call_status(); zephir_get_strval(&b, &_5$$3); } - ZEPHIR_CALL_FUNCTION(&_6, "strcmp", NULL, 427, &a, &b); + ZEPHIR_CALL_FUNCTION(&_6, "strcmp", NULL, 434, &a, &b); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_LONG_IDENTICAL(&_6, 0)); } diff --git a/ext/phalcon/validation/validator/email.zep.c b/ext/phalcon/validation/validator/email.zep.c index daaff88020f..7599e9f0714 100644 --- a/ext/phalcon/validation/validator/email.zep.c +++ b/ext/phalcon/validation/validator/email.zep.c @@ -145,7 +145,7 @@ PHP_METHOD(Phalcon_Validation_Validator_Email, validate) ZEPHIR_CALL_METHOD(&value, validation, "getvalue", NULL, 0, field); zephir_check_call_status(); ZVAL_LONG(&_0, 274); - ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 269, &value, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 276, &value, &_0); zephir_check_call_status(); if (!(zephir_is_true(&_1))) { ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "messagefactory", NULL, 0, validation, field); diff --git a/ext/phalcon/validation/validator/file/mimetype.zep.c b/ext/phalcon/validation/validator/file/mimetype.zep.c index 9c5b739fbaf..439a0fde2cd 100644 --- a/ext/phalcon/validation/validator/file/mimetype.zep.c +++ b/ext/phalcon/validation/validator/file/mimetype.zep.c @@ -147,12 +147,12 @@ PHP_METHOD(Phalcon_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, 393, &_2$$6); + ZEPHIR_CALL_FUNCTION(&tmp, "finfo_open", NULL, 400, &_2$$6); zephir_check_call_status(); zephir_array_fetch_string(&_3$$6, &value, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Validation/Validator/File/MimeType.zep", 101); - ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 394, &tmp, &_3$$6); + ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 401, &tmp, &_3$$6); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 395, &tmp); + ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 402, &tmp); zephir_check_call_status(); } else { ZEPHIR_OBS_NVAR(&mime); diff --git a/ext/phalcon/validation/validator/file/resolution/equal.zep.c b/ext/phalcon/validation/validator/file/resolution/equal.zep.c index 8eaed25bbfe..5eb8ad1cf8b 100644 --- a/ext/phalcon/validation/validator/file/resolution/equal.zep.c +++ b/ext/phalcon/validation/validator/file/resolution/equal.zep.c @@ -169,7 +169,7 @@ PHP_METHOD(Phalcon_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/Validation/Validator/File/Resolution/Equal.zep", 88); - ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 401, &_1); + ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 408, &_1); zephir_check_call_status(); ZEPHIR_OBS_VAR(&width); zephir_array_fetch_long(&width, &tmp, 0, PH_NOISY, "phalcon/Validation/Validator/File/Resolution/Equal.zep", 89); diff --git a/ext/phalcon/validation/validator/file/resolution/max.zep.c b/ext/phalcon/validation/validator/file/resolution/max.zep.c index 840dc5da62c..c275c30ceb1 100644 --- a/ext/phalcon/validation/validator/file/resolution/max.zep.c +++ b/ext/phalcon/validation/validator/file/resolution/max.zep.c @@ -180,7 +180,7 @@ PHP_METHOD(Phalcon_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/Validation/Validator/File/Resolution/Max.zep", 94); - ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 401, &_1); + ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 408, &_1); zephir_check_call_status(); ZEPHIR_OBS_VAR(&width); zephir_array_fetch_long(&width, &tmp, 0, PH_NOISY, "phalcon/Validation/Validator/File/Resolution/Max.zep", 95); diff --git a/ext/phalcon/validation/validator/file/resolution/min.zep.c b/ext/phalcon/validation/validator/file/resolution/min.zep.c index 4399723d47d..a890f32dcca 100644 --- a/ext/phalcon/validation/validator/file/resolution/min.zep.c +++ b/ext/phalcon/validation/validator/file/resolution/min.zep.c @@ -180,7 +180,7 @@ PHP_METHOD(Phalcon_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/Validation/Validator/File/Resolution/Min.zep", 94); - ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 401, &_1); + ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 408, &_1); zephir_check_call_status(); ZEPHIR_OBS_VAR(&width); zephir_array_fetch_long(&width, &tmp, 0, PH_NOISY, "phalcon/Validation/Validator/File/Resolution/Min.zep", 95); diff --git a/ext/phalcon/validation/validator/ip.zep.c b/ext/phalcon/validation/validator/ip.zep.c index 4ca1291069e..4d96875f206 100644 --- a/ext/phalcon/validation/validator/ip.zep.c +++ b/ext/phalcon/validation/validator/ip.zep.c @@ -260,7 +260,7 @@ PHP_METHOD(Phalcon_Validation_Validator_Ip, validate) zephir_bitwise_or_function(&_11, &_10, &allowReserved); zephir_array_update_string(&options, SL("flags"), &_11, PH_COPY | PH_SEPARATE); ZVAL_LONG(&_1, 275); - ZEPHIR_CALL_FUNCTION(&_12, "filter_var", NULL, 269, &value, &_1, &options); + ZEPHIR_CALL_FUNCTION(&_12, "filter_var", NULL, 276, &value, &_1, &options); zephir_check_call_status(); if (!(zephir_is_true(&_12))) { ZEPHIR_CALL_METHOD(&_13$$8, this_ptr, "messagefactory", NULL, 0, validation, field); diff --git a/ext/phalcon/validation/validator/stringlength/max.zep.c b/ext/phalcon/validation/validator/stringlength/max.zep.c index c77c0f413a9..1f45c95c790 100644 --- a/ext/phalcon/validation/validator/stringlength/max.zep.c +++ b/ext/phalcon/validation/validator/stringlength/max.zep.c @@ -168,7 +168,7 @@ PHP_METHOD(Phalcon_Validation_Validator_StringLength_Max, validate) ZEPHIR_CALL_METHOD(&value, validation, "getvalue", NULL, 0, field); zephir_check_call_status(); if ((zephir_function_exists_ex(ZEND_STRL("mb_strlen")) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 231, &value); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 232, &value); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&length); diff --git a/ext/phalcon/validation/validator/stringlength/min.zep.c b/ext/phalcon/validation/validator/stringlength/min.zep.c index 2ac376cdcba..d2a29895ff1 100644 --- a/ext/phalcon/validation/validator/stringlength/min.zep.c +++ b/ext/phalcon/validation/validator/stringlength/min.zep.c @@ -168,7 +168,7 @@ PHP_METHOD(Phalcon_Validation_Validator_StringLength_Min, validate) ZEPHIR_CALL_METHOD(&value, validation, "getvalue", NULL, 0, field); zephir_check_call_status(); if ((zephir_function_exists_ex(ZEND_STRL("mb_strlen")) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 231, &value); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 232, &value); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&length); diff --git a/ext/phalcon/validation/validator/uniqueness.zep.c b/ext/phalcon/validation/validator/uniqueness.zep.c index a3ebf4248e3..e889e9e5c52 100644 --- a/ext/phalcon/validation/validator/uniqueness.zep.c +++ b/ext/phalcon/validation/validator/uniqueness.zep.c @@ -648,7 +648,7 @@ PHP_METHOD(Phalcon_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, 307, &_11$$6, &_12$$6); + ZEPHIR_CALL_FUNCTION(&_13$$6, "range", &_14, 314, &_11$$6, &_12$$6); zephir_check_call_status(); _9$$6 = !ZEPHIR_IS_IDENTICAL(&_10$$6, &_13$$6); } @@ -1052,7 +1052,7 @@ PHP_METHOD(Phalcon_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, 307, &_89$$37, &_90$$37); + ZEPHIR_CALL_FUNCTION(&_91$$37, "range", &_14, 314, &_89$$37, &_90$$37); zephir_check_call_status(); _87$$37 = !ZEPHIR_IS_IDENTICAL(&_88$$37, &_91$$37); } diff --git a/ext/phalcon/validation/validator/url.zep.c b/ext/phalcon/validation/validator/url.zep.c index 4bf5a5702ec..c1a63eb09d6 100644 --- a/ext/phalcon/validation/validator/url.zep.c +++ b/ext/phalcon/validation/validator/url.zep.c @@ -153,11 +153,11 @@ PHP_METHOD(Phalcon_Validation_Validator_Url, validate) zephir_read_property(&_0, this_ptr, ZEND_STRL("options"), PH_NOISY_CC | PH_READONLY); if (zephir_array_isset_string_fetch(&options, &_0, SL("options"), 0)) { ZVAL_LONG(&_1$$3, 273); - ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 269, &value, &_1$$3, &options); + ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 276, &value, &_1$$3, &options); zephir_check_call_status(); } else { ZVAL_LONG(&_2$$4, 273); - ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 269, &value, &_2$$4); + ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 276, &value, &_2$$4); zephir_check_call_status(); } if (!(zephir_is_true(&result))) { From 3dc5536722ab2b0fb972cb51abc038d2a0f228f5 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Sat, 6 Nov 2021 13:40:51 -0400 Subject: [PATCH 3/3] 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 8018bbb1d40..e72e5bcae68 100644 --- a/CHANGELOG-5.0.md +++ b/CHANGELOG-5.0.md @@ -74,6 +74,7 @@ - Removed uncamelize of `realClassName` in `Phalcon\Mvc\Router\Route::getRoutePaths()` if definition is string to make processing same as if array definition [#15067](https://github.com/phalcon/cphalcon/issues/15067) - Changed `Phalcon\Validation::getValue()` behavior to get value from `data` if not found in `entity`. [#14203](https://github.com/phalcon/cphalcon/issues/14203) - Changed `Phalcon\Forms\Form::isValid()` signature: added `whitelist` argument. [#14203](https://github.com/phalcon/cphalcon/issues/14203) +- Changed `Phalcon\Support\Collection\ReadOnly` to `Phalcon\Support\Collection\ReadOnlyCollection` to avoid conflicts with the read-only feature in PHP 8.1 [#15767](https://github.com/phalcon/cphalcon/issues/15767) ## Added - Added more tests in the suite for additional code coverage [#15691](https://github.com/phalcon/cphalcon/issues/15691)