Merge pull request #51 from kschroeder/develop

Updated several internal workings, including better handling of sources
magium · Mar 20, 2017 · 6b895f3 · 6b895f3
2 parents 1e63133 + dd140c9
commit 6b895f3
Show file tree

Hide file tree

Showing 23 changed files with 581 additions and 51 deletions.
diff --git a/composer.json b/composer.json
@@ -20,7 +20,10 @@
     "zendframework/zend-cache": "^2.7",
     "psr/container": "^1.0@dev",
     "zendframework/zend-db": "^2.8",
-    "symfony/console": "^3.2"
+    "symfony/console": "^3.2",
+    "psr/http-message": "^1.0",
+    "zendframework/zend-view": "^2.8",
+    "zendframework/zend-psr7bridge": "^0.2.2"
   },
   "bin": ["bin/magium-configuration"]
 }
diff --git a/lib/Config/Builder.php b/lib/Config/Builder.php
@@ -114,7 +114,7 @@ public function build($context = ConfigurationRepository::CONTEXT_DEFAULT, Confi
 
         $structure = $this->getMergedStructure();
 
-        if (!$structure instanceof \SimpleXMLElement) {
+        if (!$structure instanceof MergedStructure) {
             throw new InvalidConfigurationException('No configuration files provided');
         }
 
@@ -143,7 +143,7 @@ public function getMergedStructure()
             }
 
             $simpleXml = $file->toXml();
-            if (!$structure instanceof \SimpleXMLElement) {
+            if (!$structure instanceof MergedStructure) {
                 $structure = $simpleXml;
             } else {
                 $this->mergeStructure($structure, $simpleXml);
@@ -160,15 +160,15 @@ public function getMergedStructure()
      */
 
     public function buildConfigurationObject(
-        \SimpleXMLElement $structure,
+        MergedStructure $structure,
         ConfigInterface $config,
         $context = ConfigurationRepository::CONTEXT_DEFAULT
     )
     {
         $structure->registerXPathNamespace('s', 'http://www.magiumlib.com/Configuration');
         $elements = $structure->xpath('/*/s:section/s:group/s:element');
         foreach ($elements as $element) {
-            if ($element instanceof \SimpleXMLElement) {
+            if ($element instanceof MergedStructure) {
                 $elementId = $element['identifier'];
                 $group = $element->xpath('..')[0];
                 $groupId = $group['identifier'];
@@ -209,7 +209,7 @@ public function buildConfigurationObject(
         }
     }
 
-    public function mergeStructure(\SimpleXMLElement $base, \SimpleXMLElement $new)
+    public function mergeStructure(MergedStructure $base, \SimpleXMLElement $new)
     {
         $base->registerXPathNamespace('s', 'http://www.magiumlib.com/Configuration');
         foreach ($new as $item) {
@@ -224,7 +224,7 @@ public function mergeStructure(\SimpleXMLElement $base, \SimpleXMLElement $new)
                 }
 
                 foreach ($item->attributes() as $name => $value) {
-                    $section[$name] = $value;
+                    $section[$name] = (string)$value;
                 }
                 if ($item->group) {
                     $this->mergeGroup($section, $item->group);
@@ -247,7 +247,7 @@ protected function mergeGroup(\SimpleXMLElement $section, \SimpleXMLElement $new
                     $group = $section->addChild('group');
                 }
                 foreach ($newGroup->attributes() as $name => $value) {
-                    $group[$name] = $value;
+                    $group[$name] = (string)$value;
                 }
                 $this->mergeElements($group, $newGroup->element);
             }
@@ -268,10 +268,10 @@ protected function mergeElements(\SimpleXMLElement $group, \SimpleXMLElement $ne
                     $element = $group->addChild('element');
                 }
                 foreach ($newElement->attributes() as $name => $value) {
-                    $element[$name] = $value;
+                    $element[$name] = (string)$value;
                 }
                 foreach ($newElement->children() as $key => $item) {
-                    $element->$key = $item;
+                    $element->$key = (string)$item;
                 }
             }
         }

diff --git a/lib/Config/BuilderInterface.php b/lib/Config/BuilderInterface.php
@@ -14,7 +14,7 @@ interface BuilderInterface
     public function build($context = ConfigurationRepository::CONTEXT_DEFAULT, ConfigInterface $config = null);
 
     /**
-     * @return \SimpleXMLElement
+     * @return MergedStructure
      */
 
     public function getMergedStructure();

diff --git a/lib/Config/ConfigInterface.php b/lib/Config/ConfigInterface.php
@@ -9,4 +9,7 @@ public function getValue($path);
     public function hasValue($path);
 
     public function getValueFlag($path);
+
+    public function xpath($xpath);
+
 }
diff --git a/lib/Config/ConfigurationRepository.php b/lib/Config/ConfigurationRepository.php
@@ -44,4 +44,5 @@ public function getValueFlag($path)
         }
         return false;
     }
+
 }
diff --git a/lib/Config/MergedStructure.php b/lib/Config/MergedStructure.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Magium\Configuration\Config;
+
+class MergedStructure extends \SimpleXMLElement
+{
+
+}
diff --git a/lib/File/XmlFileToXmlTrait.php b/lib/File/XmlFileToXmlTrait.php
@@ -2,6 +2,8 @@
 
 namespace Magium\Configuration\File;
 
+use Magium\Configuration\Config\MergedStructure;
+
 trait XmlFileToXmlTrait
 {
 
@@ -13,13 +15,13 @@ abstract public function validateSchema(\DOMDocument $doc);
 
     public function toXml()
     {
-        if (!$this->xml instanceof \SimpleXMLElement) {
+        if (!$this->xml instanceof MergedStructure) {
             $file = $this->getFile();
             $content = file_get_contents($file);
             $doc = new \DOMDocument();
             $doc->loadXML($content);
             $this->validateSchema($doc);
-            $this->xml = new \SimpleXMLElement($content);
+            $this->xml = new MergedStructure($content);
         }
         return $this->xml;
     }

diff --git a/lib/Source/Datetime/MonthNumbers.php b/lib/Source/Datetime/MonthNumbers.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Magium\Configuration\Source\Datetime;
+
+use Magium\Configuration\Source\SourceInterface;
+
+class MonthNumbers implements SourceInterface
+{
+
+    public function getSourceData()
+    {
+        return [
+            '01' => '01',
+            '02' => '02',
+            '03' => '03',
+            '04' => '04',
+            '05' => '05',
+            '06' => '06',
+            '07' => '07',
+            '08' => '08',
+            '09' => '09',
+            '10' => '10',
+            '11' => '11',
+            '12' => '12',
+        ];
+    }
+
+}
diff --git a/lib/Source/Datetime/Months.php b/lib/Source/Datetime/Months.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Magium\Configuration\Source\Datetime;
+
+use Magium\Configuration\Source\SourceInterface;
+
+class Months implements SourceInterface
+{
+
+    public function getSourceData()
+    {
+        return [
+            'January',
+            'February',
+            'March',
+            'April',
+            'May',
+            'June',
+            'July',
+            'August',
+            'September',
+            'October',
+            'November',
+            'December',
+        ];
+    }
+
+}
diff --git a/lib/Source/Datetime/NextTenYears.php b/lib/Source/Datetime/NextTenYears.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Magium\Configuration\Source\Datetime;
+
+use Magium\Configuration\Source\SourceInterface;
+
+class NextTenYears implements SourceInterface
+{
+
+    public function getSourceData()
+    {
+        $now = date('Y');
+        $return = [];
+        do {
+            $return[] = $now++;
+        } while (count($return) < 10);
+        return $return;
+
+    }
+
+}
diff --git a/lib/Source/Political/CanadianProvinces.php b/lib/Source/Political/CanadianProvinces.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Magium\Configuration\Source\Political;
+
+use Magium\Configuration\Source\SourceInterface;
+
+class CanadianProvinces implements SourceInterface
+{
+
+    public function getSourceData()
+    {
+        return [
+            'AB' => 'Alberta',
+            'BC' => 'British Columbia',
+            'MB' => 'Manitoba',
+            'NB' => 'New Brunswick',
+            'NL' => 'Newfoundland and Labrador',
+            'NT' => 'Northwest Territories',
+            'NS' => 'Nova Scotia',
+            'NU' => 'Nunavut',
+            'ON' => 'Ontario',
+            'PE' => 'Prince Edward Island',
+            'QC' => 'Quebec',
+            'SK' => 'Saskatchewan',
+            'YT' => 'Yukon'
+        ];
+    }
+
+}