Separated class IniValue from class Ini

Also replaced Ini::get() on ini_get() see https://github.com/CopernicaMarketingSoftware/PHP-CPP/issues/64#issuecomment-40313791

3 files changed, 60 insertions, 39 deletions

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 8a6fe11..889e388 100644
--- a/zend/ini.cpp
+++ b/zend/ini.cpp
@@ -50,45 +50,6 @@ void Ini::fill(zend_ini_entry *ini_entry, int module_number)
 
 
 /**
- *  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
  */
 }
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
+ */
+}
+
+