diff options
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-ocramius-code-generator-utils-dev.spec | 172 | ||||
| -rw-r--r-- | php-ocramius-code-generator-utils.spec | 89 |
4 files changed, 60 insertions, 210 deletions
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/composer.json b/composer.json index e74f4b5..dd7fd57 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ ], "require": { "php": "~7.0", - "nikic/php-parser": "~2.0" + "nikic/php-parser": "~2.0|~3.0" }, "require-dev": { "phpunit/phpunit": "~5.0", diff --git a/php-ocramius-code-generator-utils-dev.spec b/php-ocramius-code-generator-utils-dev.spec deleted file mode 100644 index 44162fa..0000000 --- a/php-ocramius-code-generator-utils-dev.spec +++ /dev/null @@ -1,172 +0,0 @@ -# remirepo spec file for php-ocramius-code-generator-utils, from -# -# Fedora spec file for php-ocramius-code-generator-utils -# -# Copyright (c) 2014-2016 Shawn Iwinski <shawn.iwinski@gmail.com> -# -# License: MIT -# http://opensource.org/licenses/MIT -# -# Please preserve changelog entries -# - -%global github_owner Ocramius -%global github_name CodeGenerationUtils -%global github_version 0.4.0 -%global github_commit 7dc0be1dec3376d95ba094688f0d84f7cf95f300 - -%global composer_vendor ocramius -%global composer_project code-generator-utils - -# "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} - -%{!?phpdir: %global phpdir %{_datadir}/php} - -Name: php-%{composer_vendor}-%{composer_project} -Version: %{github_version} -Release: 2%{?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 - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -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(phpunit/phpunit) >= 5.0 -# phpcompatinfo (computed from version 0.4.0) -BuildRequires: php-pcre -BuildRequires: php-reflection -BuildRequires: php-spl -# Autoloader -BuildRequires: php-composer(symfony/class-loader) -%endif - -# 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} -# phpcompatinfo (computed from version 0.4.0) -Requires: php-pcre -Requires: php-spl -# Autoloader -Requires: php-composer(symfony/class-loader) - -# Composer -Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version} - -%description -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 -: Create autoloader -cat <<'AUTOLOAD' | tee src/CodeGenerationUtils/autoload.php -<?php -/** - * Autoloader for %{name} and its' dependencies - * (created by %{name}-%{version}-%{release}). - * - * @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'; - } - - $fedoraClassLoader = new \Symfony\Component\ClassLoader\ClassLoader(); - $fedoraClassLoader->register(); -} - -$fedoraClassLoader->addPrefix('CodeGenerationUtils\\', dirname(__DIR__)); - -// Required dependency -require_once '%{phpdir}/PhpParser2/autoload.php'; - -return $fedoraClassLoader; -AUTOLOAD - - -%install -rm -rf %{buildroot} -mkdir -p %{buildroot}%{phpdir} -cp -rp src/CodeGenerationUtils %{buildroot}%{phpdir}/ - - -%check -%if %{with_tests} -: 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'); -BOOTSTRAP - -%{_bindir}/phpunit --verbose --bootstrap bootstrap.php -%else -: Tests skipped -%endif - - -%clean -rm -rf %{buildroot} - - -%files -%defattr(-,root,root,-) -%{!?_licensedir:%global license %%doc} -%license LICENSE -%doc *.md -%doc composer.json -%{phpdir}/CodeGenerationUtils - - -%changelog -* Wed Oct 12 2016 Remi Collet <remi@fedoraproject.org> - 0.4.0-2 -- switch from classmap autoloader to PSR-0 one (symfony) - -* Wed Jun 29 2016 Remi Collet <remi@fedoraproject.org> - 0.4.0-1 -- update to 0.4.0 -- raise dependency on php ~7.0 -- raise dependency on nikic/php-parser ~2.0 -- add simple autoloader - -* Sun Aug 9 2015 Remi Collet <remi@fedoraproject.org> - 0.3.2-1 -- update to 0.3.2 -- raise dependency on nikic/php-parser ~1.3 - -* Wed Feb 25 2015 Remi Collet <remi@fedoraproject.org> - 0.3.1-1 -- update to 0.3.1 (no change) -- raise nikic/php-parser max version - -* Thu Nov 6 2014 Remi Collet <remi@fedoraproject.org> - 0.3.0-2 -- backport for remi repository - -* Wed Nov 05 2014 Shawn Iwinski <shawn.iwinski@gmail.com> - 0.3.0-2 -- Silenced include in autoloader -- Removed debug from %%check - -* Mon Oct 27 2014 Shawn Iwinski <shawn.iwinski@gmail.com> - 0.3.0-1 -- Initial package diff --git a/php-ocramius-code-generator-utils.spec b/php-ocramius-code-generator-utils.spec index 2954258..80867ad 100644 --- a/php-ocramius-code-generator-utils.spec +++ b/php-ocramius-code-generator-utils.spec @@ -12,17 +12,17 @@ %global github_owner Ocramius %global github_name CodeGenerationUtils -%global github_version 0.3.2 -%global github_commit 0e2f6c593fc82801cbb5c8fa90559d923bd1445c +%global github_version 0.4.1 +%global github_commit 862c03de42475fe039e7d0f47966c25ac40a58a8 %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|~3.0" +%global php_parser_min_ver 2.0 +%global php_parser_max_ver 4 # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} @@ -31,7 +31,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,26 +44,26 @@ 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(phpunit/phpunit) -# phpcompatinfo (computed from version 0.3.0) +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 BuildRequires: php-reflection BuildRequires: php-spl # Autoloader -BuildRequires: php-composer(symfony/class-loader) +BuildRequires: php-composer(fedora/autoloader) %endif # 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} -# phpcompatinfo (computed from version 0.3.0) +Requires: php-composer(nikic/php-parser) >= %{php_parser_min_ver} +# phpcompatinfo (computed from version 0.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} @@ -90,27 +90,20 @@ 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'; - } - - $fedoraClassLoader = new \Symfony\Component\ClassLoader\ClassLoader(); - $fedoraClassLoader->register(); -} - -$fedoraClassLoader->addPrefix('CodeGenerationUtils\\', dirname(__DIR__)); +require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; -// Required dependency -require_once '%{phpdir}/PhpParser/autoload.php'; - -return $fedoraClassLoader; +\Fedora\Autoloader\Autoload::addPsr4('CodeGenerationUtils\\', __DIR__); +\Fedora\Autoloader\Dependencies::required([ + [ + '%{phpdir}/PhpParser3/autoload.php', + '%{phpdir}/PhpParser2/autoload.php', + ], +]); AUTOLOAD %install rm -rf %{buildroot} - mkdir -p %{buildroot}%{phpdir} cp -rp src/CodeGenerationUtils %{buildroot}%{phpdir}/ @@ -120,11 +113,18 @@ 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'); +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 +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 @@ -144,14 +144,29 @@ rm -rf %{buildroot} %changelog -* Wed Oct 12 2016 Remi Collet <remi@fedoraproject.org> - 0.3.2-4 -- add missing dependency for autoloader +* Fri Jun 23 2017 Remi Collet <remi@remirepo.net> - 0.4.1-1 +- Update to 0.4.1 +- allow nikic/php-parser version 2 and 3 + +* 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 + +* Wed Oct 12 2016 Remi Collet <remi@fedoraproject.org> - 0.4.0-2 +- switch from classmap autoloader to PSR-0 one (symfony) -* Tue Oct 11 2016 Shawn Iwinski <shawn.iwinski@gmail.com> - 0.3.2-3 -- Add autoloader +* Wed Jun 29 2016 Remi Collet <remi@fedoraproject.org> - 0.4.0-1 +- update to 0.4.0 +- raise dependency on php ~7.0 +- raise dependency on nikic/php-parser ~2.0 +- add simple autoloader * Sun Aug 9 2015 Remi Collet <remi@fedoraproject.org> - 0.3.2-1 - update to 0.3.2 +- raise dependency on nikic/php-parser ~1.3 * Wed Feb 25 2015 Remi Collet <remi@fedoraproject.org> - 0.3.1-1 - update to 0.3.1 (no change) |