PHP 5.6 is the new minimum version.

Closes #2.
servo-php · Dec 17, 2015 · bc107a0 · bc107a0
1 parent 2697ccb
commit bc107a0
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 45 deletions.
diff --git a/source/FluidXml.php b/source/FluidXml.php
@@ -38,6 +38,12 @@
  * @license https://opensource.org/licenses/BSD-2-Clause
  */
 
+if (version_compare(phpversion(), '7', '<')) {
+        require_once __DIR__ . \DIRECTORY_SEPARATOR . 'FluidXml.php56.php';
+} else {
+        require_once __DIR__ . \DIRECTORY_SEPARATOR . 'FluidXml.php70.php';
+}
+
 /**
  * Constructs a new FluidXml instance.
  *
@@ -135,18 +141,56 @@ public function attr(...$arguments);
         public function text($text);
 }
 
-class FluidXml implements FluidInterface
+trait FluidNamespaceTrait
 {
-        use FluidNamespaceTrait;
+        use FluidNamespaceShadowTrait;      // For compatibility with PHP 5.6.
 
-        const ROOT_NODE = 'doc';
+        private $namespaces = [];
 
-        private $dom;
+        public function namespaces()
+        {
+                return $this->namespaces;
+        }
 
-        public static function new(...$arguments)
+        // This method should be called 'namespace',
+        // but for compatibility with PHP 5.6
+        // it is shadowed by a facade method:
+        // - in PHP 7 by a real public 'namespace' method
+        // - in PHP 5 by a public __call method which understands a 'namespace' call.
+        protected function registerNamespace(...$arguments)
         {
-                return new FluidXml(...$arguments);
+                $namespaces = [];
+
+                if (\is_string($arguments[0])) {
+                        $args = [ $arguments[0], $arguments[1] ];
+
+                        if (isset($arguments[2])) {
+                                $args[] = $arguments[2];
+                        }
+
+                        $namespaces[] = new FluidNamespace(...$args);
+                } else if (\is_array($arguments[0])) {
+                        $namespaces = $arguments[0];
+                } else {
+                        $namespaces = $arguments;
+                }
+
+                foreach ($namespaces as $n) {
+                        $this->namespaces[$n->id()] = $n;
+                }
+
+                return $this;
         }
+}
+
+class FluidXml implements FluidInterface
+{
+        use FluidNamespaceTrait,
+            FluidXmlShadowTrait;        // For compatibility with PHP 5.6.
+
+        const ROOT_NODE = 'doc';
+
+        private $dom;
 
         public static function load($document)
         {
@@ -181,7 +225,7 @@ public static function load($document)
                         throw new \Exception('Document not recognized.');
                 }
 
-                return FluidXml::new(['root' => null])->appendXml($xml);
+                return (new FluidXml(['root' => null]))->appendXml($xml);
         }
 
         public function __construct($root = null, $options = [])
@@ -880,41 +924,6 @@ protected function insertNode($fn, $node, ...$optionals)
         }
 }
 
-trait FluidNamespaceTrait
-{
-        private $namespaces = [];
-
-        public function namespaces()
-        {
-                return $this->namespaces;
-        }
-
-        public function namespace(...$arguments)
-        {
-                $namespaces = [];
-
-                if (\is_string($arguments[0])) {
-                        $args = [ $arguments[0], $arguments[1] ];
-
-                        if (isset($arguments[2])) {
-                                $args[] = $arguments[2];
-                        }
-
-                        $namespaces[] = new FluidNamespace(...$args);
-                } else if (\is_array($arguments[0])) {
-                        $namespaces = $arguments[0];
-                } else {
-                        $namespaces = $arguments;
-                }
-
-                foreach ($namespaces as $n) {
-                        $this->namespaces[$n->id()] = $n;
-                }
-
-                return $this;
-        }
-}
-
 class FluidNamespace
 {
         const ID   = 'id'  ;

diff --git a/source/FluidXml.php56.php b/source/FluidXml.php56.php
@@ -0,0 +1,17 @@
+<?php
+
+trait FluidXmlShadowTrait
+{
+}
+
+trait FluidNamespaceShadowTrait
+{
+        public function __call($method, $arguments)
+        {
+                if ($method === 'namespace') {
+                        return $this->registerNamespace(...$arguments);
+                }
+
+                throw new \Exception("Method '$method' not found.");
+        }
+}
diff --git a/source/FluidXml.php70.php b/source/FluidXml.php70.php
@@ -0,0 +1,17 @@
+<?php
+
+trait FluidXmlShadowTrait
+{
+        public static function new(...$arguments)
+        {
+                return new FluidXml(...$arguments);
+        }
+}
+
+trait FluidNamespaceShadowTrait
+{
+        public function namespace(...$arguments)
+        {
+                return $this->registerNamespace(...$arguments);
+        }
+}
diff --git a/specs/FluidXml.php b/specs/FluidXml.php
@@ -171,10 +171,11 @@
                 });
         });
 
+        if (version_compare(phpversion(), '7', '>=')) {
         describe(':new', function() {
                 it('should behave like FluidXml::__construct', function() {
                         $xml   = new FluidXml();
-                        $alias = FluidXml::new();
+                        eval('$alias = FluidXml::new();');
 
                         $actual   = $alias->xml();
                         $expected = $xml->xml();
@@ -186,13 +187,14 @@
                                      'stylesheet' => 'stylesheet.xsl' ];
 
                         $xml   = new FluidXml($options);
-                        $alias = FluidXml::new($options);
+                        eval('$alias = FluidXml::new($options);');
 
                         $actual   = $alias->xml();
                         $expected = $xml->xml();
                         assert($actual === $expected, __($actual, $expected));
                 });
         });
+        }
 
         describe('.dom', function() {
                 it('should return the DOMDocument of the document', function() {

diff --git a/support/composer.json b/support/composer.json
@@ -20,7 +20,7 @@
                 "vendor-dir": "./composer"
         },
         "require": {
-                "php": ">=7"
+                "php": ">=5.6"
         },
         "require-dev": {
                 "peridot-php/peridot": "1.*",