Reverted the autoloader changes in the stub. Unnecessary, due to PEAR2_Autoload conditionally declaring itself, while also unconditionally registering itself;

Minor doc fixes at ResponseCollection.

Author: boenrobot

src/PEAR2/Net/RouterOS/ResponseCollection.php

@@ -64,11 +64,12 @@ class ResponseCollection implements ArrayAccess, SeekableIterator, Countable
 
     /**
      * @var array An array with positions of responses, based on an argument
-     * name. The name of each argument is the array key, and the array value is
-     * another array where the key is the value for that argument, and the value
-     * is the posistion of the response. For performance reasons, each key is
-     * built only when {@link static::setIndex()} is called with that argument,
-     * and remains available for the lifetime of this collection.
+     *     name. The name of each argument is the array key, and the array value
+     *     is another array where the key is the value for that argument, and
+     *     the value is the posistion of the response. For performance reasons,
+     *     each key is built only when {@link static::setIndex()} is called with
+     *     that argument, and remains available for the lifetime of this
+     *     collection.
      */
     protected $responsesIndex = array();
 
@@ -171,7 +172,7 @@ public function getIndex()
      * Gets the whole collection as an array.
      * 
      * @param bool $useIndex Whether to use the index values as keys for the
-     * resulting array.
+     *     resulting array.
      * 
      * @return array An array with all responses, in network order.
      */
@@ -217,7 +218,7 @@ public function offsetExists($offset)
      * Gets a {@link Response} from a specified offset.
      * 
      * @param int|string $offset The offset of the desired response. If the
-     * collection is indexed, you can also supply the value to search for.
+     *     collection is indexed, you can also supply the value to search for.
      * 
      * @return Response The response at the specified offset.
      */
@@ -274,7 +275,7 @@ public function rewind()
      * Moves the position pointer to a specified position.
      * 
      * @param int|string $position The position to move to. If the collection is
-     * indexed, you can also supply a value to move the pointer to.
+     *     indexed, you can also supply a value to move the pointer to.
      * 
      * @return Response The {@link Response} at the specified position, or FALSE
      *     if the specified position is not valid.

stub.php

@@ -15,34 +15,24 @@
  * @link      http://pear2.php.net/PEAR2_Net_RouterOS
  */
 
-$isIncluded = count(get_included_files()) > 1;
 $hasArgs = $argc > 1;
-if ($isIncluded || $hasArgs) {
+if (count(get_included_files()) > 1 || $hasArgs) {
     Phar::mapPhar();
     $pkgDir = 'phar://' . __FILE__ . DIRECTORY_SEPARATOR .
             '@PACKAGE_NAME@-@PACKAGE_VERSION@' . DIRECTORY_SEPARATOR;
 
-    //Set up autoloader
-    if (class_exists('PEAR2\Autoload', true)) {
-        //Called in this fashion to avoid parse errors on PHP =< 5.3.0
-        call_user_func(
-            array('PEAR2\Autoload', 'initialize'),
-            $pkgDir . DIRECTORY_SEPARATOR . 'src'
-        );
-    } else {
-        include_once $pkgDir . DIRECTORY_SEPARATOR
-            . 'src' . DIRECTORY_SEPARATOR
-            . 'PEAR2' . DIRECTORY_SEPARATOR
-            . 'Autoload.php';
-    }
+    include_once $pkgDir . DIRECTORY_SEPARATOR
+        . 'src' . DIRECTORY_SEPARATOR
+        . 'PEAR2' . DIRECTORY_SEPARATOR
+        . 'Autoload.php';
 
     //Run console if there are any arguments
     if ($hasArgs) {
         include_once $pkgDir . DIRECTORY_SEPARATOR
             . 'bin' . DIRECTORY_SEPARATOR
             . 'roscon.php';
     }
-    unset($pkgDir, $isIncluded, $hasArgs);
+    unset($pkgDir, $hasArgs);
     return;
 }
 
@@ -84,6 +74,7 @@
 its autoloader.
 
 Exception details:
+
 HEREDOC
             . $e . "\n";
     }
@@ -96,12 +87,6 @@
 HEREDOC;
 }
 
-echo "\n" . str_repeat('=', 80) . "\n";
-echo <<<HEREDOC
-This package provides a console. To see usage instructions, rerun this file
-from the command line with "--help" as an argument.
-
-HEREDOC;
 echo "\n" . str_repeat('=', 80) . "\n";
 if (extension_loaded('openssl')) {
     echo <<<HEREDOC
@@ -168,4 +153,11 @@
 HEREDOC;
 }
 
+echo "\n" . str_repeat('=', 80) . "\n";
+echo <<<HEREDOC
+This package provides a console. To see usage instructions, rerun this file
+from the command line with "--help" as an argument.
+
+HEREDOC;
+
 __HALT_COMPILER();