[Pkg-owncloud-commits] [owncloud] 01/01: WIP: Prefer static loading to ClassLoader

[David Prévot]

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

taffit pushed a commit to branch wip/stable8
in repository owncloud.

commit 51166c23734fe228bbd21f99c4b8a647f06a3b19
Author: David Prévot <taffit at debian.org>
Date:   Tue Mar 31 21:17:26 2015 -0400

    WIP: Prefer static loading to ClassLoader
---
 debian/autoload.php | 27 +++++++++++++++++++++------
 debian/control      | 12 ++++++------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/debian/autoload.php b/debian/autoload.php
index 599dd54..d2b7fe7 100644
--- a/debian/autoload.php
+++ b/debian/autoload.php
@@ -12,12 +12,27 @@ $loader->register();
 $loader->addPrefixes(array(
 ));
 
+// Prefer loading via provided autoloader
+require_once 'Sabre/autoload.php';
+require_once 'ZipStreamer/autoload.php';
+require_once 'libphp-phpmailer/PHPMailerAutoload.php';
+require_once 'phpseclib.autoloader.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 'Pimple/autoload.php';
+
+// TODO:
+// require_once 'Doctrine/DBAL/autoload.php'; // add it in some version
+// kriswallsmith/assetic: Needs Symfony
+// phpmailer/phpmailer: maybe improve via an actual classloader
+// rackspace/php-opencloud: Needs (Guzzle that needs) Symfony
+// bantu/ini-get-wrapper
+// pear/pear_exception
+// symfony/…
+
 // 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';
diff --git a/debian/control b/debian/control
index d4255f8..a5b8626 100644
--- a/debian/control
+++ b/debian/control
@@ -19,22 +19,22 @@ Depends: libjs-handlebars,
          libjs-mediaelement,
          libjs-pdf,
          libjs-underscore (>= 1.6),
-         libphp-phpmailer,
+         libphp-phpmailer (>= 5.2.7),
          owncloud-doc,
          php-assetic,
          php-cssmin,
          php-doctrine-dbal (>= 2.5.1),
-         php-getid3 (>= 1.9.5~),
+         php-getid3 (>= 1.9.9+dfsg-2~),
          php-opencloud,
          php-patchwork-jsqueeze,
-         php-patchwork-utf8,
+         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-sabre-dav (>= 1.8.12),
+         php-seclib (>= 0.3.10-2~),
          php-symfony-class-loader,
          php-symfony-console,
          php-symfony-routing,

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