Merge pull request #82 from valmat/ini

Php::Ini_get()

10 files changed, 232 insertions, 3 deletions

diff --git a/include/call.h b/include/call.h
index 2fcc9b0..f881782 100644
--- a/include/call.h
+++ b/include/call.h
@@ -57,7 +57,16 @@ inline Value echo(const std::string &input) { out << input; return nullptr; }
 inline Value empty(const Value &value) { return value.isNull() || !value.boolValue(); }
 inline Value empty(const HashMember<std::string> &member) { return !member.exists() || empty(member.value()); }
 inline Value empty(const HashMember<int> &member) { return !member.exists() || empty(member.value()); }
-inline Value ini_get(const Value &value) { return call("ini_get", value); }
+
+inline IniValue ini_get(const char* name)
+{
+    return IniValue(name, false);
+}
+inline IniValue ini_get_orig(const char* name)
+{
+    return IniValue(name, true);
+}
+
 inline Value is_array(const Value &value) { return value.isArray(); }
 inline Value strlen(const Value &value) { return call("strlen", value); }
 inline void  unset(const HashMember<std::string> &member) { member.unset(); }
diff --git a/include/ini.h b/include/ini.h
index 49587d7..1d881e9 100644
--- a/include/ini.h
+++ b/include/ini.h
@@ -17,6 +17,7 @@ struct _zend_ini_entry;
  */
 namespace Php {
 
+
 /**
  *  Class definition
  */
@@ -117,6 +118,7 @@ public:
      */
     void fill(struct _zend_ini_entry *ini_entry, int module_number);
 
+
 private:
     /**
      *  Helper function to convert a boolean to a string
diff --git a/include/inivalue.h b/include/inivalue.h
new file mode 100644
index 0000000..9f2e44c
--- /dev/null
+++ b/include/inivalue.h
@@ -0,0 +1,134 @@
+/**
+ *  IniValue.h
+ *
+ *  Class IniValue designed for extracting values from ini entries
+ *  
+ *  @copyright 2014 Copernica BV
+ */
+
+/**
+ *  Set up namespace
+ */
+namespace Php {
+
+/**
+ *  Class IniValue designed for extracting values from ini entries.
+ */
+class IniValue
+{
+public:
+    /**
+     *  Constructors
+     * 
+     *  @param  name        Name of the php.ini variable
+     *  @param  isorig      Is the original value
+     */
+    IniValue(const char *name, const bool isorig) : _name(name), _isorig(isorig) {}
+
+    /**
+     *  Cast to a number
+     *  @return int32_t
+     */
+    operator int16_t () const
+    {
+        return (int16_t)numericValue();
+    }
+
+    /**
+     *  Cast to a number
+     *  @return int32_t
+     */
+    operator int32_t () const
+    {
+        return (int32_t)numericValue();
+    }
+
+    /**
+     *  Cast to a number
+     *  @return uint64_t
+     */
+    operator int64_t () const
+    {
+        return numericValue();
+    }
+    
+    /**
+     *  Cast to a boolean
+     *  @return boolean
+     */
+    operator bool () const
+    {
+        return (bool)numericValue();
+    }
+    
+    /**
+     *  Cast to a string
+     *  @return string
+     */
+    operator std::string () const
+    {
+        return rawValue();
+    }
+    
+    /**
+     *  Cast to byte array
+     *  @return const char *
+     */
+    operator const char * () const
+    {
+        return rawValue();
+    }
+    
+    /**
+     *  Cast to a floating point
+     *  @return double
+     */
+    operator double() const;
+    
+private:
+    
+    /**
+     *  Retrieve the value as number
+     *
+     *  We force this to be a int64_t because we assume that most
+     *  servers run 64 bits nowadays, and because we use int32_t, int64_t
+     *  almost everywhere, instead of 'long' and on OSX neither of
+     *  these intxx_t types is defined as 'long'...
+     *
+     *  @return int64_t
+     */
+    int64_t numericValue() const;
+
+    /**
+     *  Get access to the raw buffer for read operationrs.
+     *  @return const char *
+     */
+    const char *rawValue() const;
+    
+    /**
+     *  ini entry name
+     *  @var    std::string
+     */
+    std::string _name;
+
+    /**
+     *  Is the orig value?
+     *  @var    bool
+     */
+    bool _isorig = false;
+};
+
+/**
+ *  Custom output stream operator
+ *  @param  stream
+ *  @param  ini_val
+ *  @return ostream
+ */
+std::ostream &operator<<(std::ostream &stream, const IniValue &ini_val);
+
+
+/**
+ *  End of namespace
+ */
+}
+
diff --git a/phpcpp.h b/phpcpp.h
index 4e9735d..3f94cef 100644
--- a/phpcpp.h
+++ b/phpcpp.h
@@ -26,6 +26,7 @@
 /**
  *  Include all headers files that are related to this library
  */
+#include <phpcpp/inivalue.h>
 #include <phpcpp/ini.h>
 #include <phpcpp/exception.h>
 #include <phpcpp/streams.h>
diff --git a/tests/cpp/include/ini_entries/001.h b/tests/cpp/include/ini_entries/001.h
index 649b0bd..ece2aa4 100644
--- a/tests/cpp/include/ini_entries/001.h
+++ b/tests/cpp/include/ini_entries/001.h
@@ -13,10 +13,26 @@ namespace TestIniEntries {
     
     void iniTest1(Php::Parameters &params)
     {
+        /*
+            .add(Php::Ini(, "valIni1"))
+            .add(Php::Ini("ini2", "valIni2", "OrigValIni2"))
+            .add(Php::Ini("ini3", "valIni3", "OrigValIni3", Php::Ini::System))
+            .add(Php::Ini("ini4", true,      false, Php::Ini::Place::User))
+            .add(Php::Ini("ini5",            false));
+
+            Ini::get("ini1")
+            */
+
+        Php::out << "ini_get(ini1) = {{" << Php::ini_get("ini1") << " | " << Php::ini_get_orig("ini1") << "}}" << std::endl;
+        Php::out << "ini_get(ini2) = {{" << Php::ini_get("ini2") << " | " << Php::ini_get_orig("ini2") << "}}" << std::endl;
+        Php::out << "ini_get(ini3) = {{" << Php::ini_get("ini3") << " | " << Php::ini_get_orig("ini3") << "}}" << std::endl;
+        Php::out << "ini_get(ini4) = {{" << Php::ini_get("ini4") << " | " << Php::ini_get_orig("ini4") << "}}" << std::endl;
+        /*
         Php::out << "extension_for_tests.some_string ={{" << Php::ini_get("extension_for_tests.some_string") << "}}" << std::endl;
         Php::out << "extension_for_tests.some_string2 ={{" << Php::ini_get("extension_for_tests.some_string2") << "}}" << std::endl;
         Php::out << "extension_for_tests.some_string3 ={{" << Php::ini_get("extension_for_tests.some_string3") << "}}" << std::endl;
         Php::out << "extension_for_tests.some_string3 ={{" << Php::ini_get("extension_for_tests.some_bool") << "}}" << std::endl;
+        */
         
 
 
diff --git a/tests/cpp/main.cpp b/tests/cpp/main.cpp
index 2e0a1dc..0f36ecc 100644
--- a/tests/cpp/main.cpp
+++ b/tests/cpp/main.cpp
@@ -147,12 +147,17 @@ extern "C"
 
         Php::Ini ini8("ini8", 3.1415926, 6.2831852);
         Php::Ini ini9("ini9", 2.7182818, 5.4365636, Php::Ini::User);
-        extension.add(Php::Ini("ini9", 0.333333, 0.777777, Php::Ini::Perdir));
+        //extension.add(Php::Ini("ini9", 0.333333, 0.777777, Php::Ini::Perdir));
 
         extension.add(ini8);
         extension.add(std::move(ini9));
 
         extension.add("TestIniEntries\\iniTest1", TestIniEntries::iniTest1);
+
+        extension.onStartup([](){
+            Php::out << "ini_get(ini1) = {{" << Php::ini_get("ini1") << " | " << Php::ini_get_orig("ini1") << "}}" << std::endl;
+            Php::out << "ini_get(ini2) = {{" << Php::ini_get("ini2") << " | " << Php::ini_get_orig("ini2") << "}}" << std::endl;
+        });
          
 
 
diff --git a/tests/php/dbg.php b/tests/php/dbg.php
index 8de0bb8..70e71ef 100644
--- a/tests/php/dbg.php
+++ b/tests/php/dbg.php
@@ -12,7 +12,8 @@
 
 
 
-
+TestIniEntries\iniTest1();
+exit;
 echo "\x1b[1;31m";
 (new ReflectionExtension('extension_for_tests') )->info();
 echo "\x1b[0m";
diff --git a/zend/includes.h b/zend/includes.h
index 4aa5eb0..cabb096 100644
--- a/zend/includes.h
+++ b/zend/includes.h
@@ -45,6 +45,7 @@
 /**
  *  Include other files from this library
  */
+#include "../include/inivalue.h"
 #include "../include/ini.h"
 #include "../include/exception.h"
 #include "../include/streams.h"
diff --git a/zend/ini.cpp b/zend/ini.cpp
index 25f081a..889e388 100644
--- a/zend/ini.cpp
+++ b/zend/ini.cpp
@@ -48,6 +48,7 @@ void Ini::fill(zend_ini_entry *ini_entry, int module_number)
     ini_entry->displayer         = nullptr;
 }
 
+
 /**
  *  End of namespace
  */
diff --git a/zend/inivalue.cpp b/zend/inivalue.cpp
new file mode 100644
index 0000000..f89dcd2
--- /dev/null
+++ b/zend/inivalue.cpp
@@ -0,0 +1,59 @@
+/**
+ *  IniValue.cpp
+ *
+ *  Class IniValue designed for extracting values from ini entries
+ *
+ *  @copyright 2013 Copernica BV
+ */
+#include "includes.h"
+
+/**
+ *  Set up namespace
+ */
+namespace Php {
+
+/**
+ *  Cast to a number
+ *  @return uint64_t
+ */
+int64_t IniValue::numericValue() const
+{
+    return zend_ini_long(const_cast<char*>(_name.c_str()), _name.size()+1, _isorig);
+
+}
+
+/**
+ *  Get access to the raw buffer for read operationrs.
+ *  @return const char *
+ */
+const char* IniValue::rawValue() const
+{
+    return zend_ini_string(const_cast<char*>(_name.c_str()), _name.size()+1, _isorig);
+}
+
+/**
+ *  Cast to a floating point
+ *  @return double
+ */
+IniValue::operator double() const
+{
+    return zend_ini_double(const_cast<char*>(_name.c_str()), _name.size()+1, _isorig);
+}
+
+/**
+ *  Custom output stream operator
+ *  @param  stream
+ *  @param  ini_val
+ *  @return ostream
+ */
+std::ostream &operator<<(std::ostream &stream, const IniValue &ini_val)
+{
+    return stream << static_cast<const char*>(ini_val);
+}
+
+/**
+ *  End of namespace
+ */
+}
+
+