switch from symfony/class-loader to fedora/autoloader

This commit is contained in:
Remi Collet 2016-10-21 13:23:35 +02:00
commit 45dae16d85
2 changed files with 10 additions and 13 deletions

View file

@ -1,15 +1,9 @@
<?php
/* Autoloader for composer/ca-bundle and its dependencies */
$vendorDir = '/usr/share/php';
// Use Symfony autoloader
if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Component\ClassLoader\ClassLoader)) {
if (!class_exists('Symfony\\Component\\ClassLoader\\ClassLoader', false)) {
require_once $vendorDir . '/Symfony/Component/ClassLoader/ClassLoader.php';
}
$fedoraClassLoader = new \Symfony\Component\ClassLoader\ClassLoader();
$fedoraClassLoader->register();
if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
}
$fedoraClassLoader->addPrefix('Composer\\CaBundle\\', dirname(dirname(__DIR__)));
\Fedora\Autoloader\Autoload::addPsr4('Composer\\CaBundle\\', __DIR__);

View file

@ -15,7 +15,7 @@
Name: php-composer-ca-bundle
Version: 1.0.4
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Lets you find a path to the system CA
Group: Development/Libraries
@ -37,7 +37,7 @@ BuildRequires: php-openssl
BuildRequires: php-pcre
BuildRequires: php-cli
# Autoloader
BuildRequires: php-composer(symfony/class-loader)
BuildRequires: php-composer(fedora/autoloader)
# ca-certificates
BuildRequires: %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
%endif
@ -52,7 +52,7 @@ Requires: php-pcre
# From phpcompatinfo report for version 1.0.3
#nothing
# Autoloader
Requires: php-composer(symfony/class-loader)
Requires: php-composer(fedora/autoloader)
# ca-certificates
Requires: %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
@ -114,6 +114,9 @@ echo "OK\n";
%changelog
* Thu Oct 20 2016 Remi Collet <remi@fedoraproject.org> - 1.0.4-2
- switch from symfony/class-loader to fedora/autoloader
* Mon Sep 5 2016 Remi Collet <remi@fedoraproject.org> - 1.0.4-1
- update to 1.0.4 (no change)