From 0dae952b3f3c4c497137bb023bdc1008cb2ce804 Mon Sep 17 00:00:00 2001 From: Joe Watkins Date: Wed, 26 Oct 2016 08:02:36 +0100 Subject: [PATCH 01/10] bump version in develop --- php_ui.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php_ui.h b/php_ui.h index 84f000b..dd9e52e 100644 --- a/php_ui.h +++ b/php_ui.h @@ -24,7 +24,7 @@ extern zend_module_entry ui_module_entry; #define phpext_ui_ptr &ui_module_entry -#define PHP_UI_VERSION "1.0.1" +#define PHP_UI_VERSION "1.0.2dev" #ifdef PHP_WIN32 # define PHP_UI_API __declspec(dllexport) From 067f324fc625cd9d9a34ead8fc8766dbe1b19a8b Mon Sep 17 00:00:00 2001 From: Joe Watkins Date: Wed, 26 Oct 2016 08:45:51 +0100 Subject: [PATCH 02/10] this is the correct way to do this --- examples/starfield.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/starfield.php b/examples/starfield.php index cb76a07..bf5ae19 100644 --- a/examples/starfield.php +++ b/examples/starfield.php @@ -80,7 +80,7 @@ protected function onDraw(UI\Draw\Pen $pen, UI\Size $size, UI\Point $clip, UI\Si if (PHP_OS == "WINNT") { $path->addRectangle(new Point($px, $py), new Size($starSize, $starSize)); } else { - $path->arcTo(new Point($px, $py), $starSize/2, 0, M_PI*2, 0); + $path->newFigureWithArc(new Point($px, $py), $starSize/2, 0, M_PI*2, 0); } $path->end(); From 88db6d35a68245547ac0195c4d75212d5616be08 Mon Sep 17 00:00:00 2001 From: Joe Watkins Date: Thu, 27 Oct 2016 09:19:42 +0100 Subject: [PATCH 03/10] UI\Size and UI\Point work: * UI\Size and UI\Point support basic math operators (+,/,*,-) (fixed) * UI\Point cast to UI\Size with UI\Size::of(UI\Point) (can also take double-ish) * UI\Size cast to UI\Point with UI\Point::at(UI\Size) (can also take double-ish) --- classes/common.h | 123 +++++++++++++++++++++++++++++++++++++++++ classes/point.c | 92 +++++++++++++----------------- classes/size.c | 92 +++++++++++++----------------- examples/starfield.php | 20 +++---- package.xml | 1 + 5 files changed, 206 insertions(+), 122 deletions(-) create mode 100644 classes/common.h diff --git a/classes/common.h b/classes/common.h new file mode 100644 index 0000000..14438d6 --- /dev/null +++ b/classes/common.h @@ -0,0 +1,123 @@ +/* + +----------------------------------------------------------------------+ + | PHP Version 7 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997-2016 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.01 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available through the world-wide-web at the following url: | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Author: krakjoe | + +----------------------------------------------------------------------+ +*/ +#ifndef HAVE_PHP_UI_COMMON_H +#define HAVE_PHP_UI_COMMON_H + +#include +#include + +static inline void php_ui_point_size_add(php_ui_point_t *result, php_ui_point_t *point, double x, double y) { + result->x = point->x + x; + result->y = point->y + y; +} + +static inline void php_ui_point_size_assign_add(php_ui_point_t*result, double x, double y) { + result->x += x; + result->y += y; +} + +static inline void php_ui_point_size_mul(php_ui_point_t *result, php_ui_point_t *point, double x, double y) { + result->x = point->x * x; + result->y = point->y * y; +} + +static inline void php_ui_point_size_assign_mul(php_ui_point_t*result, double x, double y) { + result->x *= x; + result->y *= y; +} + +static inline void php_ui_point_size_div(php_ui_point_t *result, php_ui_point_t *point, double x, double y) { + result->x = point->x / x; + result->y = point->y / y; +} + +static inline void php_ui_point_size_assign_div(php_ui_point_t*result, double x, double y) { + result->x /= x; + result->y /= y; +} + +static inline void php_ui_point_size_sub(php_ui_point_t *result, php_ui_point_t *point, double x, double y) { + result->x = point->x - x; + result->y = point->y - y; +} + +static inline void php_ui_point_size_assign_sub(php_ui_point_t*result, double x, double y) { + result->x -= x; + result->y -= y; +} + +/* {{{ */ +static inline int php_ui_point_size_operation(zend_uchar opcode, zval *retval, zval *op1, zval *op2, zend_class_entry *target) { + zval *l, *r; + double x = 0, y = 0; + php_ui_point_t *point, *result; + zend_bool assign = 0; + + if (retval == op1) { + assign = 1; + } else { + object_init_ex(retval, target); + } + + if (Z_TYPE_P(op1) == IS_OBJECT && Z_TYPE_P(op2) == IS_OBJECT) { + if ((instanceof_function(Z_OBJCE_P(op1), uiSize_ce) || instanceof_function(Z_OBJCE_P(op1), uiPoint_ce)) && + (instanceof_function(Z_OBJCE_P(op2), uiSize_ce) || instanceof_function(Z_OBJCE_P(op2), uiPoint_ce))) { + l = op1; + r = op2; + goto operate; + } + } + + if ((Z_TYPE_P(op1) == IS_OBJECT) && + (instanceof_function(Z_OBJCE_P(op1), uiPoint_ce) || instanceof_function(Z_OBJCE_P(op1), uiSize_ce))) { + l = op1; + r = op2; + } else if ((Z_TYPE_P(op2) == IS_OBJECT) && + (instanceof_function(Z_OBJCE_P(op2), uiPoint_ce) || instanceof_function(Z_OBJCE_P(op2), uiSize_ce))) { + l = op2; + r = op1; + } else { + return FAILURE; + } + +operate: + point = php_ui_point_fetch(l); + + if (Z_TYPE_P(r) != IS_OBJECT) { + x = zval_get_double(r); + y = zval_get_double(r); + } else { + php_ui_point_t *value = php_ui_point_fetch(r); + + x = value->x; + y = value->y; + } + + result = php_ui_point_fetch(retval); + + switch (opcode) { + case ZEND_ADD: assign ? php_ui_point_size_assign_add(result, x, y) : php_ui_point_size_add(result, point, x, y); break; + case ZEND_MUL: assign ? php_ui_point_size_assign_mul(result, x, y) : php_ui_point_size_mul(result, point, x, y); break; + case ZEND_DIV: assign ? php_ui_point_size_assign_div(result, x, y) : php_ui_point_size_div(result, point, x, y); break; + case ZEND_SUB: assign ? php_ui_point_size_assign_sub(result, x, y) : php_ui_point_size_sub(result, point, x, y); break; + } + + return SUCCESS; +} /* }}} */ + +#endif diff --git a/classes/point.c b/classes/point.c index ba3656d..79e9419 100644 --- a/classes/point.c +++ b/classes/point.c @@ -21,7 +21,7 @@ #include "php.h" -#include +#include zend_object_handlers php_ui_point_handlers; @@ -130,6 +130,40 @@ PHP_METHOD(Point, setY) point->y = y; } /* }}} */ +/* {{{ proto Point Point::at(double value) + Point Point::at(UI\Size size) */ +PHP_METHOD(Point, at) +{ + php_ui_point_t *point; + zval *location = NULL; + + if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "z", &location) != SUCCESS) { + return; + } + + if (Z_TYPE_P(location) == IS_OBJECT && instanceof_function(Z_OBJCE_P(location), uiPoint_ce)) { + RETURN_ZVAL(location, 1, 0); + } + + if (Z_TYPE_P(location) == IS_OBJECT && instanceof_function(Z_OBJCE_P(location), uiSize_ce)) { + php_ui_size_t *size = php_ui_size_fetch(location); + + object_init_ex(return_value, uiPoint_ce); + + point = php_ui_point_fetch(return_value); + + point->x = size->width; + point->y = size->height; + return; + } + + object_init_ex(return_value, uiPoint_ce); + + point = php_ui_point_fetch(return_value); + point->x = zval_get_double(location); + point->y = zval_get_double(location); +} /* }}} */ + /* {{{ */ const zend_function_entry php_ui_point_methods[] = { PHP_ME(Point, __construct, php_ui_point_construct_info, ZEND_ACC_PUBLIC) @@ -137,65 +171,13 @@ const zend_function_entry php_ui_point_methods[] = { PHP_ME(Point, getY, php_ui_point_get_point_info, ZEND_ACC_PUBLIC) PHP_ME(Point, setX, php_ui_point_set_point_info, ZEND_ACC_PUBLIC) PHP_ME(Point, setY, php_ui_point_set_point_info, ZEND_ACC_PUBLIC) + PHP_ME(Point, at, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) PHP_FE_END }; /* }}} */ /* {{{ */ static int php_ui_point_operate(zend_uchar opcode, zval *result, zval *op1, zval *op2) { - php_ui_point_t *point = php_ui_point_fetch(op1); - -#define php_ui_point_do_operation(operator) do { \ - if (Z_TYPE_P(op2) == IS_OBJECT && instanceof_function(Z_OBJCE_P(op2), uiPoint_ce)) { \ - php_ui_point_t *operand = php_ui_point_fetch(op2); \ - php_ui_point_t *retval; \ - \ - if (result != op1) { \ - object_init_ex(result, uiPoint_ce); \ - } \ - \ - retval = php_ui_point_fetch(result); \ - retval->x = point->x operator operand->x; \ - retval->y = point->x operator operand->y; \ - \ - return SUCCESS; \ - } \ - \ - if (Z_TYPE_P(op2) == IS_LONG || Z_TYPE_P(op2) == IS_DOUBLE) { \ - php_ui_point_t *retval; \ - \ - if (result != op1) { \ - object_init_ex(result, uiPoint_ce); \ - } \ - \ - retval = php_ui_point_fetch(result); \ - retval->x = point->x operator zval_get_double(op2); \ - retval->y = point->y operator zval_get_double(op2); \ - \ - return SUCCESS; \ - } \ -} while(0) - - switch (opcode) { - case ZEND_MUL: - php_ui_point_do_operation(*); - break; - - case ZEND_DIV: - php_ui_point_do_operation(/); - break; - - case ZEND_SUB: - php_ui_point_do_operation(-); - break; - - case ZEND_ADD: - php_ui_point_do_operation(+); - break; - } - -#undef php_ui_point_do_operation - - return FAILURE; + return php_ui_point_size_operation(opcode, result, op1, op2, uiPoint_ce); } /* }}} */ /* {{{ */ diff --git a/classes/size.c b/classes/size.c index 19b80ba..37e5e30 100644 --- a/classes/size.c +++ b/classes/size.c @@ -21,7 +21,7 @@ #include "php.h" -#include +#include zend_object_handlers php_ui_size_handlers; @@ -130,6 +130,40 @@ PHP_METHOD(Size, setHeight) size->height = height; } /* }}} */ +/* {{{ proto Size Size::of(double value) + Size Size::of(UI\Point point) */ +PHP_METHOD(Size, of) +{ + php_ui_size_t *size; + zval *location = NULL; + + if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "z", &location) != SUCCESS) { + return; + } + + if (Z_TYPE_P(location) == IS_OBJECT && instanceof_function(Z_OBJCE_P(location), uiSize_ce)) { + RETURN_ZVAL(location, 1, 0); + } + + if (Z_TYPE_P(location) == IS_OBJECT && instanceof_function(Z_OBJCE_P(location), uiPoint_ce)) { + php_ui_point_t *point = php_ui_point_fetch(location); + + object_init_ex(return_value, uiSize_ce); + + size = php_ui_size_fetch(return_value); + + size->width = point->x; + size->height = point->y; + return; + } + + object_init_ex(return_value, uiSize_ce); + + size = php_ui_size_fetch(return_value); + size->width = zval_get_double(location); + size->height = zval_get_double(location); +} /* }}} */ + /* {{{ */ const zend_function_entry php_ui_size_methods[] = { PHP_ME(Size, __construct, php_ui_size_construct_info, ZEND_ACC_PUBLIC) @@ -137,65 +171,13 @@ const zend_function_entry php_ui_size_methods[] = { PHP_ME(Size, getHeight, php_ui_size_get_size_info, ZEND_ACC_PUBLIC) PHP_ME(Size, setWidth, php_ui_size_set_size_info, ZEND_ACC_PUBLIC) PHP_ME(Size, setHeight, php_ui_size_set_size_info, ZEND_ACC_PUBLIC) + PHP_ME(Size, of, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) PHP_FE_END }; /* }}} */ /* {{{ */ static int php_ui_size_operate(zend_uchar opcode, zval *result, zval *op1, zval *op2) { - php_ui_size_t *size = php_ui_size_fetch(op1); - -#define php_ui_size_do_operation(operator) do { \ - if (Z_TYPE_P(op2) == IS_OBJECT && instanceof_function(Z_OBJCE_P(op2), uiSize_ce)) { \ - php_ui_size_t *operand = php_ui_size_fetch(op2); \ - php_ui_size_t *retval; \ - \ - if (result != op1) { \ - object_init_ex(result, uiSize_ce); \ - } \ - \ - retval = php_ui_size_fetch(result); \ - retval->width = size->width operator operand->width; \ - retval->height = size->height operator operand->height; \ - \ - return SUCCESS; \ - } \ - \ - if (Z_TYPE_P(op2) == IS_LONG || Z_TYPE_P(op2) == IS_DOUBLE) { \ - php_ui_size_t *retval; \ - \ - if (result != op1) { \ - object_init_ex(result, uiSize_ce); \ - } \ - \ - retval = php_ui_size_fetch(result); \ - retval->width = size->width operator zval_get_double(op2); \ - retval->height = size->height operator zval_get_double(op2); \ - \ - return SUCCESS; \ - } \ -} while(0) - - switch (opcode) { - case ZEND_MUL: - php_ui_size_do_operation(*); - break; - - case ZEND_DIV: - php_ui_size_do_operation(/); - break; - - case ZEND_SUB: - php_ui_size_do_operation(-); - break; - - case ZEND_ADD: - php_ui_size_do_operation(+); - break; - } - -#undef php_ui_size_do_operation - - return FAILURE; + return php_ui_point_size_operation(opcode, result, op1, op2, uiSize_ce); } /* }}} */ /* {{{ */ diff --git a/examples/starfield.php b/examples/starfield.php index bf5ae19..4583077 100644 --- a/examples/starfield.php +++ b/examples/starfield.php @@ -51,12 +51,10 @@ protected function onKey(string $key, int $ext, int $flags) { } protected function onDraw(UI\Draw\Pen $pen, UI\Size $size, UI\Point $clip, UI\Size $clipSize) { - $hWidth = $size->width / 2; - $hHeight = $size->height /2; - + $hSize = $size / 2; + $path = new Path(Path::Winding); - $path->addRectangle( - new Point(0, 0), $size); + $path->addRectangle(Point::at(0), $size); $path->end(); $pen->fill($path, new Brush(Brush::Solid, new Color(0, 1))); @@ -69,18 +67,16 @@ protected function onDraw(UI\Draw\Pen $pen, UI\Size $size, UI\Point $clip, UI\Si $star[1] = $this->depth; } - $k = 128 / $star[1]; - $px = $star[0]->x * $k + $hWidth; - $py = $star[0]->y * $k + $hHeight; - - if ($px >= 0 && $px <= $size->width && $py >= 0 && $py <= $size->height) { + $pos = $star[0] * (128 / $star[1]) + $hSize; + + if ($pos->x >= 0 && $pos->x <= $size->width && $pos->y >= 0 && $pos->y <= $size->height) { $starSize = (1 - $star[1] / 32) * 5; $path = new Path(Path::Winding); if (PHP_OS == "WINNT") { - $path->addRectangle(new Point($px, $py), new Size($starSize, $starSize)); + $path->addRectangle($pos, new Size($starSize, $starSize)); } else { - $path->newFigureWithArc(new Point($px, $py), $starSize/2, 0, M_PI*2, 0); + $path->newFigureWithArc($pos, $starSize/2, 0, M_PI*2, 0); } $path->end(); diff --git a/package.xml b/package.xml index 7a335e7..4665113 100644 --- a/package.xml +++ b/package.xml @@ -30,6 +30,7 @@ + From 69c4dbfa82f94f475b4fc864f9aac1add65fed2c Mon Sep 17 00:00:00 2001 From: Joe Watkins Date: Thu, 27 Oct 2016 09:43:32 +0100 Subject: [PATCH 04/10] update package --- package.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/package.xml b/package.xml index 4665113..2ba4491 100644 --- a/package.xml +++ b/package.xml @@ -13,8 +13,8 @@ 2016-10-26 - 1.0.1 - 1.0.1 + 1.0.2 + 1.0.2 beta @@ -22,7 +22,9 @@ PHP License - Fix windows onTick + UI\Size and UI\Point support for basic math operators (+,/,*,-) fixed + UI\Point cast to UI\Size with UI\Size::of(UI\Point) (can also take double-ish) + UI\Size cast to UI\Point with UI\Point::at(UI\Size) (can also take double-ish) From b56a1cbdd3bc8ec3ad5527c72e08b87a85e0bbc0 Mon Sep 17 00:00:00 2001 From: Joe Watkins Date: Thu, 27 Oct 2016 17:56:52 +0100 Subject: [PATCH 05/10] try travis --- .travis.yml | 21 ++++++++++++ tests/001.phpt | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+) create mode 100644 .travis.yml create mode 100644 tests/001.phpt diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..6759c68 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,21 @@ +language: php +php: + - 7.0 + - nightly + +script: + - mkdir deps + - mkdir deps/lib + - mkdir deps/include + - git clone https://github.com/andlabs/libui + - cd libui + - mkdir build + - cd build + - cmake .. + - make -j4 + - cp out/libui.so ../../deps/lib + - cp ../ui*.h ../../deps/include + - phpize + - ./configure --with-ui=deps + - make + - REPORT_EXIT_STATUS=1 TEST_PHP_ARGS="-q --show-diff" make test diff --git a/tests/001.phpt b/tests/001.phpt new file mode 100644 index 0000000..3872645 --- /dev/null +++ b/tests/001.phpt @@ -0,0 +1,91 @@ +--TEST-- +Test size/point +--ENV-- +XDG_RUNTIME_DIR=/tmp +DISPLAY=:0 +NO_AT_BRIDGE=1 +--DESCRIPTION-- +This test verifies size/point functionality +--FILE-- + +--EXPECT-- +object(UI\Size)#3 (2) { + ["width"]=> + float(650) + ["height"]=> + float(490) +} +object(UI\Size)#1 (2) { + ["width"]=> + float(640) + ["height"]=> + float(480) +} +object(UI\Point)#2 (2) { + ["x"]=> + float(10) + ["y"]=> + float(10) +} +object(UI\Point)#3 (2) { + ["x"]=> + float(650) + ["y"]=> + float(490) +} +object(UI\Size)#1 (2) { + ["width"]=> + float(640) + ["height"]=> + float(480) +} +object(UI\Point)#2 (2) { + ["x"]=> + float(10) + ["y"]=> + float(10) +} +object(UI\Size)#3 (2) { + ["width"]=> + float(650) + ["height"]=> + float(490) +} +object(UI\Point)#3 (2) { + ["x"]=> + float(20) + ["y"]=> + float(20) +} +object(UI\Size)#1 (2) { + ["width"]=> + float(650) + ["height"]=> + float(490) +} +object(UI\Size)#1 (2) { + ["width"]=> + float(650) + ["height"]=> + float(490) +} + From a22d07fe65b9d90149d00bde038c6dacb1edad93 Mon Sep 17 00:00:00 2001 From: Joe Watkins Date: Thu, 27 Oct 2016 18:01:39 +0100 Subject: [PATCH 06/10] travis... --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6759c68..7e20605 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,14 @@ php: - 7.0 - nightly +addons: + apt: + sources: + - george-edison55-precise-backports # cmake 3.2.3 / doxygen 1.8.3 + packages: + - cmake + - cmake-data + script: - mkdir deps - mkdir deps/lib From 2b3d3a8f80491a2d5e08e9362e2ee18249991ab7 Mon Sep 17 00:00:00 2001 From: Joe Watkins Date: Thu, 27 Oct 2016 18:04:25 +0100 Subject: [PATCH 07/10] ... --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7e20605..0a4ffc7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ addons: packages: - cmake - cmake-data + - gtk-3.0 script: - mkdir deps From 06fe7edebee361fae10b30ecda0182784d230d9f Mon Sep 17 00:00:00 2001 From: Joe Watkins Date: Thu, 27 Oct 2016 18:06:13 +0100 Subject: [PATCH 08/10] try this way, one last time --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0a4ffc7..a83d4b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,9 @@ addons: packages: - cmake - cmake-data - - gtk-3.0 + +before_script: + - sudo apt-get -y install gtk-3.0 script: - mkdir deps From 5276bd2cc94b58dc918b8c6b7cce5cb223ad8ec8 Mon Sep 17 00:00:00 2001 From: Joe Watkins Date: Thu, 27 Oct 2016 18:07:42 +0100 Subject: [PATCH 09/10] give up on travis --- .travis.yml | 32 ------------------ tests/001.phpt | 91 -------------------------------------------------- 2 files changed, 123 deletions(-) delete mode 100644 .travis.yml delete mode 100644 tests/001.phpt diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a83d4b0..0000000 --- a/.travis.yml +++ /dev/null @@ -1,32 +0,0 @@ -language: php -php: - - 7.0 - - nightly - -addons: - apt: - sources: - - george-edison55-precise-backports # cmake 3.2.3 / doxygen 1.8.3 - packages: - - cmake - - cmake-data - -before_script: - - sudo apt-get -y install gtk-3.0 - -script: - - mkdir deps - - mkdir deps/lib - - mkdir deps/include - - git clone https://github.com/andlabs/libui - - cd libui - - mkdir build - - cd build - - cmake .. - - make -j4 - - cp out/libui.so ../../deps/lib - - cp ../ui*.h ../../deps/include - - phpize - - ./configure --with-ui=deps - - make - - REPORT_EXIT_STATUS=1 TEST_PHP_ARGS="-q --show-diff" make test diff --git a/tests/001.phpt b/tests/001.phpt deleted file mode 100644 index 3872645..0000000 --- a/tests/001.phpt +++ /dev/null @@ -1,91 +0,0 @@ ---TEST-- -Test size/point ---ENV-- -XDG_RUNTIME_DIR=/tmp -DISPLAY=:0 -NO_AT_BRIDGE=1 ---DESCRIPTION-- -This test verifies size/point functionality ---FILE-- - ---EXPECT-- -object(UI\Size)#3 (2) { - ["width"]=> - float(650) - ["height"]=> - float(490) -} -object(UI\Size)#1 (2) { - ["width"]=> - float(640) - ["height"]=> - float(480) -} -object(UI\Point)#2 (2) { - ["x"]=> - float(10) - ["y"]=> - float(10) -} -object(UI\Point)#3 (2) { - ["x"]=> - float(650) - ["y"]=> - float(490) -} -object(UI\Size)#1 (2) { - ["width"]=> - float(640) - ["height"]=> - float(480) -} -object(UI\Point)#2 (2) { - ["x"]=> - float(10) - ["y"]=> - float(10) -} -object(UI\Size)#3 (2) { - ["width"]=> - float(650) - ["height"]=> - float(490) -} -object(UI\Point)#3 (2) { - ["x"]=> - float(20) - ["y"]=> - float(20) -} -object(UI\Size)#1 (2) { - ["width"]=> - float(650) - ["height"]=> - float(490) -} -object(UI\Size)#1 (2) { - ["width"]=> - float(650) - ["height"]=> - float(490) -} - From 504cbe7730ed127b391fa93247e50d3363c287fb Mon Sep 17 00:00:00 2001 From: Joe Watkins Date: Fri, 28 Oct 2016 10:40:29 +0100 Subject: [PATCH 10/10] bump version for release --- package.xml | 4 ++-- php_ui.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.xml b/package.xml index 2ba4491..c5c71d2 100644 --- a/package.xml +++ b/package.xml @@ -10,8 +10,8 @@ krakjoe@php.net yes - 2016-10-26 - + 2016-10-28 + 1.0.2 1.0.2 diff --git a/php_ui.h b/php_ui.h index dd9e52e..3697b31 100644 --- a/php_ui.h +++ b/php_ui.h @@ -24,7 +24,7 @@ extern zend_module_entry ui_module_entry; #define phpext_ui_ptr &ui_module_entry -#define PHP_UI_VERSION "1.0.2dev" +#define PHP_UI_VERSION "1.0.2" #ifdef PHP_WIN32 # define PHP_UI_API __declspec(dllexport)