switch to fedora-autoloader
This commit is contained in:
parent
7343578e64
commit
76950e3485
1 changed files with 14 additions and 20 deletions
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
Name: php-%{composer_vendor}-%{composer_project}
|
||||
Version: %{github_version}
|
||||
Release: 2%{?github_release}%{?dist}
|
||||
Release: 3%{?github_release}%{?dist}
|
||||
Summary: A set of code generator utilities built on top of PHP-Parsers
|
||||
|
||||
Group: Development/Libraries
|
||||
|
|
@ -49,7 +49,7 @@ BuildRequires: php-pcre
|
|||
BuildRequires: php-reflection
|
||||
BuildRequires: php-spl
|
||||
# Autoloader
|
||||
BuildRequires: php-composer(symfony/class-loader)
|
||||
BuildRequires: php-composer(fedora/autoloader)
|
||||
%endif
|
||||
|
||||
# composer.json
|
||||
|
|
@ -60,7 +60,7 @@ Requires: php-nikic-php-parser
|
|||
Requires: php-pcre
|
||||
Requires: php-spl
|
||||
# Autoloader
|
||||
Requires: php-composer(symfony/class-loader)
|
||||
Requires: php-composer(fedora/autoloader)
|
||||
|
||||
# Composer
|
||||
Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version}
|
||||
|
|
@ -87,21 +87,12 @@ cat <<'AUTOLOAD' | tee src/CodeGenerationUtils/autoload.php
|
|||
* @return \Symfony\Component\ClassLoader\ClassLoader
|
||||
*/
|
||||
|
||||
if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Component\ClassLoader\ClassLoader)) {
|
||||
if (!class_exists('Symfony\\Component\\ClassLoader\\ClassLoader', false)) {
|
||||
require_once '%{phpdir}/Symfony/Component/ClassLoader/ClassLoader.php';
|
||||
}
|
||||
require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
|
||||
|
||||
$fedoraClassLoader = new \Symfony\Component\ClassLoader\ClassLoader();
|
||||
$fedoraClassLoader->register();
|
||||
}
|
||||
|
||||
$fedoraClassLoader->addPrefix('CodeGenerationUtils\\', dirname(__DIR__));
|
||||
|
||||
// Required dependency
|
||||
require_once '%{phpdir}/PhpParser2/autoload.php';
|
||||
|
||||
return $fedoraClassLoader;
|
||||
\Fedora\Autoloader\Autoload::addPsr4('CodeGenerationUtils\\', __DIR__);
|
||||
\Fedora\Autoloader\Dependencies::required(array(
|
||||
'%{phpdir}/PhpParser2/autoload.php',
|
||||
));
|
||||
AUTOLOAD
|
||||
|
||||
|
||||
|
|
@ -115,9 +106,9 @@ cp -rp src/CodeGenerationUtils %{buildroot}%{phpdir}/
|
|||
: Create tests bootstrap
|
||||
cat <<'BOOTSTRAP' | tee bootstrap.php
|
||||
<?php
|
||||
$fedoraClassLoader = require '%{buildroot}%{phpdir}/CodeGenerationUtils/autoload.php';
|
||||
$fedoraClassLoader->addPrefix('CodeGenerationUtilsTest\\', __DIR__.'/tests');
|
||||
$fedoraClassLoader->addPrefix('CodeGenerationUtilsTestAsset\\', __DIR__.'/tests');
|
||||
require '%{buildroot}%{phpdir}/CodeGenerationUtils/autoload.php';
|
||||
\Fedora\Autoloader\Autoload::addPsr4('CodeGenerationUtilsTest\\', __DIR__.'/tests/CodeGenerationUtilsTests');
|
||||
\Fedora\Autoloader\Autoload::addPsr4('CodeGenerationUtilsTestAsset\\', __DIR__.'/tests/CodeGenerationUtilsTestAsset');
|
||||
BOOTSTRAP
|
||||
|
||||
%{_bindir}/phpunit --verbose --bootstrap bootstrap.php
|
||||
|
|
@ -135,6 +126,9 @@ BOOTSTRAP
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Feb 22 2017 Remi Collet <remi@fedoraproject.org> - 0.4.0-3
|
||||
- switch to fedora-autoloader
|
||||
|
||||
* Wed Feb 22 2017 Remi Collet <remi@fedoraproject.org> - 0.4.0-2
|
||||
- implicitly requires php-nikic-php-parser (v2)
|
||||
- fix FTBFS #1424073
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue