I don't think this argument should be optional

gtkforphp · Jun 2, 2019 · 19aec89 · 19aec89 · geoglis · Jun 3, 2019
1 parent bf34489
commit 19aec89
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/context.c b/src/context.c
@@ -193,7 +193,7 @@ PHP_METHOD(CairoContext, __construct)
 	cairo_context_object *context_object;
 	cairo_surface_object *surface_object;
 
-        if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "|o", &surface_zval) == FAILURE) {
+        if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "o", &surface_zval) == FAILURE) {
 		return;
 	}
 

diff --git a/tests/CairoContext/__construct.phpt b/tests/CairoContext/__construct.phpt
@@ -6,7 +6,7 @@ if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new Cairo\Surface\Image(CAIRO_FORMAT_ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
 $context = new Cairo\Context($surface);
@@ -43,4 +43,4 @@ object(Cairo\Context)#%d (0) {
 }
 Cairo\Context::__construct() expects exactly 1 parameter, 0 given
 Cairo\Context::__construct() expects exactly 1 parameter, 2 given
-Cairo\Context::__construct() expects parameter 1 to be Cairo\Surface, integer given
+Argument 1 passed to Cairo\Context::__construct() must be an instance of Cairo\Surface, int given