From bd375b1bf3aa0ffdd3e692ba3927fe3ecad636d3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 4 Aug 2017 11:35:21 +0200 Subject: [PATCH] Update to 1.1.0 raise dependency on PHP 7.1 switch to phpunit6 use git snapshot for sources (cherry picked from commit 073c97bcb30494987e1ce3bc76a44cd16369274d) --- .gitignore | 1 + makesrc.sh | 28 ++++++++++++++ php-doctrine-instantiator.spec | 69 +++++++++++++++++++++------------- sources | 2 +- 4 files changed, 72 insertions(+), 28 deletions(-) create mode 100755 makesrc.sh diff --git a/.gitignore b/.gitignore index cbb1713..40352bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ clog /instantiator-1.0.4.tar.gz /instantiator-1.0.5-8e884e7.tar.gz +/php-doctrine-instantiator-1.1.0-185b886.tgz diff --git a/makesrc.sh b/makesrc.sh new file mode 100755 index 0000000..87d223d --- /dev/null +++ b/makesrc.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +NAME=$(basename $PWD) +OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) +PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) +VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec) +COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) +SHORT=${COMMIT:0:7} + +echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n" + +echo "Cloning..." +rm -rf $PROJECT-$COMMIT +git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT + +echo "Getting commit..." +pushd $PROJECT-$COMMIT +git checkout $COMMIT +cp composer.json ../composer.json +popd + +echo "Archiving..." +tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT + +echo "Cleaning..." +rm -rf $PROJECT-$COMMIT + +echo "Done." diff --git a/php-doctrine-instantiator.spec b/php-doctrine-instantiator.spec index b2af8ce..be2fb43 100644 --- a/php-doctrine-instantiator.spec +++ b/php-doctrine-instantiator.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-doctrine-instantiator # -# Copyright (c) 2014-2015 Remi Collet +# Copyright (c) 2014-2017 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -9,41 +9,46 @@ # bootstrap needed when rebuilding PHPUnit for new major version %global bootstrap 0 -%global gh_commit 8e884e78f9f0eb1329e445619e04456e64d8051d +%global gh_commit 185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner doctrine %global gh_project instantiator %if %{bootstrap} -%global with_tests %{?_with_tests:1}%{!?_with_tests:0} +%global with_tests 0%{?_with_tests:1} %else -%global with_tests %{?_without_tests:0}%{!?_without_tests:1} +%global with_tests 0%{!?_without_tests:1} %endif Name: php-doctrine-instantiator -Version: 1.0.5 -Release: 4%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: Instantiate objects in PHP without invoking their constructors Group: Development/Libraries License: MIT URL: https://github.com/%{gh_owner}/%{gh_project} -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz +Source0: %{name}-%{version}-%{gh_short}.tgz +Source1: makesrc.sh BuildArch: noarch -BuildRequires: %{_bindir}/phpab +BuildRequires: php-fedora-autoloader-devel %if %{with_tests} -BuildRequires: php(language) >= 5.3 +BuildRequires: php(language) >= 7.1 BuildRequires: php-phar BuildRequires: php-pdo BuildRequires: php-reflection -BuildRequires: %{_bindir}/phpunit +BuildRequires: php-spl +BuildRequires: phpunit6 >= 6.2.3 %endif # From composer.json -# "php": ">=5.3,<8.0-DEV" -Requires: php(language) >= 5.3 -# From phpcompatinfo report for version 1.0.5 +# "php": "^7.1" +Requires: php(language) >= 7.1 +# From phpcompatinfo report for version 1.1.0 Requires: php-reflection +Requires: php-spl +# Autoloader +Requires: php-composer(fedora/autoloader) Provides: php-composer(doctrine/instantiator) = %{version} @@ -61,6 +66,7 @@ instantiating PHP classes. : Generate a simple autoloader %{_bindir}/phpab \ --output src/Doctrine/Instantiator/autoload.php \ + --template fedora \ src/Doctrine/Instantiator @@ -71,23 +77,26 @@ cp -pr src/* %{buildroot}%{_datadir}/php %check %if %{with_tests} -# "src" directory only needed for EPEL-6 : Generate autoloader +mkdir vendor %{_bindir}/phpab \ - --basedir $PWD \ - --output autoload.php \ - src tests + --output vendor/autoload.php \ + --template fedora \ + tests +cat << 'EOF' | tee -a vendor/autoload.php +require "%{buildroot}%{_datadir}/php/Doctrine/Instantiator/autoload.php"; +EOF -sed -e '/log/d' phpunit.xml.dist >phpunit.xml - -# "pear" directory only needed for EPEL-6 : Run test suite -%{_bindir}/php \ - -d include_path=".:%{buildroot}%{_datadir}/php:%{_datadir}/pear:%{_datadir}/php" \ - %{_bindir}/phpunit \ - --include-path=%{buildroot}%{_datadir}/php \ - --bootstrap autoload.php \ - --verbose +ret=0 +for cmd in php php71 php72; do + if which $cmd; then + $cmd -d include_path=".:%{buildroot}%{_datadir}/php:%{_datadir}/php" \ + %{_bindir}/phpunit6 \ + --verbose || ret=1 + fi +done +exit $ret %else : Test suite disabled %endif @@ -102,6 +111,12 @@ sed -e '/log/d' phpunit.xml.dist >phpunit.xml %changelog +* Fri Aug 4 2017 Remi Collet - 1.1.0-1 +- Update to 1.1.0 +- raise dependency on PHP 7.1 +- switch to phpunit6 +- use git snapshot for sources + * Sat Feb 11 2017 Fedora Release Engineering - 1.0.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild @@ -123,4 +138,4 @@ sed -e '/log/d' phpunit.xml.dist >phpunit.xml - update to 1.0.3 * Mon Aug 25 2014 Remi Collet - 1.0.2-1 -- initial package, version 1.0.2 \ No newline at end of file +- initial package, version 1.0.2 diff --git a/sources b/sources index 7c3556b..e972867 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3cfcd289485d451b696aa4799c38f7a1 instantiator-1.0.5-8e884e7.tar.gz +SHA512 (php-doctrine-instantiator-1.1.0-185b886.tgz) = e4870319af257742790c5d350cb8d1deff2f9260e35431f2c4b291ed13fe41aa232639a6ac1112c249ec8026980683b0aeff86f87c1e63b08ecf87f4be7348b6