[Pkg-owncloud-commits] [owncloud] 01/02: Load third party via existing autoloader

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit f658ab1b09c8f374b773810aeca17a112d349b81
Author: David Prévot <taffit at debian.org>
Date:   Thu Feb 26 16:07:47 2015 -0400

    Load third party via existing autoloader
    
    Prefer that to the previous usage of ClassLoader element from Symfony.
---
 debian/autoload.php | 59 +++++++++++++++++++++++++++++++++++------------------
 debian/control      | 26 +++++++++++------------
 2 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/debian/autoload.php b/debian/autoload.php
index 599dd54..dc86012 100644
--- a/debian/autoload.php
+++ b/debian/autoload.php
@@ -1,23 +1,42 @@
 <?php
+// Prefer loading via existing autoloader
+require_once 'Sabre/autoload.php';
+require_once 'Doctrine/DBAL/autoload.php';
+require_once 'ZipStreamer/autoload.php';
+require_once 'Assetic/autoload.php';
+require_once 'libphp-phpmailer/PHPMailerAutoload.php';
+require_once 'phpseclib.autoloader.php';
+require_once 'OpenCloud/autoload.php';
+require_once 'getid3/autoload.php';
+require_once 'RandomLib/autoload.php';
+require_once 'CssMin.classmap.php';
+require_once 'Punic/autoload.php';
+require_once 'Patchwork/Utf8/autoload.php';
+require_once 'Symfony/Component/Console/autoload.php';
+require_once 'Symfony/Component/Routing/autoload.php';
+require_once 'Pimple/autoload.php';
+require_once 'Patchwork/JSqueeze.autoload.php';
 
-// Work around the lack of proper autoload.php from composer by using
-// the ClassLoader element from Symfony.
-// http://symfony.com/doc/current/components/class_loader/class_loader.html
-
-require_once 'Symfony/Component/ClassLoader/ClassLoader.php';
-use Symfony\Component\ClassLoader\ClassLoader;
-$loader = new ClassLoader();
-$loader->setUseIncludePath(true);
-$loader->register();
-$loader->addPrefixes(array(
-));
+// Load bantu/ini-get-wrapper, pear/archive_tar, and pear/pear_exception,
+// as generated via phpab:
 
-// Load additional files as registered in composer
-require_once 'getid3/getid3.php';
-require_once 'libphp-phpmailer/class.phpmailer.php';
-require_once 'libphp-phpmailer/class.pop3.php';
-require_once 'libphp-phpmailer/class.smtp.php';
-require_once 'Assetic/functions.php';
-require_once 'Crypt/Random.php';
-require_once 'Archive/Tar.php';
-require_once 'CssMin.classmap.php';
+// @codingStandardsIgnoreFile
+// @codeCoverageIgnoreStart
+// this is an autogenerated file - do not edit
+spl_autoload_register(
+    function($class) {
+        static $classes = null;
+        if ($classes === null) {
+            $classes = array(
+                'bantu\\inigetwrapper\\inigetwrapper' => '/bantu/IniGetWrapper/IniGetWrapper.php',
+                'archive_tar' => '/../../php/Archive/Tar.php',
+                'pear_exception' => '/../../php/PEAR/Exception.php'
+            );
+        }
+        $cn = strtolower($class);
+        if (isset($classes[$cn])) {
+            require __DIR__ . $classes[$cn];
+        }
+    }
+);
+// @codeCoverageIgnoreEnd
diff --git a/debian/control b/debian/control
index fcc766e..8ef6628 100644
--- a/debian/control
+++ b/debian/control
@@ -19,26 +19,24 @@ Depends: libjs-handlebars,
          libjs-mediaelement,
          libjs-pdf,
          libjs-underscore (>= 1.6),
-         libphp-phpmailer,
+         libphp-phpmailer (>= 5.2.7),
          owncloud-doc,
-         php-assetic,
+         php-assetic (>= 1.2.1-2~),
          php-cssmin,
-         php-doctrine-dbal (<< 2.5),
-         php-doctrine-dbal (>= 2.4),
-         php-getid3 (>= 1.9.5~),
-         php-opencloud,
-         php-patchwork-jsqueeze,
-         php-patchwork-utf8,
+         php-doctrine-dbal (>= 2.5.1-2~),
+         php-getid3 (>= 1.9.9+dfsg-2~),
+         php-opencloud (>= 1.13.0),
+         php-patchwork-jsqueeze (>= 2.0.2),
+         php-patchwork-utf8 (>= 1.2.1-2~),
          php-pear,
-         php-pimple (>= 3),
+         php-pimple (>= 3.0.0-2~),
          php-punic,
          php-randomlib,
          php-sabre-dav (<< 1.9),
-         php-sabre-dav (>= 1.8),
-         php-seclib,
-         php-symfony-class-loader,
-         php-symfony-console,
-         php-symfony-routing,
+         php-sabre-dav (>= 1.8.12),
+         php-seclib (>= 0.3.10-2~),
+         php-symfony-console (>= 2.6.6+dfsg-2~),
+         php-symfony-routing (>= 2.6.6+dfsg-2~),
          php-zipstreamer,
          php5 (>= 5.5.0),
          php5-cli,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git