New Examples added, functionreturnvalue, functionnoparameters and functionwithparameters

18 files changed, 349 insertions, 2 deletions

diff --git a/Examples/Extension/30-phpcpp.ini b/Examples/Extension/30-phpcpp.ini
new file mode 100644
index 0000000..d45c33c
--- /dev/null
+++ b/Examples/Extension/30-phpcpp.ini
@@ -0,0 +1,4 @@
+; configuration for php PDO module
+; priority=30
+extension=extension.so
+
diff --git a/Examples/Extension/Makefile b/Examples/Extension/Makefile
index 3815a68..e6b0b9a 100644
--- a/Examples/Extension/Makefile
+++ b/Examples/Extension/Makefile
@@ -2,10 +2,17 @@ CPP             = g++
 RM              = rm -f
 CPP_FLAGS       = -Wall -c -I. -O2 -std=c++11
 
+PREFIX			= /usr
+#Edit these lines to correspond with your own directories
+LIBRARY_DIR		= ${PREFIX}/lib/php5/20121212
+PHP_CONFIG_DIR	= /etc/php5/cli/conf.d
+
 LD              = g++
 LD_FLAGS        = -Wall -shared -O2 
 RESULT          = extension.so
 
+PHPINIFILE		= 30-phpcpp.ini
+
 SOURCES			= $(wildcard *.cpp)
 OBJECTS         = $(SOURCES:%.cpp=%.o)
 
@@ -19,3 +26,7 @@ clean:
 
 ${OBJECTS}: 
 		${CPP} ${CPP_FLAGS} -fpic -o $@ ${@:%.o=%.cpp}
+
+install:
+		cp -f ${RESULT} ${LIBRARY_DIR}
+		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}
diff --git a/Examples/FunctionNoParameters/30-phpcpp.ini b/Examples/FunctionNoParameters/30-phpcpp.ini
new file mode 100644
index 0000000..81d2b5a
--- /dev/null
+++ b/Examples/FunctionNoParameters/30-phpcpp.ini
@@ -0,0 +1,4 @@
+; configuration for php PDO module
+; priority=30
+extension=functionnoparameters.so
+
diff --git a/Examples/FunctionNoParameters/Makefile b/Examples/FunctionNoParameters/Makefile
new file mode 100644
index 0000000..6e3ecea
--- /dev/null
+++ b/Examples/FunctionNoParameters/Makefile
@@ -0,0 +1,32 @@
+CPP             = g++
+RM              = rm -f
+CPP_FLAGS       = -Wall -c -I. -O2 -std=c++11
+
+PREFIX			= /usr
+#Edit these lines to correspond with your own directories
+LIBRARY_DIR		= ${PREFIX}/lib/php5/20121212
+PHP_CONFIG_DIR	= /etc/php5/cli/conf.d
+
+LD              = g++
+LD_FLAGS        = -Wall -shared -O2 
+RESULT          = functionnoparameters.so
+
+PHPINIFILE		= 30-phpcpp.ini
+
+SOURCES			= $(wildcard *.cpp)
+OBJECTS         = $(SOURCES:%.cpp=%.o)
+
+all:	${OBJECTS} ${RESULT}
+
+${RESULT}: ${OBJECTS}
+		${LD} ${LD_FLAGS} -o $@ ${OBJECTS} -lphpcpp
+
+clean:
+		${RM} *.obj *~* ${OBJECTS} ${RESULT}
+
+${OBJECTS}: 
+		${CPP} ${CPP_FLAGS} -fpic -o $@ ${@:%.o=%.cpp}
+
+install:
+		cp -f ${RESULT} ${LIBRARY_DIR}
+		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}
diff --git a/Examples/FunctionNoParameters/functionnoparameters.cpp b/Examples/FunctionNoParameters/functionnoparameters.cpp
new file mode 100644
index 0000000..2908ca5
--- /dev/null
+++ b/Examples/FunctionNoParameters/functionnoparameters.cpp
@@ -0,0 +1,43 @@
+/**
+ *	functionnoparameters.cpp
+ * 	@Author Jasper van Eck
+ * 
+ * 	An example file to show the working of a function call without parameters.
+ */
+
+/**
+ * 	Libraries used.
+ */
+#include <phpcpp.h>
+
+/**
+ *  Namespace to use
+ */
+using namespace std;
+
+/**
+ * 	my_no_parameters_function()
+ * 	@return Php::Value
+ */
+Php::Value my_no_parameters_function()
+{
+	return "42";
+}
+
+
+// Symbols are exported according to the "C" language
+extern "C" 
+{
+	// export the "get_module" function that will be called by the Zend engine
+	PHPCPP_EXPORT void *get_module()
+	{
+		// create extension
+        static Php::Extension extension("my_function_return_value","1.0");
+        
+        // add function to extension
+        extension.add("my_no_parameters_function", my_no_parameters_function);
+		
+		// return the extension module
+		return extension.module();
+	}
+}
diff --git a/Examples/FunctionNoParameters/functionnoparameters.php b/Examples/FunctionNoParameters/functionnoparameters.php
new file mode 100644
index 0000000..0d07b67
--- /dev/null
+++ b/Examples/FunctionNoParameters/functionnoparameters.php
@@ -0,0 +1,13 @@
+<?php
+/*
+ *	functionnoparameters.php
+ * 	@Author Jasper van Eck
+ * 
+ * 	An example file to show the working of a function call without parameters.
+ */
+
+/*
+ *	Run a function without parameters. 
+ */
+echo "A function which takes no parameters; my_no_parameters_function()\n";
+echo my_no_parameters_function() . "\n";
diff --git a/Examples/FunctionReturnValue/30-phpcpp.ini b/Examples/FunctionReturnValue/30-phpcpp.ini
new file mode 100644
index 0000000..9740a86
--- /dev/null
+++ b/Examples/FunctionReturnValue/30-phpcpp.ini
@@ -0,0 +1,4 @@
+; configuration for php PDO module
+; priority=30
+extension=functionreturnvalue.so
+
diff --git a/Examples/FunctionReturnValue/Makefile b/Examples/FunctionReturnValue/Makefile
new file mode 100644
index 0000000..2d9f401
--- /dev/null
+++ b/Examples/FunctionReturnValue/Makefile
@@ -0,0 +1,32 @@
+CPP             = g++
+RM              = rm -f
+CPP_FLAGS       = -Wall -c -I. -O2 -std=c++11
+
+PREFIX			= /usr
+#Edit these lines to correspond with your own directories
+LIBRARY_DIR		= ${PREFIX}/lib/php5/20121212
+PHP_CONFIG_DIR	= /etc/php5/cli/conf.d
+
+LD              = g++
+LD_FLAGS        = -Wall -shared -O2 
+RESULT          = functionreturnvalue.so
+
+PHPINIFILE		= 30-phpcpp.ini
+
+SOURCES			= $(wildcard *.cpp)
+OBJECTS         = $(SOURCES:%.cpp=%.o)
+
+all:	${OBJECTS} ${RESULT}
+
+${RESULT}: ${OBJECTS}
+		${LD} ${LD_FLAGS} -o $@ ${OBJECTS} -lphpcpp
+
+clean:
+		${RM} *.obj *~* ${OBJECTS} ${RESULT}
+
+${OBJECTS}: 
+		${CPP} ${CPP_FLAGS} -fpic -o $@ ${@:%.o=%.cpp}
+
+install:
+		cp -f ${RESULT} ${LIBRARY_DIR}
+		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}
diff --git a/Examples/FunctionReturnValue/functionreturnvalue.cpp b/Examples/FunctionReturnValue/functionreturnvalue.cpp
new file mode 100644
index 0000000..d26f86a
--- /dev/null
+++ b/Examples/FunctionReturnValue/functionreturnvalue.cpp
@@ -0,0 +1,43 @@
+/**
+ *	functionreturnvalue.cpp
+ * 	@Author Jasper van Eck
+ * 
+ * 	An example file to show the working of a function call with a return value.
+ */
+
+/**
+ * 	Libraries used.
+ */
+#include <phpcpp.h>
+
+/**
+ *  Namespace to use
+ */
+using namespace std;
+
+/**
+ * 	my_return_value_function()
+ * 	@return Php::Value
+ */
+Php::Value my_return_value_function()
+{
+	return "42";
+}
+
+
+// Symbols are exported according to the "C" language
+extern "C" 
+{
+	// export the "get_module" function that will be called by the Zend engine
+	PHPCPP_EXPORT void *get_module()
+	{
+		// create extension
+        static Php::Extension extension("my_function_return_value","1.0");
+        
+        // add function to extension
+        extension.add("my_return_value_function", my_return_value_function);
+		
+		// return the extension module
+		return extension.module();
+	}
+}
diff --git a/Examples/FunctionReturnValue/functionreturnvalue.php b/Examples/FunctionReturnValue/functionreturnvalue.php
new file mode 100644
index 0000000..722a4fe
--- /dev/null
+++ b/Examples/FunctionReturnValue/functionreturnvalue.php
@@ -0,0 +1,13 @@
+<?php
+/*
+ *	functionreturnvalue.php
+ * 	@Author Jasper van Eck
+ * 
+ * 	An example file to show the working of a function call with a return value.
+ */
+
+/*
+ *	Run a function which returns a value.
+ */
+echo "Function which returns a value; my_return_value_function()\n"
+echo my_return_value_function() . "\n";
diff --git a/Examples/FunctionVoid/30-phpcpp.ini b/Examples/FunctionVoid/30-phpcpp.ini
new file mode 100644
index 0000000..16a8368
--- /dev/null
+++ b/Examples/FunctionVoid/30-phpcpp.ini
@@ -0,0 +1,4 @@
+; configuration for php PDO module
+; priority=30
+extension=functionvoid.so
+
diff --git a/Examples/FunctionVoid/Makefile b/Examples/FunctionVoid/Makefile
index 9adc142..4925cfd 100644
--- a/Examples/FunctionVoid/Makefile
+++ b/Examples/FunctionVoid/Makefile
@@ -2,10 +2,17 @@ CPP             = g++
 RM              = rm -f
 CPP_FLAGS       = -Wall -c -I. -O2 -std=c++11
 
+PREFIX			= /usr
+#Edit these lines to correspond with your own directories
+LIBRARY_DIR		= ${PREFIX}/lib/php5/20121212
+PHP_CONFIG_DIR	= /etc/php5/cli/conf.d
+
 LD              = g++
 LD_FLAGS        = -Wall -shared -O2 
 RESULT          = functionvoid.so
 
+PHPINIFILE		= 30-phpcpp.ini
+
 SOURCES			= $(wildcard *.cpp)
 OBJECTS         = $(SOURCES:%.cpp=%.o)
 
@@ -19,3 +26,7 @@ clean:
 
 ${OBJECTS}: 
 		${CPP} ${CPP_FLAGS} -fpic -o $@ ${@:%.o=%.cpp}
+
+install:
+		cp -f ${RESULT} ${LIBRARY_DIR}
+		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}
diff --git a/Examples/FunctionVoid/functionvoid.cpp b/Examples/FunctionVoid/functionvoid.cpp
index 7ec7129..3d0e85d 100644
--- a/Examples/FunctionVoid/functionvoid.cpp
+++ b/Examples/FunctionVoid/functionvoid.cpp
@@ -2,7 +2,7 @@
  *	functionvoid.cpp
  * 	@Author Jasper van Eck
  * 
- * 	An example file to show the working of a void fucntion call.
+ * 	An example file to show the working of a void function call.
  */
 
 /**
diff --git a/Examples/FunctionWithParameters/30-phpcpp.ini b/Examples/FunctionWithParameters/30-phpcpp.ini
new file mode 100644
index 0000000..c416cab
--- /dev/null
+++ b/Examples/FunctionWithParameters/30-phpcpp.ini
@@ -0,0 +1,4 @@
+; configuration for php PDO module
+; priority=30
+extension=functionwithparameters.so
+
diff --git a/Examples/FunctionWithParameters/Makefile b/Examples/FunctionWithParameters/Makefile
new file mode 100644
index 0000000..1a39c1e
--- /dev/null
+++ b/Examples/FunctionWithParameters/Makefile
@@ -0,0 +1,32 @@
+CPP             = g++
+RM              = rm -f
+CPP_FLAGS       = -Wall -c -I. -O2 -std=c++11
+
+PREFIX			= /usr
+#Edit these lines to correspond with your own directories
+LIBRARY_DIR		= ${PREFIX}/lib/php5/20121212
+PHP_CONFIG_DIR	= /etc/php5/cli/conf.d
+
+LD              = g++
+LD_FLAGS        = -Wall -shared -O2 
+RESULT          = functionwithparameters.so
+
+PHPINIFILE		= 30-phpcpp.ini
+
+SOURCES			= $(wildcard *.cpp)
+OBJECTS         = $(SOURCES:%.cpp=%.o)
+
+all:	${OBJECTS} ${RESULT}
+
+${RESULT}: ${OBJECTS}
+		${LD} ${LD_FLAGS} -o $@ ${OBJECTS} -lphpcpp
+
+clean:
+		${RM} *.obj *~* ${OBJECTS} ${RESULT}
+
+${OBJECTS}: 
+		${CPP} ${CPP_FLAGS} -fpic -o $@ ${@:%.o=%.cpp}
+
+install:
+		cp -f ${RESULT} ${LIBRARY_DIR}
+		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}
diff --git a/Examples/FunctionWithParameters/functionwithparameters.cpp b/Examples/FunctionWithParameters/functionwithparameters.cpp
new file mode 100644
index 0000000..d7c1326
--- /dev/null
+++ b/Examples/FunctionWithParameters/functionwithparameters.cpp
@@ -0,0 +1,66 @@
+/**
+ *	functionwithparameters.cpp
+ * 	@Author Jasper van Eck
+ * 
+ * 	An example file to show the working of a function call with parameters.
+ */
+
+/**
+ * 	Libraries used.
+ */
+#include <iostream>
+#include <phpcpp.h>
+
+/**
+ *  Namespace to use
+ */
+using namespace std;
+
+/**
+ * 	my_with_undefined_parameters_function()
+ * 	@param	Php:Parameters	the given parameters
+ */
+void my_with_undefined_parameters_function(Php::Parameters &params)
+{
+	for (unsigned int i = 0; i < params.size(); i++)
+	{
+		cout << "Parameter " << i << ": " << params[i] << endl;
+	}
+}
+
+/**
+ * 	my_with_defined_parameters_function()
+ * 	@param	Php::Parameters		the given parameters
+ * 	@return Php::Value			Param[0] and Param[1] added
+ */
+Php::Value my_with_defined_parameters_function(Php::Parameters &params)
+{
+	for (unsigned int i = 0; i < params.size(); i++)
+	{
+		cout << "Parameter " << i << ": " << params[i] << endl;
+	}
+	
+	return params[0] + params[1];
+}
+
+// Symbols are exported according to the "C" language
+extern "C" 
+{
+	// export the "get_module" function that will be called by the Zend engine
+	PHPCPP_EXPORT void *get_module()
+	{
+		// create extension
+        static Php::Extension extension("my_function_with_parameters","1.0");
+        
+        // add function to extension
+        extension.add("my_with_undefined_parameters_function", my_with_undefined_parameters_function);
+		
+		extension.add("my_with_defined_parameters_function", my_with_defined_parameters_function, {
+			Php::ByVal("x", Php::numericType),
+            Php::ByVal("y", Php::numericType)
+			});
+		
+		// return the extension module
+		return extension.module();
+	}
+}
diff --git a/Examples/FunctionWithParameters/functionwithparameters.php b/Examples/FunctionWithParameters/functionwithparameters.php
new file mode 100644
index 0000000..04a0cb6
--- /dev/null
+++ b/Examples/FunctionWithParameters/functionwithparameters.php
@@ -0,0 +1,21 @@
+<?php
+/*
+ *	functionwithparameters.php
+ * 	@Author Jasper van Eck
+ * 
+ * 	An example file to show the working of a function call with parameters, defined and undefined.
+ */
+
+/*
+ *	Run a function with parameters. 
+ */
+echo 'A function which takes parameters, which are all undefined;' . 
+	'\nmy_with_undefined_parameters_function("1st","2nd","3rd","4th")\n';
+echo my_with_undefined_parameters_function("1st","2nd","3rd","4th") . '\n';
+
+echo 'A function which takes parameters, which are all defined;' . 
+	'\nmy_with_defined_parameters_function(21,42)\n';
+echo my_with_defined_parameters_function(21,42) . '\n';
+
+echo 'Accessing a non-existant parameters index will result in a segmentation fault.\n';
+echo 'The segmentation fault will also occur when passing the wrong type of parameter.\n';
diff --git a/Examples/simple/Makefile b/Examples/simple/Makefile
index e60be3a..6e3ecea 100644
--- a/Examples/simple/Makefile
+++ b/Examples/simple/Makefile
@@ -2,9 +2,16 @@ CPP             = g++
 RM              = rm -f
 CPP_FLAGS       = -Wall -c -I. -O2 -std=c++11
 
+PREFIX			= /usr
+#Edit these lines to correspond with your own directories
+LIBRARY_DIR		= ${PREFIX}/lib/php5/20121212
+PHP_CONFIG_DIR	= /etc/php5/cli/conf.d
+
 LD              = g++
 LD_FLAGS        = -Wall -shared -O2 
-RESULT          = simple.so
+RESULT          = functionnoparameters.so
+
+PHPINIFILE		= 30-phpcpp.ini
 
 SOURCES			= $(wildcard *.cpp)
 OBJECTS         = $(SOURCES:%.cpp=%.o)
@@ -20,3 +27,6 @@ clean:
 ${OBJECTS}: 
 		${CPP} ${CPP_FLAGS} -fpic -o $@ ${@:%.o=%.cpp}
 
+install:
+		cp -f ${RESULT} ${LIBRARY_DIR}
+		cp -f ${PHPINIFILE}	${PHP_CONFIG_DIR}