summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore7
-rw-r--r--composer.json24
l---------makesrc.sh1
-rw-r--r--php-di-phpdoc-reader.spec72
4 files changed, 62 insertions, 42 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
new file mode 100644
index 0000000..64d7262
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,24 @@
+{
+ "name": "php-di/phpdoc-reader",
+ "type": "library",
+ "description": "PhpDocReader parses @var and @param values in PHP docblocks (supports namespaced class names with the same resolution rules as PHP)",
+ "keywords": ["phpdoc", "reflection"],
+ "license": "MIT",
+ "autoload": {
+ "psr-4": {
+ "PhpDocReader\\": "src/PhpDocReader"
+ }
+ },
+ "autoload-dev": {
+ "psr-4": {
+ "UnitTest\\PhpDocReader\\": "tests/"
+ }
+ },
+ "require": {
+ "php": ">=7.2.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^8.5|^9.0",
+ "mnapoli/hard-mode": "~0.3.0"
+ }
+}
diff --git a/makesrc.sh b/makesrc.sh
new file mode 120000
index 0000000..fca4061
--- /dev/null
+++ b/makesrc.sh
@@ -0,0 +1 @@
+php-di-phpdoc-reader-get-source.sh \ No newline at end of file
diff --git a/php-di-phpdoc-reader.spec b/php-di-phpdoc-reader.spec
index a795dde..7004225 100644
--- a/php-di-phpdoc-reader.spec
+++ b/php-di-phpdoc-reader.spec
@@ -2,7 +2,7 @@
#
# Fedora spec file for php-di-phpdoc-reader
#
-# Copyright (c) 2016 Shawn Iwinski <shawn@iwin.ski>
+# Copyright (c) 2016-2021 Shawn Iwinski <shawn@iwin.ski>
#
# License: MIT
# http://opensource.org/licenses/MIT
@@ -10,19 +10,18 @@
# Please preserve changelog entries
#
+%bcond_without tests
+
%global github_owner PHP-DI
%global github_name PhpDocReader
-%global github_version 2.0.1
-%global github_commit 83f5ead159defccfa8e7092e5b6c1c533b326d68
+%global github_version 2.2.1
+%global github_commit 66daff34cbd2627740ffec9469ffbac9f8c8185c
%global composer_vendor php-di
%global composer_project phpdoc-reader
-# "php": ">=5.3.0"
-%global php_min_ver 5.3.0
-
-# Build using "--without tests" to disable tests
-%global with_tests 0%{!?_without_tests:1}
+# "php": ">=7.2.0"
+%global php_min_ver 7.2.0
%{!?phpdir: %global phpdir %{_datadir}/php}
@@ -40,20 +39,19 @@ URL: https://github.com/%{github_owner}/%{github_name}
Source0: %{name}-%{github_version}-%{github_commit}.tar.gz
Source1: %{name}-get-source.sh
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
# Tests
-%if %{with_tests}
+%if %{with tests}
## composer.json
BuildRequires: php(language) >= %{php_min_ver}
-BuildRequires: php-composer(phpunit/phpunit)
+BuildRequires: phpunit9
## phpcompatinfo (computed from version 2.0.1)
BuildRequires: php-pcre
BuildRequires: php-reflection
BuildRequires: php-spl
BuildRequires: php-tokenizer
## Autoloader
-BuildRequires: php-composer(symfony/class-loader)
+BuildRequires: php-composer(fedora/autoloader)
%endif
# composer.json
@@ -63,7 +61,7 @@ Requires: php-pcre
Requires: php-spl
Requires: php-tokenizer
# Autoloader
-Requires: php-composer(symfony/class-loader)
+Requires: php-composer(fedora/autoloader)
# php-{COMPOSER_VENDOR}-{COMPOSER_PROJECT}
Provides: php-%{composer_vendor}-%{composer_project} = %{version}-%{release}
@@ -86,21 +84,12 @@ cat <<'AUTOLOAD' | tee src/PhpDocReader/autoload.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();
-}
+require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
-$fedoraClassLoader->addPrefix('PhpDocReader\\', dirname(__DIR__));
+\Fedora\Autoloader\Autoload::addPsr4('PhpDocReader\\', __DIR__);
-return $fedoraClassLoader;
AUTOLOAD
@@ -109,41 +98,32 @@ AUTOLOAD
%install
-rm -rf %{buildroot}
mkdir -p %{buildroot}%{phpdir}
cp -rp src/* %{buildroot}%{phpdir}/
%check
-%if %{with_tests}
-: Make PSR-0 tests
-mkdir -p tests-psr0/UnitTest
-ln -s ../../tests tests-psr0/UnitTest/PhpDocReader
-
+%if %{with tests}
: Create tests bootstrap
cat <<'BOOTSTRAP' | tee bootstrap.php
<?php
-$fedoraClassLoader = require '%{buildroot}%{phpdir}/PhpDocReader/autoload.php';
-$fedoraClassLoader->addPrefix('UnitTest\\PhpDocReader\\', __DIR__.'/tests-psr0');
+require_once '%{buildroot}%{phpdir}/PhpDocReader/autoload.php';
+\Fedora\Autoloader\Autoload::addPsr4('UnitTest\\PhpDocReader\\', __DIR__.'/tests');
BOOTSTRAP
: Run tests
-%{_bindir}/phpunit --verbose --bootstrap bootstrap.php
-
-if which php70; then
- php70 %{_bindir}/phpunit --verbose --bootstrap bootstrap.php
-fi
+for cmd in php php73 php74 php80; do
+ if which $cmd; then
+ $cmd %{_bindir}/phpunit9 --verbose --bootstrap bootstrap.php
+ fi
+done
%else
: Tests skipped
%endif
-%clean
-rm -rf %{buildroot}
-
-
%files
-%defattr(-,root,root,-)
+# remirepo:1
%{!?_licensedir:%global license %%doc}
%license LICENSE
%doc *.md
@@ -152,6 +132,14 @@ rm -rf %{buildroot}
%changelog
+* Wed Mar 31 2021 Remi Collet <remi@remirepo.net> - 2.2.1-1
+- update to 2.2.1
+- raise dependency on PHP 7.2
+- switch to phpunit9
+
+* Wed May 10 2017 Valentin Collet <valentin@famillecollet.com> - 2.0.1-4
+- Switch to fedora/autoloader
+
* Mon Jan 04 2016 Remi Collet <remi@remirepo.net> - 2.0.1-1
- backport for #remirepo