summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json10
-rw-r--r--php-sensiolabs-security-checker.spec56
2 files changed, 42 insertions, 24 deletions
diff --git a/composer.json b/composer.json
index 15dfbe9..475ce2b 100644
--- a/composer.json
+++ b/composer.json
@@ -9,9 +9,11 @@
}
],
"require": {
- "php": ">=5.5.9",
- "symfony/console": "~2.7|~3.0|~4.0",
- "composer/ca-bundle": "^1.0"
+ "php": ">=7.1.3",
+ "symfony/console": "^2.8|^3.4|^4.2|^5.0",
+ "symfony/http-client": "^4.3|^5.0",
+ "symfony/mime": "^4.3|^5.0",
+ "symfony/polyfill-ctype": "^1.11"
},
"bin": ["security-checker"],
"autoload": {
@@ -19,7 +21,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "6.0-dev"
}
}
}
diff --git a/php-sensiolabs-security-checker.spec b/php-sensiolabs-security-checker.spec
index ffe9279..ab8a41b 100644
--- a/php-sensiolabs-security-checker.spec
+++ b/php-sensiolabs-security-checker.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
# Github
-%global gh_commit 46be3f58adac13084497961e10eed9a7fb4d44d1
+%global gh_commit a576c01520d9761901f269c4934ba55448be4a54
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner sensiolabs
%global gh_project security-checker
@@ -19,7 +19,7 @@
%global ns_project Security
Name: php-%{pk_vendor}-%{pk_name}
-Version: 5.0.3
+Version: 6.0.3
Release: 1%{?dist}
Summary: A security checker for your composer.lock
@@ -34,36 +34,40 @@ BuildArch: noarch
# Autoloader
BuildRequires: php-fedora-autoloader-devel
# For check
-BuildRequires: php(language) >= 5.5.9
+BuildRequires: php(language) >= 7.1.3
BuildRequires: php-json
BuildRequires: php-pcre
BuildRequires: php-spl
BuildRequires: php-cli
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(symfony/console) >= 2.7 with php-composer(symfony/console) < 5)
-BuildRequires: (php-composer(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2)
+BuildRequires: (php-composer(symfony/console) >= 4.3 with php-composer(symfony/console) < 6)
+BuildRequires: (php-composer(symfony/http-client) >= 4.3 with php-composer(symfony/http-client) < 6)
+BuildRequires: (php-composer(symfony/mime) >= 4.3 with php-composer(symfony/mime) < 6)
# remirepo:5
%else
-BuildRequires: php-symfony3-console
-BuildRequires: php-composer(composer/ca-bundle) < 2
-BuildRequires: php-composer(composer/ca-bundle) >= 1.0
+BuildRequires: php-symfony3-console > 4.3
+BuildRequires: php-symfony4-http-client > 4.3
+BuildRequires: php-symfony4-mime > 4.3
%endif
# From composer.json, "require": {
-# "php": ">=5.5.9",
-# "symfony/console": "~2.7|~3.0|~4.0",
-# "composer/ca-bundle": "^1.0"
-Requires: php(language) >= 5.5.9
+# "php": ">=7.1.3",
+# "symfony/console": "^2.8|^3.4|^4.2|^5.0",
+# "symfony/http-client": "^4.3|^5.0",
+# "symfony/mime": "^4.3|^5.0",
+# "symfony/polyfill-ctype": "^1.11"
+Requires: php(language) >= 7.1.3
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-composer(symfony/console) >= 2.7 with php-composer(symfony/console) < 5)
-Requires: (php-composer(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2)
+Requires: (php-composer(symfony/console) >= 4.3 with php-composer(symfony/console) < 6)
+Requires: (php-composer(symfony/http-client) >= 4.3 with php-composer(symfony/http-client) < 6)
+Requires: (php-composer(symfony/mime) >= 4.3 with php-composer(symfony/mime) < 6)
# remirepo:5
%else
-Requires: php-symfony3-console
-Requires: php-composer(composer/ca-bundle) < 2
-Requires: php-composer(composer/ca-bundle) >= 1.0
+Requires: php-symfony4-console > 4.3
+Requires: php-symfony4-http-client > 4.3
+Requires: php-symfony4-mime > 4.3
%endif
# From phpcompatifo report for 5.0.3
@@ -96,11 +100,17 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php
cat << 'EOF' | tee -a %{ns_vendor}/%{ns_project}/autoload.php
\Fedora\Autoloader\Dependencies::required([
[
+ '%{_datadir}/php/Symfony5/Component/Console/autoload.php',
'%{_datadir}/php/Symfony4/Component/Console/autoload.php',
- '%{_datadir}/php/Symfony3/Component/Console/autoload.php',
- '%{_datadir}/php/Symfony/Component/Console/autoload.php',
],
- '%{_datadir}/php/Composer/CaBundle/autoload.php',
+ [
+ '%{_datadir}/php/Symfony5/Component/HttpClient/autoload.php',
+ '%{_datadir}/php/Symfony4/Component/HttpClient/autoload.php',
+ ],
+ [
+ '%{_datadir}/php/Symfony5/Component/Mime/autoload.php',
+ '%{_datadir}/php/Symfony4/Component/Mime/autoload.php',
+ ],
]);
EOF
@@ -130,5 +140,11 @@ sed -e 's:%{_datadir}:%{buildroot}%{_datadir}:' security-checker >test
%changelog
+* Mon Nov 25 2019 Remi Collet <remi@remirepo.net> - 6.0.3-1
+- update to 6.0.3
+- raise dependency on PHP 7.1
+- raise dependency on Symfony version 4.3 and allow version 5
+- drop dependency on composer/ca-bundle
+
* Thu Jan 3 2019 Remi Collet <remi@remirepo.net> - 5.0.3-1
- initial package, version 5.0.3