From abdb0adb912be02a353b00fa57b3c4fd1f1a24c1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 30 Apr 2017 06:59:20 +0200 Subject: v1.3.0 (backported from Fedora) --- .gitignore | 7 ++++ php-composer-installers.spec | 76 ++++++++++++++++++++------------------------ 2 files changed, 42 insertions(+), 41 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1ab5c4f --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +package-*.xml +*.tgz +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/php-composer-installers.spec b/php-composer-installers.spec index 535c9c6..a5fcff9 100644 --- a/php-composer-installers.spec +++ b/php-composer-installers.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-composer-installers # -# Copyright (c) 2015-2016 Shawn Iwinski +# Copyright (c) 2015-2017 Shawn Iwinski # # License: MIT # http://opensource.org/licenses/MIT @@ -12,8 +12,8 @@ %global github_owner composer %global github_name installers -%global github_version 1.2.0 -%global github_commit d78064c68299743e0161004f2de3a0204e33b804 +%global github_version 1.3.0 +%global github_commit 79ad876c7498c0bbfe7eed065b8651c93bfd6045 %global composer_vendor composer %global composer_project installers @@ -23,6 +23,7 @@ %global composer_plugin_max_ver 2.0 # "composer/composer": "1.0.*@dev" %global composer_min_ver 1.0 +%global composer_max_ver 2.0 # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} @@ -44,25 +45,26 @@ BuildArch: noarch %if %{with_tests} ## composer.json BuildRequires: php-composer(composer-plugin-api) >= %{composer_plugin_min_ver} -BuildRequires: php-composer(composer/composer) >= %{composer_min_ver} +BuildRequires: php-composer(composer/composer) < %{composer_max_ver} +BuildRequires: php-composer(composer/composer) >= %{composer_min_ver} BuildRequires: php-composer(phpunit/phpunit) -## phpcompatinfo (computed from version 1.2.0) -BuildRequires: php(language) >= 5.3.0 +## phpcompatinfo (computed from version 1.3.0) +BuildRequires: php(language) >= 5.4.0 BuildRequires: php-pcre BuildRequires: php-spl ## Autoloader -BuildRequires: php-composer(symfony/class-loader) +BuildRequires: php-composer(fedora/autoloader) %endif # composer.json Requires: php-composer(composer-plugin-api) >= %{composer_plugin_min_ver} Requires: php-composer(composer-plugin-api) < %{composer_plugin_max_ver} -# phpcompatinfo (computed from version 1.2.0) -Requires: php(language) >= 5.3.0 +# phpcompatinfo (computed from version 1.3.0) +Requires: php(language) >= 5.4.0 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} @@ -80,6 +82,8 @@ installers isn't intended on replacing all custom installers. If your package requires special installation handling then by all means, create a custom installer to handle it. +Autoloader: %{phpdir}/Composer/Installers/autoload.php + %prep %setup -qn %{github_name}-%{github_commit} @@ -92,24 +96,14 @@ cat <<'AUTOLOAD' | tee src/Composer/Installers/autoload.php /** * Autoloader for %{name} and its' dependencies * (created by %{name}-%{version}-%{release}). - * - * @return \Symfony\Component\ClassLoader\ClassLoader */ +require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; -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'; - } - - $fedoraClassLoader = new \Symfony\Component\ClassLoader\ClassLoader(); - $fedoraClassLoader->register(); -} - -$fedoraClassLoader->addPrefix('Composer\\Installers\\', dirname(dirname(__DIR__))); +\Fedora\Autoloader\Autoload::addPsr4('Composer\\Installers\\', __DIR__); -require_once '%{phpdir}/Composer/autoload.php'; - -return $fedoraClassLoader; +\Fedora\Autoloader\Dependencies::required(array( + '%{phpdir}/Composer/autoload.php', +)); AUTOLOAD @@ -124,24 +118,18 @@ cp -rp src/Composer %{buildroot}%{phpdir}/ cat <<'BOOTSTRAP' | tee bootstrap.php addPrefix('Composer\\Installers\\Test\\', __DIR__ . '/tests'); +\Fedora\Autoloader\Autoload::addPsr4('Composer\\Installers\\Test\\', __DIR__.'/tests/Composer/Installers/Test'); BOOTSTRAP -: Run tests -run=0 -ret=0 -if which php56; then - php56 %{_bindir}/phpunit --bootstrap bootstrap.php || ret=1 - run=1 -fi -if which php71; then - php71 %{_bindir}/phpunit --bootstrap bootstrap.php || ret=1 - run=1 -fi -if [ $run -eq 0 ]; then -%{_bindir}/phpunit --verbose --bootstrap bootstrap.php -fi -exit $ret +: Upstream tests +RETURN_CODE=0 +for PHP_EXEC in php %{?rhel:php55} php56 php70 php71 php72; do + if [ "php" == "$PHP_EXEC" ] || which $PHP_EXEC; then + $PHP_EXEC %{_bindir}/phpunit --verbose --bootstrap bootstrap.php \ + || RETURN_CODE=1 + fi +done +exit $RETURN_CODE %else : Tests skipped %endif @@ -156,6 +144,12 @@ exit $ret %changelog +* Sat Apr 29 2017 Shawn Iwinski - 1.3.0-1 +- Updated to 1.3.0 (RHBZ #1444845) +- Added max version constraint to php-composer(composer/composer) dependency +- Switched autoloader to php-composer(fedora/autoloader) +- Test with SCLs if available + * Sun Sep 11 2016 Shawn Iwinski - 1.2.0-1 - Updated to 1.2.0 (RHBZ #1372115) -- cgit