diff --git a/.gitignore b/.gitignore index 63f8369..40352bd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,9 +2,3 @@ clog /instantiator-1.0.4.tar.gz /instantiator-1.0.5-8e884e7.tar.gz /php-doctrine-instantiator-1.1.0-185b886.tgz -/php-doctrine-instantiator-1.2.0-a2c5901.tgz -/php-doctrine-instantiator-1.3.0-ae466f7.tgz -/php-doctrine-instantiator-1.3.1-f350df0.tgz -/php-doctrine-instantiator-1.4.0-d56bf61.tgz -/php-doctrine-instantiator-1.4.1-10dcfce.tgz -/php-doctrine-instantiator-1.5.0-0a0fa97.tgz diff --git a/composer.json b/composer.json deleted file mode 100644 index 1ce3473..0000000 --- a/composer.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "name": "doctrine/instantiator", - "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "type": "library", - "license": "MIT", - "homepage": "https://www.doctrine-project.org/projects/instantiator.html", - "keywords": [ - "instantiate", - "constructor" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "homepage": "https://ocramius.github.io/" - } - ], - "require": { - "php": "^7.1 || ^8.0" - }, - "require-dev": { - "ext-phar": "*", - "ext-pdo": "*", - "doctrine/coding-standard": "^8.0", - "phpbench/phpbench": "^0.13 || 1.0.0-alpha2", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-phpunit": "^0.12", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" - }, - "autoload": { - "psr-4": { - "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" - } - }, - "autoload-dev": { - "psr-0": { - "DoctrineTest\\InstantiatorPerformance\\": "tests", - "DoctrineTest\\InstantiatorTest\\": "tests", - "DoctrineTest\\InstantiatorTestAsset\\": "tests" - } - } -} diff --git a/php-doctrine-instantiator.spec b/php-doctrine-instantiator.spec index cabacc6..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-2023 Remi Collet +# Copyright (c) 2014-2017 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -9,11 +9,10 @@ # bootstrap needed when rebuilding PHPUnit for new major version %global bootstrap 0 -%global gh_commit 0a0fa9780f5d4e507415a065172d26a98d02047b +%global gh_commit 185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner doctrine %global gh_project instantiator -%global major %nil %if %{bootstrap} %global with_tests 0%{?_with_tests:1} %else @@ -21,13 +20,14 @@ %endif Name: php-doctrine-instantiator -Version: 1.5.0 -Release: 8%{?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: php-%{gh_owner}-%{gh_project}-%{version}-%{gh_short}.tgz +Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh BuildArch: noarch @@ -38,12 +38,11 @@ BuildRequires: php-phar BuildRequires: php-pdo BuildRequires: php-reflection BuildRequires: php-spl -%global phpunit %{_bindir}/phpunit9 -BuildRequires: %{phpunit} +BuildRequires: phpunit6 >= 6.2.3 %endif # From composer.json -# "php": "^7.1 || ^8.0" +# "php": "^7.1" Requires: php(language) >= 7.1 # From phpcompatinfo report for version 1.1.0 Requires: php-reflection @@ -51,8 +50,6 @@ Requires: php-spl # Autoloader Requires: php-composer(fedora/autoloader) -Obsoletes: php-doctrine-instantiator11 < %{version}-%{release} -Provides: php-doctrine-instantiator11 = %{version}-%{release} Provides: php-composer(doctrine/instantiator) = %{version} @@ -74,8 +71,8 @@ instantiating PHP classes. %install -mkdir -p %{buildroot}%{_datadir}/php/Doctrine -cp -pr src/Doctrine/Instantiator %{buildroot}%{_datadir}/php/Doctrine/Instantiator%{major} +mkdir -p %{buildroot}%{_datadir}/php +cp -pr src/* %{buildroot}%{_datadir}/php %check @@ -88,18 +85,14 @@ mkdir vendor tests cat << 'EOF' | tee -a vendor/autoload.php require "%{buildroot}%{_datadir}/php/Doctrine/Instantiator/autoload.php"; -Fedora\Autoloader\Autoload::addPsr0('DoctrineTest\\InstantiatorPerformance\\', dirname(__DIR__).'/tests'); -Fedora\Autoloader\Autoload::addPsr0('DoctrineTest\\InstantiatorTest\\', dirname(__DIR__).'/tests'); -Fedora\Autoloader\Autoload::addPsr0('DoctrineTest\\InstantiatorTestAsset\\', dirname(__DIR__).'/tests'); EOF : Run test suite ret=0 -for cmdarg in "php %{phpunit}" php80 php81 php82; do - if which $cmdarg; then - set $cmdarg - $1 -d auto_prepend_file=vendor/autoload.php \ - ${2:-%{_bindir}/phpunit9} \ +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 @@ -110,93 +103,20 @@ exit $ret %files +%{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md composer.json %dir %{_datadir}/php/Doctrine - %{_datadir}/php/Doctrine/Instantiator%{major} + %{_datadir}/php/Doctrine/Instantiator %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 1.5.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 1.5.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 19 2024 Fedora Release Engineering - 1.5.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 1.5.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.5.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 1.5.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jan 20 2023 Fedora Release Engineering - 1.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Jan 3 2023 Remi Collet - 1.5.0-1 -- update to 1.5.0 - -* Fri Jul 22 2022 Fedora Release Engineering - 1.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Mar 3 2022 Remi Collet - 1.4.1-1 -- update to 1.4.1 - -* Fri Jan 21 2022 Fedora Release Engineering - 1.4.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.4.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 1.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Nov 12 2020 Remi Collet - 1.4.0-1 -- update to 1.4.0 (no change) -- switch to phpunit9 - -* Tue Jul 28 2020 Fedora Release Engineering - 1.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jun 2 2020 Remi Collet - 1.3.1-1 -- update to 1.3.1 (no change) -- switch to phpunit8 - -* Thu Jan 30 2020 Fedora Release Engineering - 1.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Nov 13 2019 Remi Collet - 1.3.0-1 -- update to 1.3.0 - -* Fri Jul 26 2019 Fedora Release Engineering - 1.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Mar 25 2019 Remi Collet - 1.2.0-1 -- update to 1.2.0 - -* Sat Feb 02 2019 Fedora Release Engineering - 1.1.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 1.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 1.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - * 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 -* Thu Jul 27 2017 Fedora Release Engineering - 1.0.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - * Sat Feb 11 2017 Fedora Release Engineering - 1.0.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild @@ -218,4 +138,4 @@ exit $ret - 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 32404d9..e972867 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-doctrine-instantiator-1.5.0-0a0fa97.tgz) = 0ec9c5ea6a72fcbbd1752196de849c6530a09d95c7b86bed45b67639db39d1130f03c3bf6cfa373ed063298223c995a16fe219e09d849b5ce55a64ba7817062f +SHA512 (php-doctrine-instantiator-1.1.0-185b886.tgz) = e4870319af257742790c5d350cb8d1deff2f9260e35431f2c4b291ed13fe41aa232639a6ac1112c249ec8026980683b0aeff86f87c1e63b08ecf87f4be7348b6