Phpunit integration && PHP 7 update

.gitignore

@@ -2,3 +2,5 @@
 composer.lock
 composer.phar
 vendor
+tests/coverage
+clover.xml

.travis.yml

@@ -1,6 +1,14 @@
 language: php
 install:
-  - pear install -a package.xml
+  - composer install --prefer-dist --no-progress
+
 php:
-  - 5.5
-script: phpunit test/
+  - 5.6
+  - 7.0
+  - 7.1
+  - 7.2
+  - 7.3
+  - 7.4
+
+script:
+  - vendor/bin/phpunit

Config.php

@@ -17,9 +17,6 @@
 //
 // $Id$
 
-require_once('PEAR.php');
-require_once('Config/Container.php');
-
 $GLOBALS['CONFIG_TYPES'] = 
         array(
             'apache'        => array('Config/Container/Apache.php', 'Config_Container_Apache'),

Config/Container.php

@@ -17,8 +17,6 @@
 //
 // $Id$
 
-require_once 'Config.php';
-
 /**
 * Interface for Config containers
 *
@@ -62,7 +60,7 @@ class Config_Container {
     * Array of attributes for this item
     * @var  array
     */
-    var $attributes;
+    var $attributes = [];
 
     /**
     * Unique id to differenciate nodes
@@ -82,7 +80,7 @@ class Config_Container {
     * @param  string  $content    Content of container object
     * @param  array   $attributes Array of attributes for container object
     */
-    function __construct($type = 'section', $name = '', $content = '', $attributes = null)
+    function __construct($type = 'section', $name = '', $content = '', $attributes = [])
     {
         $this->type       = $type;
         $this->name       = $name;
@@ -694,15 +692,15 @@ function toArray($useAttr = true)
         $array[$this->name] = array();
         switch ($this->type) {
             case 'directive':
-                if ($useAttr && count($this->attributes) > 0) {
+                if ($useAttr && !empty($this->attributes)) {
                     $array[$this->name]['#'] = $this->content;
                     $array[$this->name]['@'] = $this->attributes;
                 } else {
                     $array[$this->name] = $this->content;
                 }
                 break;
             case 'section':
-                if ($useAttr && count($this->attributes) > 0) {
+                if ($useAttr && !empty($this->attributes)) {
                     $array[$this->name]['@'] = $this->attributes;
                 }
                 if ($count = count($this->children)) {
@@ -773,4 +771,3 @@ function writeDatasrc($datasrc, $configType, $options = array())
         }
     } // end func writeDatasrc
 } // end class Config_Container
-?>

Config/Container/IniCommented.php

@@ -164,7 +164,7 @@ function _quoteAndCommaParser($text)
         $pos = 0; // position in $text
 
         do {
-            $char = $text{$pos};
+            $char = $text[$pos];
             $state = $this->_getQACEvent($stack);
 
             if ($tokens[$state]) {

Config/Container/IniFile.php

@@ -66,6 +66,7 @@ function parseDatasrc($datasrc, $obj)
                 null, PEAR_ERROR_RETURN
             );
         }
+
         $currentSection = $obj->container;
         $confArray = parse_ini_file($datasrc, true);
         if (!$confArray) {
@@ -74,6 +75,7 @@ function parseDatasrc($datasrc, $obj)
                 null, PEAR_ERROR_RETURN
             );
         }
+
         foreach ($confArray as $key => $value) {
             if (is_array($value)) {
                 $currentSection =& $obj->container->createSection($key);
@@ -213,4 +215,4 @@ function contentToString($content)
         return $content;
     }
 
-} // end class Config_Container_IniFile
+} // end class Config_Container_IniFile

Config/Container/PHPConstants.php

@@ -11,7 +11,6 @@
  * @version  SVN: $Id$
  * @link     http://pear.php.net/package/Config
  */
-require_once 'Config/Container.php';
 
 /**
  * Config parser for PHP constant files
@@ -22,7 +21,7 @@
  * @license  http://www.php.net/license PHP License
  * @link     http://pear.php.net/package/Config
  */
-class Config_Container_PHPConstants extends Config_Container
+class Config_Container_PHPConstants 
 {
     /**
      * Valid config options:
@@ -125,7 +124,7 @@ function &parseDatasrc($datasrc, &$obj)
      *
      * @access public
      */
-    function toString(&$obj)
+    function toString(&$obj, $options = array())
     {
         $string = '';
 

Config/Container/XML.php

@@ -17,9 +17,6 @@
 //
 // $Id$
 
-require_once('XML/Parser.php');
-require_once('XML/Util.php');
-
 /**
 * Config parser for XML Files
 *

README.md

@@ -0,0 +1,21 @@
+# Pear / Config
+Configuration parsers for Apache, Ini files, PHP constants, Xml and generic .conf files.
+
+[![Build Status](https://travis-ci.org/pear/config.png?branch=master)](https://travis-ci.org/pear/config)
+
+## Installation
+Add the following to your composer.json:
+```
+{
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/pear/Config"
+            "no-api": true
+        }
+    ],
+    "require": {
+        "pear/Config": "dev-master",
+    }
+}
+```

composer.json

@@ -38,12 +38,13 @@
     },
     "type": "library",
     "require": {
-        "pear/pear_exception": "*"
+        "pear/pear": "^1.10",
+        "pear/xml_parser": "^1.3"
     },
     "require-dev": {
         "phpunit/phpunit": "*"
     },
     "suggest": {
         "pear/xml_parser": "Install optionally via your project's composer.json"
     }
-}
+}

phpunit.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<phpunit backupGlobals="false"
+         defaultTestSuite="all_tests"
+         backupStaticAttributes="true"
+         colors="true"
+         bootstrap="./tests/bootstrap_phpunit.php"
+         >
+
+    <testsuites>
+        <!-- TODO defaultTestSuite will work with phpunit 6.1 -->
+        <testsuite name="all_tests">
+            <directory>./tests/integration</directory>
+            <directory>./tests/legacy</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <!-- /!\ whitelist will exclude every outside class from coverage -->
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./Config</directory>
+        </whitelist>
+    </filter>
+
+    <logging>
+        <log type="coverage-clover" target="clover.xml"/>
+        <log type="coverage-html" target="tests/coverage/"/>
+    </logging>
+</phpunit>