CS fixes;

Fixed notice when regenerating package.xml;
Lots of other changes (see RELEASE-0.2.2)

Author: boenrobot

.travis.yml

@@ -3,6 +3,8 @@ php:
   - 5.3
   - 5.4
   - 5.5
+  - 5.6
+  - 7.0
 before_script:
   - pyrus install -p pyrus.net/Pyrus_Developer-alpha
   - pyrus install PEAR2_Autoload-alpha

RELEASE-0.2.2

@@ -0,0 +1,7 @@
+* Brought fixes from PEAR_Console_CommandLine 1.2.2, namely
+    - xmlschema.rng is looked for in more locations (though this package also includes a lookup first on Pyrus' folder layout, and also respects the PHP_PEAR_DATA_DIR environment variable's value, and fixes the error message when the file is not found in any location)
+    - Package dependencies include DOM (though this package includes it as an optional dependency, because it's only needed when getting definitions from an XML file; not when constructing them "manually; Also, the "xml" extension is not used, so it's not included here)
+    - Fixed comparrisons in PHP7
+    - Replaced static with private variables
+* Made this package PSR-4 compatible, while preserving PSR-0 compatibility by moving MessageProvider_Default into it's own MessageProvider sub-namespace, and renaming the class itself to DefaultProvider to avoid it having a reserved word ("default") as its name.
+* CS fixes.

composer.json

@@ -27,6 +27,9 @@
     "require": {
         "php": ">=5.3.0"
     },
+    "suggest": {
+        "ext-dom": "Required when parsing definitions from an XML file"
+    },
     "autoload": {
         "psr-0": {
             "PEAR2\\Console\\CommandLine": "src/"

package.xml

@@ -34,24 +34,24 @@ Main features:
   <email>[email protected]</email>
   <active>yes</active>
  </helper>
- <date>2014-06-22</date>
- <time>23:21:23</time>
+ <date>2016-11-09</date>
+ <time>02:01:33</time>
  <version>
-  <release>0.2.1</release>
+  <release>0.2.2</release>
   <api>0.1.0</api>
  </version>
  <stability>
   <release>alpha</release>
   <api>alpha</api>
  </stability>
  <license uri="http://opensource.org/licenses/mit-license.php">MIT License</license>
- <notes>* Added a composer.json, and this package to packagist.org.
-* Fixed GitHub issue #2: columnWrap() in Default Renderer eats up lines with only a EOL.
-* Fixed validation of XML definition files: The directory of the RNG schema was wrong.
-* Fixed test suite errors, including namespace related ones and adding Travis-CI configuration.
-* Removed PEAR2\Exception dependency - This package's exception directly inherits from the root Exception.
-* CS fixes.
-</notes>
+ <notes>* Brought fixes from PEAR_Console_CommandLine 1.2.2, namely
+    - xmlschema.rng is looked for in more locations (though this package also includes a lookup first on Pyrus' folder layout, and also respects the PHP_PEAR_DATA_DIR environment variable's value, and fixes the error message when the file is not found in any location)
+    - Package dependencies include DOM (though this package includes it as an optional dependency, because it's only needed when getting definitions from an XML file; not when constructing them &quot;manually; Also, the &quot;xml&quot; extension is not used, so it's not included here)
+    - Fixed comparrisons in PHP7
+    - Replaced static with private variables
+* Made this package PSR-4 compatible, while preserving PSR-0 compatibility by moving MessageProvider_Default into it's own MessageProvider sub-namespace, and renaming the class itself to DefaultProvider to avoid it having a reserved word (&quot;default&quot;) as its name.
+* CS fixes.</notes>
  <contents>
   <dir name="/">
    <dir name="data" baseinstalldir="/">
@@ -116,7 +116,7 @@ Main features:
         </file>
        </dir>
        <dir name="MessageProvider">
-        <file role="php" name="Default.php">
+        <file role="php" name="DefaultProvider.php">
          <tasks:replace type="package-info" to="version" from="GIT: $Id$"/>
         </file>
        </dir>
@@ -162,6 +162,7 @@ Main features:
         <tasks:replace type="package-info" to="version" from="GIT: $Id$"/>
        </file>
        <file role="php" name="XmlParser.php">
+        <tasks:replace type="pear-config" to="data_dir" from="@data_dir@"/>
         <tasks:replace type="package-info" to="version" from="GIT: $Id$"/>
        </file>
       </dir>
@@ -245,6 +246,9 @@ Main features:
     <name>PEAR2_Autoload</name>
     <channel>pear2.php.net</channel>
    </package>
+   <extension>
+    <name>dom</name>
+   </extension>
   </optional>
  </dependencies>
  <phprelease>
@@ -276,7 +280,7 @@ Main features:
    <install name="src/PEAR2/Console/CommandLine/Element.php" as="PEAR2/Console/CommandLine/Element.php"/>
    <install name="src/PEAR2/Console/CommandLine/Exception.php" as="PEAR2/Console/CommandLine/Exception.php"/>
    <install name="src/PEAR2/Console/CommandLine/MessageProvider.php" as="PEAR2/Console/CommandLine/MessageProvider.php"/>
-   <install name="src/PEAR2/Console/CommandLine/MessageProvider/Default.php" as="PEAR2/Console/CommandLine/MessageProvider/Default.php"/>
+   <install name="src/PEAR2/Console/CommandLine/MessageProvider/DefaultProvider.php" as="PEAR2/Console/CommandLine/MessageProvider/DefaultProvider.php"/>
    <install name="src/PEAR2/Console/CommandLine/Option.php" as="PEAR2/Console/CommandLine/Option.php"/>
    <install name="src/PEAR2/Console/CommandLine/Outputter.php" as="PEAR2/Console/CommandLine/Outputter.php"/>
    <install name="src/PEAR2/Console/CommandLine/Outputter/Default.php" as="PEAR2/Console/CommandLine/Outputter/Default.php"/>

packagexmlsetup.php

@@ -51,6 +51,10 @@
             'type' => 'pear-config',
             'to' => 'php_dir'
         ),
+        '@data_dir@' => array(
+            'type' => 'pear-config',
+            'to' => 'data_dir'
+        ),
         'GIT: $Id$' => array(
             'type' => 'package-info',
             'to' => 'version'
@@ -75,7 +79,7 @@
     $cTasksNs = $compatible ? $compatible->getTasksNs() : '';
     $oldCwd = getcwd();
     chdir(__DIR__);
-    $package->setRawRelease('php', null);
+    $package->setRawRelease('php', '');
     $release = $package->getReleaseToInstall('php');
     foreach (new RecursiveIteratorIterator(
         new RecursiveDirectoryIterator(

src/PEAR2/Console/CommandLine.php

@@ -59,6 +59,7 @@ class CommandLine
      * Error messages.
      *
      * @var array $errors Error messages
+     *
      * @todo move this to PEAR2\Console\CommandLine\MessageProvider
      */
     public static $errors = array(
@@ -130,7 +131,7 @@ class CommandLine
     /**
      * The command line parser renderer instance.
      *
-     * @var    object that implements PEAR2\Console\CommandLine\Renderer interface
+     * @var PEAR2\Console\CommandLine\Renderer a renderer
      */
     public $renderer = false;
 
@@ -144,7 +145,7 @@ class CommandLine
     /**
      * The command line message provider instance.
      *
-     * @var PEAR2\Console\CommandLine\MessageProvider A message provider instance
+     * @var PEAR2\Console\CommandLine\MessageProvider A message provider
      */
     public $message_provider = false;
 
@@ -191,6 +192,7 @@ class CommandLine
      * convenience.
      *
      * @var PEAR2\Console\CommandLine The parent instance
+     * 
      * @todo move CommandLine::parent to CommandLine\Command
      */
     public $parent = false;
@@ -272,7 +274,7 @@ class CommandLine
      * </code>
      *
      * @var array
-     * @see PEAR2\Console\CommandLine\MessageProvider_Default
+     * @see PEAR2\Console\CommandLine\MessageProvider\DefaultProvider
      */
     public $messages = array();
 
@@ -286,6 +288,9 @@ class CommandLine
      */
     private $_dispatchLater = array();
 
+    private $_lastopt = false;
+    private $_stopflag = false;
+
     // }}}
     // __construct() {{{
 
@@ -345,7 +350,7 @@ public function __construct(array $params = array())
         // set default instances
         $this->renderer         = new CommandLine\Renderer_Default($this);
         $this->outputter        = new CommandLine\Outputter_Default();
-        $this->message_provider = new CommandLine\MessageProvider_Default();
+        $this->message_provider = new CommandLine\MessageProvider\DefaultProvider();
     }
 
     // }}}
@@ -481,6 +486,7 @@ public static function fromXmlString($string)
      * @param array $params An array containing the argument attributes
      *
      * @return PEAR2\Console\CommandLine\Argument the added argument
+     * 
      * @see PEAR2\Console\CommandLine\Argument
      */
     public function addArgument($name, $params = array())
@@ -842,6 +848,7 @@ public static function registerAction($name, $class)
      * @param array  $params An array of search=>replaces entries
      *
      * @return void
+     * 
      * @todo remove Console::triggerError() and use exceptions only
      */
     public static function triggerError($msgId, $level, $params=array())
@@ -912,7 +919,7 @@ public function parse($userArgc=null, $userArgv=null)
         // Check if an invalid subcommand was specified. If there are
         // subcommands and no arguments, but an argument was provided, it is
         // an invalid subcommand.
-        if (   count($this->commands) > 0
+        if (count($this->commands) > 0
             && count($this->args) === 0
             && count($args) > 0
         ) {
@@ -925,7 +932,7 @@ public function parse($userArgc=null, $userArgv=null)
         }
         // if subcommand_required is set to true we must check that we have a
         // subcommand.
-        if (   count($this->commands)
+        if (count($this->commands)
             && $this->subcommand_required
             && !$result->command_name
         ) {
@@ -989,23 +996,21 @@ public function parse($userArgc=null, $userArgv=null)
      */
     protected function parseToken($token, $result, &$args, $argc)
     {
-        static $lastopt  = false;
-        static $stopflag = false;
         $last  = $argc === 0;
-        if (!$stopflag && $lastopt) {
+        if (!$this->_stopflag && $this->_lastopt) {
             if (substr($token, 0, 1) == '-') {
-                if ($lastopt->argument_optional) {
-                    $this->_dispatchAction($lastopt, '', $result);
-                    if ($lastopt->action != 'StoreArray') {
-                        $lastopt = false;
+                if ($this->_lastopt->argument_optional) {
+                    $this->_dispatchAction($this->_lastopt, '', $result);
+                    if ($this->_lastopt->action != 'StoreArray') {
+                        $this->_lastopt = false;
                     }
-                } else if (isset($result->options[$lastopt->name])) {
+                } else if (isset($result->options[$this->_lastopt->name])) {
                     // case of an option that expect a list of args
-                    $lastopt = false;
+                    $this->_lastopt = false;
                 } else {
                     throw CommandLine\Exception::factory(
                         'OPTION_VALUE_REQUIRED',
-                        array('name' => $lastopt->name),
+                        array('name' => $this->_lastopt->name),
                         $this,
                         $this->messages
                     );
@@ -1015,31 +1020,31 @@ protected function parseToken($token, $result, &$args, $argc)
                 // is to consider that if there's already an element in the
                 // array, and the commandline expects one or more args, we
                 // leave last tokens to arguments
-                if ($lastopt->action == 'StoreArray'
-                    && !empty($result->options[$lastopt->name])
+                if ($this->_lastopt->action == 'StoreArray'
+                    && !empty($result->options[$this->_lastopt->name])
                     && count($this->args) > ($argc + count($args))
                 ) {
                     if (!is_null($token)) {
                         $args[] = $token;
                     }
                     return;
                 }
-                if (!is_null($token) || $lastopt->action == 'Password') {
-                    $this->_dispatchAction($lastopt, $token, $result);
+                if (!is_null($token) || $this->_lastopt->action == 'Password') {
+                    $this->_dispatchAction($this->_lastopt, $token, $result);
                 }
-                if ($lastopt->action != 'StoreArray') {
-                    $lastopt = false;
+                if ($this->_lastopt->action != 'StoreArray') {
+                    $this->_lastopt = false;
                 }
                 return;
             }
         }
-        if (!$stopflag && substr($token, 0, 2) == '--') {
+        if (!$this->_stopflag && substr($token, 0, 2) == '--') {
             // a long option
             $optkv = explode('=', $token, 2);
             if (trim($optkv[0]) == '--') {
                 // the special argument "--" forces in all cases the end of
                 // option scanning.
-                $stopflag = true;
+                $this->_stopflag = true;
                 return;
             }
             $opt = $this->findOption($optkv[0]);
@@ -1072,14 +1077,14 @@ protected function parseToken($token, $result, &$args, $argc)
                     );
                 }
                 // we will have a value next time
-                $lastopt = $opt;
+                $this->_lastopt = $opt;
                 return;
             }
             if ($opt->action == 'StoreArray') {
-                $lastopt = $opt;
+                $this->_lastopt = $opt;
             }
             $this->_dispatchAction($opt, $value, $result);
-        } else if (!$stopflag && substr($token, 0, 1) == '-') {
+        } else if (!$this->_stopflag && substr($token, 0, 1) == '-') {
             // a short option
             $optname = substr($token, 0, 2);
             if ($optname == '-') {
@@ -1100,7 +1105,7 @@ protected function parseToken($token, $result, &$args, $argc)
             // in short: handle -f<value> and -f <value>
             $next = substr($token, 2, 1);
             // check if we must wait for a value
-            if ($next === false) {
+            if (!$next) {
                 if ($opt->expectsArgument()) {
                     if ($last && !$opt->argument_optional) {
                         throw CommandLine\Exception::factory(
@@ -1111,7 +1116,7 @@ protected function parseToken($token, $result, &$args, $argc)
                         );
                     }
                     // we will have a value next time
-                    $lastopt = $opt;
+                    $this->_lastopt = $opt;
                     return;
                 }
                 $value = false;
@@ -1136,7 +1141,7 @@ protected function parseToken($token, $result, &$args, $argc)
                     }
                 }
                 if ($opt->action == 'StoreArray') {
-                    $lastopt = $opt;
+                    $this->_lastopt = $opt;
                 }
                 $value = substr($token, 2);
             }
@@ -1145,8 +1150,8 @@ protected function parseToken($token, $result, &$args, $argc)
             // We have an argument.
             // if we are in POSIX compliant mode, we must set the stop flag to
             // true in order to stop option parsing.
-            if (!$stopflag && $this->force_posix) {
-                $stopflag = true;
+            if (!$this->_stopflag && $this->force_posix) {
+                $this->_stopflag = true;
             }
             if (!is_null($token)) {
                 $args[] = $token;

src/PEAR2/Console/CommandLine/Action.php

@@ -11,14 +11,15 @@
  * through the world-wide-web at the following URI:
  * http://opensource.org/licenses/mit-license.php
  *
- * @category  Console 
+ * @category  Console
  * @package   PEAR2\Console\CommandLine
  * @author    David JEAN LOUIS <[email protected]>
  * @copyright 2007-2009 David JEAN LOUIS
- * @license   http://opensource.org/licenses/mit-license.php MIT License 
+ * @license   http://opensource.org/licenses/mit-license.php MIT License
  * @version   GIT: $Id$
  * @link      http://pear2.php.net/PEAR2_Console_CommandLine
  * @since     File available since release 0.1.0
+ *
  * @filesource
  */
 namespace PEAR2\Console\CommandLine;

src/PEAR2/Console/CommandLine/Action/Callback.php

@@ -11,14 +11,15 @@
  * through the world-wide-web at the following URI:
  * http://opensource.org/licenses/mit-license.php
  *
- * @category  Console 
+ * @category  Console
  * @package   PEAR2\Console\CommandLine
  * @author    David JEAN LOUIS <[email protected]>
  * @copyright 2007-2009 David JEAN LOUIS
- * @license   http://opensource.org/licenses/mit-license.php MIT License 
+ * @license   http://opensource.org/licenses/mit-license.php MIT License
  * @version   GIT: $Id$
  * @link      http://pear2.php.net/PEAR2_Console_CommandLine
  * @since     File available since release 0.1.0
+ *
  * @filesource
  */
 namespace PEAR2\Console\CommandLine\Action;