Re-dump autoloader and composer.lock

lib/pear/pear-core-minimal/README.rst

@@ -17,10 +17,5 @@ Included files
 ==============
 - ``OS/Guess.php``
 - ``PEAR.php``
-- ``PEAR/Error.php``
 - ``PEAR/ErrorStack.php``
 - ``System.php``
-
-
-``PEAR/Error.php`` is a dummy file that only includes ``PEAR.php``,
-to make autoloaders work without problems.

lib/pear/pear-core-minimal/composer.json

@@ -10,9 +10,9 @@
         }
     ],
     "autoload": {
-        "psr-0": {
-            "": "src/"
-        }
+        "classmap": [
+            "src/"
+        ]
     },
     "include-path": [
         "src/"
@@ -23,6 +23,7 @@
     },
     "type": "library",
     "require": {
+        "php": ">=5.4",
         "pear/console_getopt": "~1.4",
         "pear/pear_exception": "~1.0"
     },

lib/pear/pear-core-minimal/src/OS/Guess.php

@@ -245,7 +245,7 @@ class OS_Guess
             return array();
         }
         if (!@file_exists('/usr/bin/cpp') || !@is_executable('/usr/bin/cpp')) {
-            return $this-_parseFeaturesHeaderFile($features_header_file);
+            return $this->_parseFeaturesHeaderFile($features_header_file);
         } // no cpp
 
         return $this->_fromGlibCTest();

lib/pear/pear-core-minimal/src/PEAR.php

@@ -49,7 +49,9 @@ $GLOBALS['_PEAR_destructor_object_list'] = array();
 $GLOBALS['_PEAR_shutdown_funcs']         = array();
 $GLOBALS['_PEAR_error_handler_stack']    = array();
 
-@ini_set('track_errors', true);
+if(function_exists('ini_set')) {
+    @ini_set('track_errors', true);
+}
 
 /**
  * Base class for other PEAR classes.  Provides rudimentary
@@ -219,7 +221,7 @@ class PEAR
             );
         }
         return call_user_func_array(
-            array(get_class(), '_' . $method),
+            array(__CLASS__, '_' . $method),
             array_merge(array($this), $arguments)
         );
     }
@@ -232,7 +234,7 @@ class PEAR
             );
         }
         return call_user_func_array(
-            array(get_class(), '_' . $method),
+            array(__CLASS__, '_' . $method),
             array_merge(array(null), $arguments)
         );
     }
@@ -859,6 +861,7 @@ class PEAR_Error
     var $message              = '';
     var $userinfo             = '';
     var $backtrace            = null;
+    var $callback             = null;
 
     /**
      * PEAR_Error constructor

lib/pear/pear-core-minimal/src/PEAR/Error.php

@@ -1,14 +0,0 @@
-<?php
-/**
- * Dummy file to make autoloaders work
- *
- * PHP version 5
- *
- * @category PEAR
- * @package  PEAR
- * @author   Christian Weiske <cweiske@php.net>
- * @license  http://opensource.org/licenses/bsd-license.php New BSD License
- * @link     http://pear.php.net/package/PEAR
- */
-require_once __DIR__ . '/../PEAR.php';
-?>