From f71fa8d36fbe304d2b1dbd47a91893145ad6f020 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 17:24:33 +0000 Subject: [PATCH 01/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- php-ocramius-code-generator-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index b2d088c..8714c50 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -31,7 +31,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 1%{?github_release}%{?dist} +Release: 2%{?github_release}%{?dist} Summary: A set of code generator utilities built on top of PHP-Parsers Group: Development/Libraries @@ -112,6 +112,9 @@ AUTOLOAD %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 0.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sun Aug 9 2015 Remi Collet - 0.3.2-1 - update to 0.3.2 - raise dependency on nikic/php-parser ~1.3 From 9646cf9609c5c8b7d54553ba7360bc0f824dc9ce Mon Sep 17 00:00:00 2001 From: Shawn Iwinski Date: Tue, 11 Oct 2016 20:39:43 -0400 Subject: [PATCH 02/30] Add autoloader --- php-ocramius-code-generator-utils.spec | 72 +++++++++++++++++--------- 1 file changed, 47 insertions(+), 25 deletions(-) diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index 8714c50..edd6388 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -1,7 +1,7 @@ # -# RPM spec file for php-ocramius-code-generator-utils +# Fedora spec file for php-ocramius-code-generator-utils # -# Copyright (c) 2014-2015 Shawn Iwinski +# Copyright (c) 2014-2016 Shawn Iwinski # # License: MIT # http://opensource.org/licenses/MIT @@ -24,14 +24,13 @@ %global php_parser_max_ver 2 # Build using "--without tests" to disable tests -%global with_tests %{?_without_tests:0}%{!?_without_tests:1} +%global with_tests 0%{!?_without_tests:1} -%{!?phpdir: %global phpdir %{_datadir}/php} -%{!?__phpunit: %global __phpunit %{_bindir}/phpunit} +%{!?phpdir: %global phpdir %{_datadir}/php} 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 @@ -45,7 +44,7 @@ BuildArch: noarch BuildRequires: php(language) >= %{php_min_ver} BuildRequires: php-composer(nikic/php-parser) >= %{php_parser_min_ver} BuildRequires: php-composer(nikic/php-parser) < %{php_parser_max_ver} -BuildRequires: php-phpunit-PHPUnit +BuildRequires: php-composer(phpunit/phpunit) # phpcompatinfo (computed from version 0.3.0) BuildRequires: php-pcre BuildRequires: php-reflection @@ -58,7 +57,6 @@ Requires: php-composer(nikic/php-parser) >= %{php_parser_min_ver} Requires: php-composer(nikic/php-parser) < %{php_parser_max_ver} # phpcompatinfo (computed from version 0.3.0) Requires: php-pcre -Requires: php-reflection Requires: php-spl # Composer @@ -68,37 +66,57 @@ Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version} A set of code generator utilities built on top of PHP-Parsers that ease its use when combined with Reflection. +Autoloader: %{phpdir}/CodeGenerationUtils/autoload.php + %prep %setup -qn %{github_name}-%{github_commit} %build -# Empty build section, nothing required +: Create autoloader +cat <<'AUTOLOAD' | tee src/CodeGenerationUtils/autoload.php +register(); +} + +$fedoraClassLoader->addPrefix('CodeGenerationUtils\\', dirname(__DIR__)); + +// Required dependency +require_once '%{phpdir}/PhpParser/autoload.php'; + +return $fedoraClassLoader; +AUTOLOAD %install -mkdir -pm 0755 %{buildroot}%{phpdir} -cp -rp src/* %{buildroot}%{phpdir}/ +mkdir -p %{buildroot}%{phpdir} +cp -rp src/CodeGenerationUtils %{buildroot}%{phpdir}/ %check %if %{with_tests} -# Create autoloader -cat > autoload.php <<'AUTOLOAD' +: Create tests bootstrap +cat <<'BOOTSTRAP' | tee bootstrap.php addPrefix('CodeGenerationUtilsTest\\', __DIR__.'/tests'); +BOOTSTRAP -spl_autoload_register(function ($class) { - $src = str_replace('\\', '/', $class).'.php'; - @include_once $src; -}); -AUTOLOAD - -%{__phpunit} \ - --bootstrap autoload.php \ - --include-path %{buildroot}%{phpdir}:./tests +%{_bindir}/phpunit --verbose --bootstrap bootstrap.php %else : Tests skipped %endif @@ -107,11 +125,15 @@ AUTOLOAD %files %{!?_licensedir:%global license %%doc} %license LICENSE -%doc *.md composer.json +%doc *.md +%doc composer.json %{phpdir}/CodeGenerationUtils %changelog +* Tue Oct 11 2016 Shawn Iwinski - 0.3.2-3 +- Add autoloader + * Thu Feb 04 2016 Fedora Release Engineering - 0.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 635833362914441d107c7058eb3133ac09b60c59 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 12 Oct 2016 07:21:46 +0200 Subject: [PATCH 03/30] add missing dependency for autoloader --- php-ocramius-code-generator-utils.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index edd6388..dc43e32 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -30,7 +30,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 3%{?github_release}%{?dist} +Release: 4%{?github_release}%{?dist} Summary: A set of code generator utilities built on top of PHP-Parsers Group: Development/Libraries @@ -49,6 +49,8 @@ BuildRequires: php-composer(phpunit/phpunit) BuildRequires: php-pcre BuildRequires: php-reflection BuildRequires: php-spl +# Autoloader +BuildRequires: php-composer(symfony/class-loader) %endif # composer.json @@ -58,6 +60,8 @@ Requires: php-composer(nikic/php-parser) < %{php_parser_max_ver} # phpcompatinfo (computed from version 0.3.0) Requires: php-pcre Requires: php-spl +# Autoloader +Requires: php-composer(symfony/class-loader) # Composer Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version} @@ -131,6 +135,9 @@ BOOTSTRAP %changelog +* Wed Oct 12 2016 Remi Collet - 0.3.2-4 +- add missing dependency for autoloader + * Tue Oct 11 2016 Shawn Iwinski - 0.3.2-3 - Add autoloader From de132667e25d98b9d68bc4035ca60b48ed0d8b1a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 30 Nov 2016 18:14:25 +0100 Subject: [PATCH 04/30] update to 0.4.0 - raise dependency on php ~7.0 - raise dependency on nikic/php-parser ~2.0 --- .gitignore | 1 + php-ocramius-code-generator-utils.spec | 30 +++++++++++++++----------- sources | 2 +- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 7c9fb25..14fc419 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ clog /php-ocramius-code-generator-utils-0.3.0-5d9c4e3ae36010fef22b3393b3734c84106d1d5c.tar.gz /php-ocramius-code-generator-utils-0.3.1-d27db31c975001710beb4025768dcbd39e286a56.tar.gz /php-ocramius-code-generator-utils-0.3.2-0e2f6c593fc82801cbb5c8fa90559d923bd1445c.tar.gz +/php-ocramius-code-generator-utils-0.4.0-7dc0be1dec3376d95ba094688f0d84f7cf95f300.tar.gz diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index dc43e32..1825f49 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -11,17 +11,17 @@ %global github_owner Ocramius %global github_name CodeGenerationUtils -%global github_version 0.3.2 -%global github_commit 0e2f6c593fc82801cbb5c8fa90559d923bd1445c +%global github_version 0.4.0 +%global github_commit 7dc0be1dec3376d95ba094688f0d84f7cf95f300 %global composer_vendor ocramius %global composer_project code-generator-utils -# "php": ">=5.3.3" -%global php_min_ver 5.3.3 -# "nikic/php-parser": "~1.3" -%global php_parser_min_ver 1.3 -%global php_parser_max_ver 2 +# "php": "~7.0" +%global php_min_ver 7.0 +# "nikic/php-parser": "~2.0" +%global php_parser_min_ver 2.0 +%global php_parser_max_ver 3 # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} @@ -30,7 +30,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 4%{?github_release}%{?dist} +Release: 1%{?github_release}%{?dist} Summary: A set of code generator utilities built on top of PHP-Parsers Group: Development/Libraries @@ -44,8 +44,8 @@ BuildArch: noarch BuildRequires: php(language) >= %{php_min_ver} BuildRequires: php-composer(nikic/php-parser) >= %{php_parser_min_ver} BuildRequires: php-composer(nikic/php-parser) < %{php_parser_max_ver} -BuildRequires: php-composer(phpunit/phpunit) -# phpcompatinfo (computed from version 0.3.0) +BuildRequires: php-composer(phpunit/phpunit) >= 5.0 +# phpcompatinfo (computed from version 0.4.0) BuildRequires: php-pcre BuildRequires: php-reflection BuildRequires: php-spl @@ -57,7 +57,7 @@ BuildRequires: php-composer(symfony/class-loader) Requires: php(language) >= %{php_min_ver} Requires: php-composer(nikic/php-parser) >= %{php_parser_min_ver} Requires: php-composer(nikic/php-parser) < %{php_parser_max_ver} -# phpcompatinfo (computed from version 0.3.0) +# phpcompatinfo (computed from version 0.4.0) Requires: php-pcre Requires: php-spl # Autoloader @@ -100,7 +100,7 @@ if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Compo $fedoraClassLoader->addPrefix('CodeGenerationUtils\\', dirname(__DIR__)); // Required dependency -require_once '%{phpdir}/PhpParser/autoload.php'; +require_once '%{phpdir}/PhpParser2/autoload.php'; return $fedoraClassLoader; AUTOLOAD @@ -118,6 +118,7 @@ cat <<'BOOTSTRAP' | tee bootstrap.php addPrefix('CodeGenerationUtilsTest\\', __DIR__.'/tests'); +$fedoraClassLoader->addPrefix('CodeGenerationUtilsTestAsset\\', __DIR__.'/tests'); BOOTSTRAP %{_bindir}/phpunit --verbose --bootstrap bootstrap.php @@ -135,6 +136,11 @@ BOOTSTRAP %changelog +* Wed Nov 30 2016 Remi Collet - 0.4.0-1 +- update to 0.4.0 +- raise dependency on php ~7.0 +- raise dependency on nikic/php-parser ~2.0 + * Wed Oct 12 2016 Remi Collet - 0.3.2-4 - add missing dependency for autoloader diff --git a/sources b/sources index 2f60161..b669deb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -28b56d51af6402d197517cd24c4500ae php-ocramius-code-generator-utils-0.3.2-0e2f6c593fc82801cbb5c8fa90559d923bd1445c.tar.gz +f88b1ca22a25b7412f776ba79671d242 php-ocramius-code-generator-utils-0.4.0-7dc0be1dec3376d95ba094688f0d84f7cf95f300.tar.gz From 0ad30308eaacfcfa1c3a948c70814de586009065 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 06:50:42 +0000 Subject: [PATCH 05/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- php-ocramius-code-generator-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index 1825f49..9ed39ac 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -30,7 +30,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 1%{?github_release}%{?dist} +Release: 2%{?github_release}%{?dist} Summary: A set of code generator utilities built on top of PHP-Parsers Group: Development/Libraries @@ -136,6 +136,9 @@ BOOTSTRAP %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Nov 30 2016 Remi Collet - 0.4.0-1 - update to 0.4.0 - raise dependency on php ~7.0 From 1cfcb033f38e581e1667fbf0d4fc3e906065e27b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 22 Feb 2017 15:11:31 +0100 Subject: [PATCH 06/30] swap deps. --- php-ocramius-code-generator-utils.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index 9ed39ac..2503118 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -42,8 +42,8 @@ BuildArch: noarch %if %{with_tests} # composer.json BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: php-composer(nikic/php-parser) >= %{php_parser_min_ver} BuildRequires: php-composer(nikic/php-parser) < %{php_parser_max_ver} +BuildRequires: php-composer(nikic/php-parser) >= %{php_parser_min_ver} BuildRequires: php-composer(phpunit/phpunit) >= 5.0 # phpcompatinfo (computed from version 0.4.0) BuildRequires: php-pcre @@ -55,8 +55,8 @@ BuildRequires: php-composer(symfony/class-loader) # composer.json Requires: php(language) >= %{php_min_ver} -Requires: php-composer(nikic/php-parser) >= %{php_parser_min_ver} Requires: php-composer(nikic/php-parser) < %{php_parser_max_ver} +Requires: php-composer(nikic/php-parser) >= %{php_parser_min_ver} # phpcompatinfo (computed from version 0.4.0) Requires: php-pcre Requires: php-spl From 7343578e6490488fc347129fb1c15e6094b1b437 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 22 Feb 2017 15:20:32 +0100 Subject: [PATCH 07/30] implicitly requires php-nikic-php-parser (v2) fix FTBFS #1424073 --- php-ocramius-code-generator-utils.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index 2503118..e65db1f 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -42,8 +42,7 @@ BuildArch: noarch %if %{with_tests} # composer.json BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: php-composer(nikic/php-parser) < %{php_parser_max_ver} -BuildRequires: php-composer(nikic/php-parser) >= %{php_parser_min_ver} +BuildRequires: php-nikic-php-parser BuildRequires: php-composer(phpunit/phpunit) >= 5.0 # phpcompatinfo (computed from version 0.4.0) BuildRequires: php-pcre @@ -55,8 +54,8 @@ BuildRequires: php-composer(symfony/class-loader) # composer.json Requires: php(language) >= %{php_min_ver} -Requires: php-composer(nikic/php-parser) < %{php_parser_max_ver} -Requires: php-composer(nikic/php-parser) >= %{php_parser_min_ver} +# workaround for range version +Requires: php-nikic-php-parser # phpcompatinfo (computed from version 0.4.0) Requires: php-pcre Requires: php-spl @@ -136,6 +135,10 @@ BOOTSTRAP %changelog +* Wed Feb 22 2017 Remi Collet - 0.4.0-2 +- implicitly requires php-nikic-php-parser (v2) +- fix FTBFS #1424073 + * Sat Feb 11 2017 Fedora Release Engineering - 0.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 76950e3485df5f797ae7f3f059670012f61ad45b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 22 Feb 2017 15:30:19 +0100 Subject: [PATCH 08/30] switch to fedora-autoloader --- php-ocramius-code-generator-utils.spec | 34 +++++++++++--------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index e65db1f..8febec3 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -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 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 - 0.4.0-3 +- switch to fedora-autoloader + * Wed Feb 22 2017 Remi Collet - 0.4.0-2 - implicitly requires php-nikic-php-parser (v2) - fix FTBFS #1424073 From 1a68476aa0bdf98981d991d2fad04c465dac9d02 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 23 Jun 2017 11:44:25 +0200 Subject: [PATCH 09/30] Update to 0.4.1 allow nikic/php-parser version 2 and 3 --- .gitignore | 1 + php-ocramius-code-generator-utils.spec | 38 ++++++++++++++++++-------- sources | 2 +- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 14fc419..bb1c5c3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ clog /php-ocramius-code-generator-utils-0.3.1-d27db31c975001710beb4025768dcbd39e286a56.tar.gz /php-ocramius-code-generator-utils-0.3.2-0e2f6c593fc82801cbb5c8fa90559d923bd1445c.tar.gz /php-ocramius-code-generator-utils-0.4.0-7dc0be1dec3376d95ba094688f0d84f7cf95f300.tar.gz +/php-ocramius-code-generator-utils-0.4.1-862c03de42475fe039e7d0f47966c25ac40a58a8.tar.gz diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index 8febec3..a126a90 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -11,17 +11,17 @@ %global github_owner Ocramius %global github_name CodeGenerationUtils -%global github_version 0.4.0 -%global github_commit 7dc0be1dec3376d95ba094688f0d84f7cf95f300 +%global github_version 0.4.1 +%global github_commit 862c03de42475fe039e7d0f47966c25ac40a58a8 %global composer_vendor ocramius %global composer_project code-generator-utils # "php": "~7.0" %global php_min_ver 7.0 -# "nikic/php-parser": "~2.0" +# "nikic/php-parser": "~2.0|~3.0" %global php_parser_min_ver 2.0 -%global php_parser_max_ver 3 +%global php_parser_max_ver 4 # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} @@ -30,7 +30,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 3%{?github_release}%{?dist} +Release: 1%{?github_release}%{?dist} Summary: A set of code generator utilities built on top of PHP-Parsers Group: Development/Libraries @@ -42,7 +42,8 @@ BuildArch: noarch %if %{with_tests} # composer.json BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: php-nikic-php-parser +BuildRequires: php-composer(nikic/php-parser) < %{php_parser_max_ver} +BuildRequires: php-composer(nikic/php-parser) >= %{php_parser_min_ver} BuildRequires: php-composer(phpunit/phpunit) >= 5.0 # phpcompatinfo (computed from version 0.4.0) BuildRequires: php-pcre @@ -54,8 +55,8 @@ BuildRequires: php-composer(fedora/autoloader) # composer.json Requires: php(language) >= %{php_min_ver} -# workaround for range version -Requires: php-nikic-php-parser +Requires: php-composer(nikic/php-parser) < %{php_parser_max_ver} +Requires: php-composer(nikic/php-parser) >= %{php_parser_min_ver} # phpcompatinfo (computed from version 0.4.0) Requires: php-pcre Requires: php-spl @@ -90,9 +91,12 @@ cat <<'AUTOLOAD' | tee src/CodeGenerationUtils/autoload.php require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('CodeGenerationUtils\\', __DIR__); -\Fedora\Autoloader\Dependencies::required(array( - '%{phpdir}/PhpParser2/autoload.php', -)); +\Fedora\Autoloader\Dependencies::required([ + [ + '%{phpdir}/PhpParser3/autoload.php', + '%{phpdir}/PhpParser2/autoload.php', + ], +]); AUTOLOAD @@ -111,7 +115,13 @@ require '%{buildroot}%{phpdir}/CodeGenerationUtils/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('CodeGenerationUtilsTestAsset\\', __DIR__.'/tests/CodeGenerationUtilsTestAsset'); BOOTSTRAP -%{_bindir}/phpunit --verbose --bootstrap bootstrap.php +ret=0 +for cmd in php php70 php71 php72; do + if which $cmd; then + $cmd %{_bindir}/phpunit --verbose --bootstrap bootstrap.php || ret=1 + fi +done +exit $ret %else : Tests skipped %endif @@ -126,6 +136,10 @@ BOOTSTRAP %changelog +* Fri Jun 23 2017 Remi Collet - 0.4.1-1 +- Update to 0.4.1 +- allow nikic/php-parser version 2 and 3 + * Wed Feb 22 2017 Remi Collet - 0.4.0-3 - switch to fedora-autoloader diff --git a/sources b/sources index b669deb..d7c6aa4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f88b1ca22a25b7412f776ba79671d242 php-ocramius-code-generator-utils-0.4.0-7dc0be1dec3376d95ba094688f0d84f7cf95f300.tar.gz +SHA512 (php-ocramius-code-generator-utils-0.4.1-862c03de42475fe039e7d0f47966c25ac40a58a8.tar.gz) = 06205f284aa1345e0081595b2fd6068c4de14aefb99dd4fedaf4e634dec60a0c63a08e03d1ebce84f59cfe247f40a8ea8d5ff2c6baeaf964f50f81c92e3d2431 From df029fde092923b6667556abed265936f8a81154 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 07:54:59 +0000 Subject: [PATCH 10/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- php-ocramius-code-generator-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index a126a90..a07faa1 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -30,7 +30,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 1%{?github_release}%{?dist} +Release: 2%{?github_release}%{?dist} Summary: A set of code generator utilities built on top of PHP-Parsers Group: Development/Libraries @@ -136,6 +136,9 @@ exit $ret %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 0.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Jun 23 2017 Remi Collet - 0.4.1-1 - Update to 0.4.1 - allow nikic/php-parser version 2 and 3 From 0b38ee6ea08c7f511709ef4446fd1941eeb9919d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 03:56:35 +0000 Subject: [PATCH 11/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-ocramius-code-generator-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index a07faa1..a69a2cc 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -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 @@ -136,6 +136,9 @@ exit $ret %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 0.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 0.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 14fcd70d3bc64bd6a1b38a517ee44f7bdbb8a2af Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 21:43:09 +0000 Subject: [PATCH 12/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-ocramius-code-generator-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index a69a2cc..300a06d 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -30,7 +30,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 3%{?github_release}%{?dist} +Release: 4%{?github_release}%{?dist} Summary: A set of code generator utilities built on top of PHP-Parsers Group: Development/Libraries @@ -136,6 +136,9 @@ exit $ret %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.4.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 0.4.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From a7ae218d7f2bc877ff739ecf89628d7e4c7ae30c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:11 +0100 Subject: [PATCH 13/30] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- php-ocramius-code-generator-utils.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index 300a06d..de7cfc8 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -33,7 +33,6 @@ Version: %{github_version} Release: 4%{?github_release}%{?dist} Summary: A set of code generator utilities built on top of PHP-Parsers -Group: Development/Libraries License: MIT URL: https://github.com/%{github_owner}/%{github_name} Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz From 1a5731b6993fd229d445dfe50eab7d8aafc6b1c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 03:03:10 +0000 Subject: [PATCH 14/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-ocramius-code-generator-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index de7cfc8..ba6d7d9 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -30,7 +30,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 4%{?github_release}%{?dist} +Release: 5%{?github_release}%{?dist} Summary: A set of code generator utilities built on top of PHP-Parsers License: MIT @@ -135,6 +135,9 @@ exit $ret %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 0.4.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 0.4.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 1d3c4f99fce117d17ff46e22f07c1c39a32b9283 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 09:30:25 +0000 Subject: [PATCH 15/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-ocramius-code-generator-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index ba6d7d9..49fd8c2 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -30,7 +30,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 5%{?github_release}%{?dist} +Release: 6%{?github_release}%{?dist} Summary: A set of code generator utilities built on top of PHP-Parsers License: MIT @@ -135,6 +135,9 @@ exit $ret %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 0.4.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Feb 02 2019 Fedora Release Engineering - 0.4.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 76caa02719e309b32b9af50e9a123ceed6c72431 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 07:56:51 +0000 Subject: [PATCH 16/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-ocramius-code-generator-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index 49fd8c2..1946af1 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -30,7 +30,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 6%{?github_release}%{?dist} +Release: 7%{?github_release}%{?dist} Summary: A set of code generator utilities built on top of PHP-Parsers License: MIT @@ -135,6 +135,9 @@ exit $ret %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 0.4.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 0.4.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 999a06110001179c738824858f2e865108ef2fc6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 21:34:54 +0000 Subject: [PATCH 17/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-ocramius-code-generator-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index 1946af1..85841f5 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -30,7 +30,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 7%{?github_release}%{?dist} +Release: 8%{?github_release}%{?dist} Summary: A set of code generator utilities built on top of PHP-Parsers License: MIT @@ -135,6 +135,9 @@ exit $ret %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 0.4.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jan 30 2020 Fedora Release Engineering - 0.4.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 759f5ead1a83a8b23e243026c440b429b66f073f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 07:12:57 +0000 Subject: [PATCH 18/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-ocramius-code-generator-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index 85841f5..297455d 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -30,7 +30,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 8%{?github_release}%{?dist} +Release: 9%{?github_release}%{?dist} Summary: A set of code generator utilities built on top of PHP-Parsers License: MIT @@ -135,6 +135,9 @@ exit $ret %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 0.4.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 0.4.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From f6b157ca15e07b8ab217a8559e29cfadb0a2c68f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 02:33:16 +0000 Subject: [PATCH 19/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-ocramius-code-generator-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index 297455d..e5a1c35 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -30,7 +30,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 9%{?github_release}%{?dist} +Release: 10%{?github_release}%{?dist} Summary: A set of code generator utilities built on top of PHP-Parsers License: MIT @@ -135,6 +135,9 @@ exit $ret %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.4.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 0.4.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 3dab0c16e94dab805f2a063f5b140f31a4561254 Mon Sep 17 00:00:00 2001 From: Shawn Iwinski Date: Sat, 18 Sep 2021 11:35:15 -0400 Subject: [PATCH 20/30] Add composer.json --- composer.json | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 composer.json diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..dd7fd57 --- /dev/null +++ b/composer.json @@ -0,0 +1,45 @@ +{ + "name": "ocramius/code-generator-utils", + "description": "A set of code generator utilities built on top of PHP-Parsers that ease its use when combined with Reflection", + "type": "library", + "license": "MIT", + "homepage": "https://github.com/Ocramius/CodeGenerationUtils", + "keywords": [ + "reflection", + "code generation", + "php code", + "parser", + "compiler" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "http://ocramius.github.com/" + } + ], + "require": { + "php": "~7.0", + "nikic/php-parser": "~2.0|~3.0" + }, + "require-dev": { + "phpunit/phpunit": "~5.0", + "squizlabs/php_codesniffer": "~2.0" + }, + "autoload": { + "psr-4": { + "CodeGenerationUtils\\": "src/CodeGenerationUtils" + } + }, + "autoload-dev": { + "psr-4": { + "CodeGenerationUtilsTests\\": "tests/CodeGenerationUtilsTests", + "CodeGenerationUtilsTestAsset\\": "tests/CodeGenerationUtilsTestAsset" + } + }, + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + } +} From 8c40c858743892e39ac38767b1979fca8bd42e82 Mon Sep 17 00:00:00 2001 From: Shawn Iwinski Date: Sat, 18 Sep 2021 13:50:50 -0400 Subject: [PATCH 21/30] Update to 1.2.0 (RHBZ #1674220) - Fix "FTBFS in Fedora rawhide/f35" (RHBZ #1987840) --- .gitignore | 1 + composer.json | 14 ++-- ...cramius-code-generator-utils-get-source.sh | 73 +++++++++++++++++++ php-ocramius-code-generator-utils.spec | 67 +++++++++-------- sources | 2 +- 5 files changed, 121 insertions(+), 36 deletions(-) create mode 100755 php-ocramius-code-generator-utils-get-source.sh diff --git a/.gitignore b/.gitignore index bb1c5c3..1ca792f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ clog /php-ocramius-code-generator-utils-0.3.2-0e2f6c593fc82801cbb5c8fa90559d923bd1445c.tar.gz /php-ocramius-code-generator-utils-0.4.0-7dc0be1dec3376d95ba094688f0d84f7cf95f300.tar.gz /php-ocramius-code-generator-utils-0.4.1-862c03de42475fe039e7d0f47966c25ac40a58a8.tar.gz +/php-ocramius-code-generator-utils-1.2.0-02aab6ab303c93f60915d0f6d4ffaf0381a6671b.tar.gz diff --git a/composer.json b/composer.json index dd7fd57..6d767ab 100644 --- a/composer.json +++ b/composer.json @@ -19,12 +19,16 @@ } ], "require": { - "php": "~7.0", - "nikic/php-parser": "~2.0|~3.0" + "php": "^8.0", + "nikic/php-parser": "^4.10.4" }, "require-dev": { - "phpunit/phpunit": "~5.0", - "squizlabs/php_codesniffer": "~2.0" + "doctrine/coding-standard": "^8.2.0", + "phpunit/phpunit": "^9.5.1", + "psalm/plugin-phpunit": "^0.15.0", + "roave/infection-static-analysis-plugin": "^1.7", + "squizlabs/php_codesniffer": "^3.5.8", + "vimeo/psalm": "^4.4.1" }, "autoload": { "psr-4": { @@ -33,7 +37,7 @@ }, "autoload-dev": { "psr-4": { - "CodeGenerationUtilsTests\\": "tests/CodeGenerationUtilsTests", + "CodeGenerationUtilsTests\\": "tests/CodeGenerationUtilsTest", "CodeGenerationUtilsTestAsset\\": "tests/CodeGenerationUtilsTestAsset" } }, diff --git a/php-ocramius-code-generator-utils-get-source.sh b/php-ocramius-code-generator-utils-get-source.sh new file mode 100755 index 0000000..b2ac62b --- /dev/null +++ b/php-ocramius-code-generator-utils-get-source.sh @@ -0,0 +1,73 @@ +#/bin/sh + +GIT=`which git` +RPM=`which rpm` + +if [ -z "$GIT" ] +then + echo "ERROR: 'git' command not found" 1>&2 + exit 1 +elif [ -z "$RPM" ] +then + echo "ERROR: 'rpm' command not found" 1>&2 + exit 1 +fi + +function print { + echo -e "\e[0;33m>>>>> ${1}\e[0m" +} + +if [ -x "$1" ] +then + SPEC=$1 +else + SPEC=`ls *.spec | head -1` +fi + +SPEC_DIR=`pwd` + +print "SPEC_DIR = $SPEC_DIR" + +NAME=`echo $SPEC | sed 's#\.spec##'` +VERSION=`egrep '%global\s*github_version' $SPEC | awk '{print $3}'` + +print "SPEC = $SPEC" +print "NAME = $NAME" + +GIT_OWNER=`egrep '%global\s*github_owner' $SPEC | awk '{print $3}'` +GIT_NAME=`egrep '%global\s*github_name' $SPEC | awk '{print $3}'` +GIT_COMMIT=`egrep '%global\s*github_commit' $SPEC | awk '{print $3}'` +GIT_REPO=https://github.com/${GIT_OWNER}/${GIT_NAME} +GIT_DIR=`echo $GIT_REPO | sed 's#.*/##'` + +print "GIT_OWNER = $GIT_OWNER" +print "GIT_NAME = $GIT_NAME" +print "GIT_COMMIT = $GIT_COMMIT" +print "GIT_REPO = $GIT_REPO" +print "GIT_DIR = $GIT_DIR" + +TEMP_DIR=$(mktemp --dir) + +pushd $TEMP_DIR + print "Cloning git repo..." + $GIT clone $GIT_REPO + + pushd $GIT_DIR + print "Checking out commit..." + $GIT checkout $GIT_COMMIT + popd + + TAR_DIR=${GIT_NAME}-${GIT_COMMIT} + print "TAR_DIR = $TAR_DIR" + + mv $GIT_DIR $TAR_DIR + + TAR_FILE=${SPEC_DIR}/${NAME}-${VERSION}-${GIT_COMMIT}.tar.gz + print "TAR_FILE = $TAR_FILE" + + [ -e $TAR_FILE ] && rm -f $TAR_FILE + tar --exclude-vcs -czf $TAR_FILE $TAR_DIR + chmod 0644 $TAR_FILE +popd + +rm -rf $TEMP_DIR diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index e5a1c35..fee3c0f 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -1,7 +1,7 @@ # # Fedora spec file for php-ocramius-code-generator-utils # -# Copyright (c) 2014-2016 Shawn Iwinski +# Copyright (c) 2014-2021 Shawn Iwinski # # License: MIT # http://opensource.org/licenses/MIT @@ -11,40 +11,43 @@ %global github_owner Ocramius %global github_name CodeGenerationUtils -%global github_version 0.4.1 -%global github_commit 862c03de42475fe039e7d0f47966c25ac40a58a8 +%global github_version 1.2.0 +%global github_commit 02aab6ab303c93f60915d0f6d4ffaf0381a6671b %global composer_vendor ocramius %global composer_project code-generator-utils -# "php": "~7.0" -%global php_min_ver 7.0 -# "nikic/php-parser": "~2.0|~3.0" -%global php_parser_min_ver 2.0 -%global php_parser_max_ver 4 +# "php": "^8.0" +%global php_min_ver 8.0 +# "nikic/php-parser": "^4.10.4" +%global php_parser_min_ver 4.10.4 +%global php_parser_max_ver 5 # Build using "--without tests" to disable tests -%global with_tests 0%{!?_without_tests:1} +%bcond_without tests %{!?phpdir: %global phpdir %{_datadir}/php} Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 10%{?github_release}%{?dist} +Release: 1%{?github_release}%{?dist} Summary: A set of code generator utilities built on top of PHP-Parsers License: MIT URL: https://github.com/%{github_owner}/%{github_name} -Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz + +# GitHub export does not include tests. +# Run php-ocramius-code-generator-utils-get-source.sh to create full source. +Source0: %{name}-%{github_version}-%{github_commit}.tar.gz +Source1: %{name}-get-source.sh BuildArch: noarch -%if %{with_tests} +%if %{with tests} # composer.json BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: php-composer(nikic/php-parser) < %{php_parser_max_ver} -BuildRequires: php-composer(nikic/php-parser) >= %{php_parser_min_ver} -BuildRequires: php-composer(phpunit/phpunit) >= 5.0 -# phpcompatinfo (computed from version 0.4.0) +BuildRequires: phpunit9 +BuildRequires: (php-composer(nikic/php-parser) >= %{php_parser_min_ver} with php-composer(nikic/php-parser) < %{php_parser_max_ver}) +# phpcompatinfo (computed from version 1.2.0) BuildRequires: php-pcre BuildRequires: php-reflection BuildRequires: php-spl @@ -54,10 +57,10 @@ BuildRequires: php-composer(fedora/autoloader) # composer.json Requires: php(language) >= %{php_min_ver} -Requires: php-composer(nikic/php-parser) < %{php_parser_max_ver} -Requires: php-composer(nikic/php-parser) >= %{php_parser_min_ver} -# phpcompatinfo (computed from version 0.4.0) +Requires: (php-composer(nikic/php-parser) >= %{php_parser_min_ver} with php-composer(nikic/php-parser) < %{php_parser_max_ver}) +# phpcompatinfo (computed from version 1.2.0) Requires: php-pcre +Requires: php-reflection Requires: php-spl # Autoloader Requires: php-composer(fedora/autoloader) @@ -90,11 +93,9 @@ cat <<'AUTOLOAD' | tee src/CodeGenerationUtils/autoload.php require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('CodeGenerationUtils\\', __DIR__); + \Fedora\Autoloader\Dependencies::required([ - [ - '%{phpdir}/PhpParser3/autoload.php', - '%{phpdir}/PhpParser2/autoload.php', - ], + '%{phpdir}/PhpParser4/autoload.php', ]); AUTOLOAD @@ -105,7 +106,7 @@ cp -rp src/CodeGenerationUtils %{buildroot}%{phpdir}/ %check -%if %{with_tests} +%if %{with tests} : Create tests bootstrap cat <<'BOOTSTRAP' | tee bootstrap.php - 1.2.0-1 +- Update to 1.2.0 (RHBZ #1674220) +- Fix "FTBFS in Fedora rawhide/f35" (RHBZ #1987840) + * Fri Jul 23 2021 Fedora Release Engineering - 0.4.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index d7c6aa4..875ea8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-ocramius-code-generator-utils-0.4.1-862c03de42475fe039e7d0f47966c25ac40a58a8.tar.gz) = 06205f284aa1345e0081595b2fd6068c4de14aefb99dd4fedaf4e634dec60a0c63a08e03d1ebce84f59cfe247f40a8ea8d5ff2c6baeaf964f50f81c92e3d2431 +SHA512 (php-ocramius-code-generator-utils-1.2.0-02aab6ab303c93f60915d0f6d4ffaf0381a6671b.tar.gz) = 1caeda4e233c0556239e7caa5b9cf2ae35dd0c0b32d738ddfb588b4111f08daeec9d606b2465e66bc8cd59763abbf9a774a9ccdb50c071a4c670200a70e771a1 From 9ac6a89c71ab3ff05950e581484e293fe39bc0a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 07:55:59 +0000 Subject: [PATCH 22/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-ocramius-code-generator-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index fee3c0f..82c9fe0 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -30,7 +30,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 1%{?github_release}%{?dist} +Release: 2%{?github_release}%{?dist} Summary: A set of code generator utilities built on top of PHP-Parsers License: MIT @@ -138,6 +138,9 @@ exit $RETURN_CODE %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sat Sep 18 2021 Shawn Iwinski - 1.2.0-1 - Update to 1.2.0 (RHBZ #1674220) - Fix "FTBFS in Fedora rawhide/f35" (RHBZ #1987840) From 917bd1d8e5e03115bc226c573578ce6631891eda Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 13:49:48 +0000 Subject: [PATCH 23/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-ocramius-code-generator-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index 82c9fe0..52cf81b 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -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 License: MIT @@ -138,6 +138,9 @@ exit $RETURN_CODE %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 1.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jan 21 2022 Fedora Release Engineering - 1.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From f37f0a34c918d1335c4a6638226dd988b12a9633 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 08:51:23 +0000 Subject: [PATCH 24/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-ocramius-code-generator-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index 52cf81b..3e44e81 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -30,7 +30,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 3%{?github_release}%{?dist} +Release: 4%{?github_release}%{?dist} Summary: A set of code generator utilities built on top of PHP-Parsers License: MIT @@ -138,6 +138,9 @@ exit $RETURN_CODE %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 1.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 1.2.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From aa613f4ec86c134535c62c0112d4d3255f8b8769 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 04:30:12 +0000 Subject: [PATCH 25/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-ocramius-code-generator-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index 3e44e81..0e5ab62 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -30,7 +30,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 4%{?github_release}%{?dist} +Release: 5%{?github_release}%{?dist} Summary: A set of code generator utilities built on top of PHP-Parsers License: MIT @@ -138,6 +138,9 @@ exit $RETURN_CODE %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 1.2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jan 20 2023 Fedora Release Engineering - 1.2.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 51264867bd9bb95f77f045eca4d43ac3046c176f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 21:00:12 +0000 Subject: [PATCH 26/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-ocramius-code-generator-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index 0e5ab62..b81651a 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -30,7 +30,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 5%{?github_release}%{?dist} +Release: 6%{?github_release}%{?dist} Summary: A set of code generator utilities built on top of PHP-Parsers License: MIT @@ -138,6 +138,9 @@ exit $RETURN_CODE %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 1.2.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jul 21 2023 Fedora Release Engineering - 1.2.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 8e4004a5e38cbad69a9768b92ae550abf786cd21 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 22:47:01 +0000 Subject: [PATCH 27/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-ocramius-code-generator-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index b81651a..dff9e53 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -30,7 +30,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 6%{?github_release}%{?dist} +Release: 7%{?github_release}%{?dist} Summary: A set of code generator utilities built on top of PHP-Parsers License: MIT @@ -138,6 +138,9 @@ exit $RETURN_CODE %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 1.2.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 1.2.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 4a5fd5ab0ab35622c77e5c4cae0550bf30e074dc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 07:01:08 +0000 Subject: [PATCH 28/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- php-ocramius-code-generator-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index dff9e53..115e89e 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -30,7 +30,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 7%{?github_release}%{?dist} +Release: 8%{?github_release}%{?dist} Summary: A set of code generator utilities built on top of PHP-Parsers License: MIT @@ -138,6 +138,9 @@ exit $RETURN_CODE %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 1.2.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 1.2.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 9a26420aaf3da4498d815617ee8b9fdf9f932d44 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 09:12:41 +0000 Subject: [PATCH 29/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- php-ocramius-code-generator-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index 115e89e..7efafe1 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -30,7 +30,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 8%{?github_release}%{?dist} +Release: 9%{?github_release}%{?dist} Summary: A set of code generator utilities built on top of PHP-Parsers License: MIT @@ -138,6 +138,9 @@ exit $RETURN_CODE %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 1.2.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 19 2024 Fedora Release Engineering - 1.2.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From e6d0ccb671a6eff96ee1f904bec130f2a920a2c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:16:25 +0000 Subject: [PATCH 30/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- php-ocramius-code-generator-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index 7efafe1..e0637a6 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -30,7 +30,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 9%{?github_release}%{?dist} +Release: 10%{?github_release}%{?dist} Summary: A set of code generator utilities built on top of PHP-Parsers License: MIT @@ -138,6 +138,9 @@ exit $RETURN_CODE %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.2.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jan 18 2025 Fedora Release Engineering - 1.2.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild