summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer.json17
-rw-r--r--php-di.spec122
2 files changed, 77 insertions, 62 deletions
diff --git a/composer.json b/composer.json
index f9b531c..0874f2d 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
"type": "library",
"description": "The dependency injection container for humans",
"keywords": ["di", "dependency injection", "container", "ioc", "psr-11", "psr11", "container-interop"],
- "homepage": "http://php-di.org/",
+ "homepage": "https://php-di.org/",
"license": "MIT",
"autoload": {
"psr-4": {
@@ -22,23 +22,22 @@
"scripts": {
"test": "phpunit",
"format-code": "php-cs-fixer fix --allow-risky=yes",
- "phpstan": "phpstan analyse -l 6 -c phpstan.neon src"
+ "phpstan": "phpstan analyse -l 5 -c phpstan.neon src"
},
"require": {
- "php": ">=7.0.0",
+ "php": ">=7.2.0",
"psr/container": "^1.0",
"php-di/invoker": "^2.0",
"php-di/phpdoc-reader": "^2.0.1",
- "jeremeamia/superclosure": "^2.0",
- "nikic/php-parser": "^2.0|^3.0|^4.0"
+ "opis/closure": "^3.5.5"
},
"require-dev": {
- "phpunit/phpunit": "~6.4",
- "mnapoli/phpunit-easymock": "~1.0",
+ "phpunit/phpunit": "^8.5|^9.0",
+ "mnapoli/phpunit-easymock": "^1.2",
"doctrine/annotations": "~1.2",
- "ocramius/proxy-manager": "~2.0.2",
+ "ocramius/proxy-manager": "^2.0.2",
"friendsofphp/php-cs-fixer": "^2.4",
- "phpstan/phpstan": "^0.9.2"
+ "phpstan/phpstan": "^0.12"
},
"provide": {
"psr/container-implementation": "^1.0"
diff --git a/php-di.spec b/php-di.spec
index df94a3d..79575be 100644
--- a/php-di.spec
+++ b/php-di.spec
@@ -2,7 +2,7 @@
#
# Fedora spec file for php-di
#
-# Copyright (c) 2016-2019 Shawn Iwinski <shawn@iwin.ski>
+# Copyright (c) 2016-2021 Shawn Iwinski <shawn@iwin.ski>
#
# License: MIT
# http://opensource.org/licenses/MIT
@@ -10,43 +10,55 @@
# Please preserve changelog entries
#
+%bcond_without tests
+
%global github_owner PHP-DI
%global github_name PHP-DI
-%global github_version 6.0.8
-%global github_commit a634876c69b643b779a89e4b7bec1ed1df803afc
+%global github_version 6.3.4
+%global github_commit f53bcba06ab31b18e911b77c039377f4ccd1f7a5
%global composer_vendor php-di
%global composer_project php-di
-# "php": ">=7.0.0"
-%global php_min_ver 7.0.0
+# "php": ">=7.2.0"
+%global php_min_ver 7.2.0
# "doctrine/annotations": "~1.2"
%global doctrine_annotations_min_ver 1.2
%global doctrine_annotations_max_ver 2.0
-# "jeremeamia/superclosure": "^2.0"
-%global jeremeamia_superclosure_min_ver 2.0
-%global jeremeamia_superclosure_max_ver 3.0
-# "mnapoli/phpunit-easymock": "~1.0"
-%global phpunit_easymock_min_ver 1.0
+# "mnapoli/phpunit-easymock": "^1.2"
+%global phpunit_easymock_min_ver 1.2
%global phpunit_easymock_max_ver 2.0
-# "nikic/php-parser": "^2.0|^3.0|^4.0"
-%global nikic_php_parser_min_ver 2.0
-%global nikic_php_parser_max_ver 5.0
-# "ocramius/proxy-manager": "~2.0.2"
+# "ocramius/proxy-manager": "^2.0.2"
%global proxy_manager_min_ver 2.0.2
%global proxy_manager_max_ver 3.0
+# "opis/closure": "^3.5.5"
+%global opis_closure_min_ver 3.5.5
+%global opis_closure_max_ver 4.0
# "php-di/invoker": "^2.0"
%global di_invoker_min_ver 2.0
%global di_invoker_max_ver 3.0
# "php-di/phpdoc-reader": "^2.0.1"
%global di_phpdoc_reader_min_ver 2.0.1
%global di_phpdoc_reader_max_ver 3.0
+# "phpunit/phpunit": "^8.5|^9.0"
+%global phpunit_min_ver 9.0
# "psr/container": "^1.0"
%global psr_container_min_ver 1.0
%global psr_container_max_ver 2.0
-# Build using "--without tests" to disable tests
-%global with_tests 0%{!?_without_tests:1}
+# Range dependencies supported?
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+%global with_range_dependencies 1
+%else
+%global with_range_dependencies 0
+%endif
+
+# Weak dependencies supported?
+%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
+%global with_weak_dependencies 1
+%else
+%global with_weak_dependencies 0
+%endif
%{!?phpdir: %global phpdir %{_datadir}/php}
@@ -56,39 +68,36 @@ Release: 1%{?github_release}%{?dist}
Summary: The dependency injection container for humans
License: MIT
-URL: http://php-di.org/
+URL: https://php-di.org/
-# GitHub export does not include tests.
-# Run php-di-get-source.sh to create full source.
+# GitHub export does not include tests
+# Run php-di-get-source.sh to create full source
Source0: %{name}-%{github_version}-%{github_commit}.tar.gz
Source1: %{name}-get-source.sh
BuildArch: noarch
# Tests
-%if %{with_tests}
+%if %{with tests}
## composer.json
BuildRequires: php(language) >= %{php_min_ver}
-BuildRequires: php-composer(phpunit/phpunit)
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: phpunit9 >= %{phpunit_min_ver}
+%if %{with_range_dependencies}
BuildRequires: (php-composer(doctrine/annotations) >= %{doctrine_annotations_min_ver} with php-composer(doctrine/annotations) < %{doctrine_annotations_max_ver})
-BuildRequires: (php-composer(jeremeamia/superclosure) >= %{jeremeamia_superclosure_min_ver} with php-composer(jeremeamia/superclosure) < %{jeremeamia_superclosure_max_ver})
BuildRequires: (php-composer(mnapoli/phpunit-easymock) >= %{phpunit_easymock_min_ver} with php-composer(mnapoli/phpunit-easymock) < %{phpunit_easymock_max_ver})
-BuildRequires: (php-composer(nikic/php-parser) >= %{nikic_php_parser_min_ver} with php-composer(nikic/php-parser) < %{nikic_php_parser_max_ver})
BuildRequires: (php-composer(ocramius/proxy-manager) >= %{proxy_manager_min_ver} with php-composer(ocramius/proxy-manager) < %{proxy_manager_max_ver})
+BuildRequires: (php-composer(opis/closure) >= %{opis_closure_min_ver} with php-composer(opis/closure) < %{opis_closure_max_ver})
BuildRequires: (php-composer(php-di/invoker) >= %{di_invoker_min_ver} with php-composer(php-di/invoker) < %{di_invoker_max_ver})
BuildRequires: (php-composer(php-di/phpdoc-reader) >= %{di_phpdoc_reader_min_ver} with php-composer(php-di/phpdoc-reader) < %{di_phpdoc_reader_max_ver})
BuildRequires: (php-composer(psr/container) >= %{psr_container_min_ver} with php-composer(psr/container) < %{psr_container_max_ver})
%else
BuildRequires: php-composer(doctrine/annotations) < %{doctrine_annotations_max_ver}
BuildRequires: php-composer(doctrine/annotations) >= %{doctrine_annotations_min_ver}
-BuildRequires: php-composer(jeremeamia/superclosure) < %{jeremeamia_superclosure_max_ver}
-BuildRequires: php-composer(jeremeamia/superclosure) >= %{jeremeamia_superclosure_min_ver}
BuildRequires: php-composer(mnapoli/phpunit-easymock) < %{phpunit_easymock_max_ver}
BuildRequires: php-composer(mnapoli/phpunit-easymock) >= %{phpunit_easymock_min_ver}
-BuildRequires: php-composer(nikic/php-parser) < %{nikic_php_parser_max_ver}
-BuildRequires: php-composer(nikic/php-parser) >= %{nikic_php_parser_min_ver}
BuildRequires: php-composer(ocramius/proxy-manager) < %{proxy_manager_max_ver}
BuildRequires: php-composer(ocramius/proxy-manager) >= %{proxy_manager_min_ver}
+BuildRequires: php-composer(opis/closure) < %{opis_closure_max_ver}
+BuildRequires: php-composer(opis/closure) >= %{opis_closure_min_ver}
BuildRequires: php-composer(php-di/invoker) < %{di_invoker_max_ver}
BuildRequires: php-composer(php-di/invoker) >= %{di_invoker_min_ver}
BuildRequires: php-composer(php-di/phpdoc-reader) < %{di_phpdoc_reader_max_ver}
@@ -96,7 +105,7 @@ BuildRequires: php-composer(php-di/phpdoc-reader) >= %{di_phpdoc_reader_min_ver}
BuildRequires: php-composer(psr/container) < %{psr_container_max_ver}
BuildRequires: php-composer(psr/container) >= %{psr_container_min_ver}
%endif
-## phpcompatinfo (computed from version 6.0.8)
+## phpcompatinfo (computed from version 6.2.2)
BuildRequires: php-date
BuildRequires: php-json
BuildRequires: php-pcre
@@ -108,17 +117,14 @@ BuildRequires: php-composer(fedora/autoloader)
# composer.json
Requires: php(language) >= %{php_min_ver}
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-composer(jeremeamia/superclosure) >= %{jeremeamia_superclosure_min_ver} with php-composer(jeremeamia/superclosure) < %{jeremeamia_superclosure_max_ver})
-Requires: (php-composer(nikic/php-parser) >= %{nikic_php_parser_min_ver} with php-composer(nikic/php-parser) < %{nikic_php_parser_max_ver})
+%if %{with_range_dependencies}
+Requires: (php-composer(opis/closure) >= %{opis_closure_min_ver} with php-composer(opis/closure) < %{opis_closure_max_ver})
Requires: (php-composer(php-di/invoker) >= %{di_invoker_min_ver} with php-composer(php-di/invoker) < %{di_invoker_max_ver})
Requires: (php-composer(php-di/phpdoc-reader) >= %{di_phpdoc_reader_min_ver} with php-composer(php-di/phpdoc-reader) < %{di_phpdoc_reader_max_ver})
Requires: (php-composer(psr/container) >= %{psr_container_min_ver} with php-composer(psr/container) < %{psr_container_max_ver})
%else
-Requires: php-composer(jeremeamia/superclosure) < %{jeremeamia_superclosure_max_ver}
-Requires: php-composer(jeremeamia/superclosure) >= %{jeremeamia_superclosure_min_ver}
-Requires: php-composer(nikic/php-parser) < %{nikic_php_parser_max_ver}
-Requires: php-composer(nikic/php-parser) >= %{nikic_php_parser_min_ver}
+Requires: php-composer(opis/closure) < %{opis_closure_max_ver}
+Requires: php-composer(opis/closure) >= %{opis_closure_min_ver}
Requires: php-composer(php-di/invoker) < %{di_invoker_max_ver}
Requires: php-composer(php-di/invoker) >= %{di_invoker_min_ver}
Requires: php-composer(php-di/phpdoc-reader) < %{di_phpdoc_reader_max_ver}
@@ -126,7 +132,7 @@ Requires: php-composer(php-di/phpdoc-reader) >= %{di_phpdoc_reader_min_ver}
Requires: php-composer(psr/container) < %{psr_container_max_ver}
Requires: php-composer(psr/container) >= %{psr_container_min_ver}
%endif
-# phpcompatinfo (computed from version 5.4.6)
+# phpcompatinfo (computed from version 6.2.2)
Requires: php-json
Requires: php-pcre
Requires: php-reflection
@@ -135,7 +141,7 @@ Requires: php-spl
Requires: php-composer(fedora/autoloader)
# Weak dependencies
-%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
+%if %{with_weak_dependencies}
Suggests: php-composer(doctrine/annotations)
Suggests: php-composer(ocramius/proxy-manager)
Suggests: php-pecl(apcu)
@@ -171,15 +177,10 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
require_once __DIR__.'/functions.php';
\Fedora\Autoloader\Dependencies::required([
- [
- '%{phpdir}/PhpParser4/autoload.php',
- '%{phpdir}/PhpParser3/autoload.php',
- '%{phpdir}/PhpParser2/autoload.php',
- ],
'%{phpdir}/Invoker/autoload.php',
+ '%{phpdir}/Opis/Closure/autoload.php',
'%{phpdir}/PhpDocReader/autoload.php',
'%{phpdir}/Psr/Container/autoload.php',
- '%{phpdir}/SuperClosure/autoload.php',
]);
\Fedora\Autoloader\Dependencies::optional([
@@ -195,7 +196,7 @@ cp -rp src %{buildroot}%{phpdir}/DI
%check
-%if %{with_tests}
+%if %{with tests}
: Create tests bootstrap
cat <<'BOOTSTRAP' | tee bootstrap.php
<?php
@@ -209,14 +210,11 @@ BOOTSTRAP
: Upstream tests
RETURN_CODE=0
-for PHP_EXEC in php php70 php71 php72 php73 php74; do
- if [ "php" == "$PHP_EXEC" ] || which $PHP_EXEC; then
- for PHPUNIT in phpunit6; do
- PHPUNIT=$(which $PHPUNIT) || :
- if [ -n "$PHPUNIT" ]; then
- $PHP_EXEC $PHPUNIT --bootstrap bootstrap.php --verbose || RETURN_CODE=1
- fi
- done
+PHPUNIT=$(which phpunit9)
+for PHP_EXEC in "" php73 php74 php80 php81; do
+ if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then
+ $PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \
+ || RETURN_CODE=1
fi
done
exit $RETURN_CODE
@@ -235,6 +233,24 @@ exit $RETURN_CODE
%changelog
+* Tue Aug 3 2021 Remi Collet <remi@remirepo.net> - 6.3.4-1
+- update to 6.3.4
+
+* Wed Mar 31 2021 Remi Collet <remi@remirepo.net> - 6.3.1-1
+- update to 6.3.1
+
+* Sun Sep 06 2020 Shawn Iwinski <shawn@iwin.ski> - 6.2.2-1
+- Update to 6.2.2 (RHBZ #1871668)
+
+* Sat Aug 22 2020 Shawn Iwinski <shawn@iwin.ski> - 6.2.1-1
+- Update to 6.2.1 (RHBZ #1821537)
+- Fix FTBFS (RHBZ #1865217)
+- Use PHPUnit 8
+
+* Sat Dec 14 2019 Shawn Iwinski <shawn@iwin.ski> - 6.0.11-1
+- Update to 6.0.11 (RHBZ #1763756)
+- Use PHPUnit 6
+
* Sun May 26 2019 Shawn Iwinski <shawn@iwin.ski> - 6.0.8-1
- Update to 6.0.8 (RHBZ #1442587)
generated by cgit (git 2.34.1) at 2025-10-31 08:44:11 +0000